Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/desktop/detail.vue

@@ -157,7 +157,7 @@ export default {
             "文档",
             "设计",
             "美工",
-            "运营",
+            // "运营",
             "看小说",
             "影视娱乐",
             "听音乐",
@@ -189,10 +189,10 @@ export default {
               { value: (this.timeList[3]/3600).toFixed(2), name: "文档" },
               { value: (this.timeList[4]/3600).toFixed(2), name: "设计" },
               { value: (this.timeList[5]/3600).toFixed(2), name: "美工" },
-              { value: (this.timeList[6]/3600).toFixed(2), name: "运营" },
-              { value: (this.timeList[7]/3600).toFixed(2), name: "看小说" },
-              { value: (this.timeList[8]/3600).toFixed(2), name: "影视娱乐" },
-              { value: (this.timeList[9]/3600).toFixed(2), name: "听音乐" },
+            //   { value: (this.timeList[6]/3600).toFixed(2), name: "运营" },
+              { value: (this.timeList[6]/3600).toFixed(2), name: "看小说" },
+              { value: (this.timeList[7]/3600).toFixed(2), name: "影视娱乐" },
+              { value: (this.timeList[8]/3600).toFixed(2), name: "听音乐" },
               { value: (this.timeList[0]/3600).toFixed(2), name: "其他" }
             ]
           }

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -13,16 +13,13 @@
           <el-link type="primary" :underline="false" @click="openInsertDialog(null)">添加人员</el-link>
         </el-form-item>
         <el-form-item style="float:right;">
-          <el-upload
-            ref="upload"
-            action="#"
-            :limit="1"
-            :http-request="importUser"
-            :show-file-list="false"
-          >
+          <el-upload ref="upload" action="#" :limit="1" :http-request="importUser" :show-file-list="false">
             <el-link type="primary" :underline="false">批量导入</el-link>
           </el-upload>
         </el-form-item>
+        <el-form-item style="float:right;">
+            <el-link type="primary" :underline="false" href="./upload/人员导入模板.xlsx" download="人员导入模板.xlsx">模板下载</el-link>
+        </el-form-item>
       </el-form>
     </el-col>
 

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -435,7 +435,6 @@ export default {
     overflow-y: auto;
   }
 }
-
 </style>
 <style scoped>
 /* 项目标签的样式 */

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/statistics.vue

@@ -36,7 +36,7 @@
       <el-table-column prop="statistics[1]" label="上网" sortable></el-table-column>
       <el-table-column prop="statistics[5]" label="文档" sortable></el-table-column>
       <el-table-column prop="statistics[3]" label="设计" sortable></el-table-column>
-      <el-table-column prop="statistics[4]" label="运营" sortable></el-table-column>
+      <!-- <el-table-column prop="statistics[4]" label="运营" sortable></el-table-column> -->
       <el-table-column prop="statistics[5]" label="娱乐" sortable></el-table-column>
       <el-table-column prop="statistics[6]" label="其他" sortable></el-table-column>
       <el-table-column prop="sum" label="总时长" sortable></el-table-column>