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

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

@@ -152,7 +152,7 @@ export default {
           top: 30,
           bottom: 20,
           data: [
-            "编程",
+            "研发",
             "上网",
             "文档",
             "设计",
@@ -185,7 +185,7 @@ export default {
             radius: [30, 110],
             roseType: "area",
             data: [
-              { value: (this.timeList[1] / 3600).toFixed(2), name: "编程" },
+              { value: (this.timeList[1] / 3600).toFixed(2), name: "研发" },
               { value: (this.timeList[2] / 3600).toFixed(2), name: "上网" },
               { value: (this.timeList[3] / 3600).toFixed(2), name: "文档" },
               { value: (this.timeList[4] / 3600).toFixed(2), name: "设计" },
@@ -210,7 +210,7 @@ export default {
         case 0:
           return "其他工作";
         case 1:
-          return "编程";
+          return "研发";
         case 2:
           return "上网";
         case 3:

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

@@ -26,7 +26,7 @@
             </div>
           </div>
           <div class="one_card_txt">
-            <!-- -1-未知 null 0-编程，1-查资料，2-看文档，3-做设计，4-美工，5-运营，6-看小说，7-打游戏，8-听音乐 9-聊天 -->
+            <!-- -1-未知 null 0-研发，1-查资料，2-看文档，3-做设计，4-美工，5-运营，6-看小说，7-打游戏，8-听音乐 9-聊天 -->
             <span>{{converType(item.pic_type == null ? 0 : item.pic_type+1)}}</span>
             <div class="bottom clearfix">
               <el-link>
@@ -104,7 +104,7 @@ export default {
         case 0:
           return "其他";
         case 1:
-          return "编程";
+          return "研发";
         case 2:
           return "上网";
         case 3:

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

@@ -111,7 +111,7 @@ export default {
         case 0:
           return "其他";
         case 1:
-          return "编程";
+          return "研发";
         case 2:
           return "上网";
         case 3:

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

@@ -32,7 +32,7 @@
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="projectName" label="姓名" width="140" sortable></el-table-column>
       <el-table-column prop="ownerCompanyName" label="手机" width="180"></el-table-column>
-      <el-table-column prop="customCompaniesStr" label="编程"></el-table-column>
+      <el-table-column prop="customCompaniesStr" label="研发"></el-table-column>
       <el-table-column prop="manager" label="设计" sortable></el-table-column>
       <el-table-column prop="manager" label="办公" sortable></el-table-column>
       <el-table-column prop="manager" label="娱乐" sortable></el-table-column>

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

@@ -32,7 +32,7 @@
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="name" label="姓名" width="140" sortable></el-table-column>
       <el-table-column prop="phone" label="手机" width="120"></el-table-column>
-      <el-table-column prop="statistics[0]" label="编程" sortable></el-table-column>
+      <el-table-column prop="statistics[0]" label="研发" sortable></el-table-column>
       <el-table-column prop="statistics[1]" label="上网" sortable></el-table-column>
       <el-table-column prop="statistics[2]" label="文档" sortable></el-table-column>
       <el-table-column prop="statistics[3]" label="设计" sortable></el-table-column>