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

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1389,5 +1389,6 @@
   "quxiao": "Cancel the operation",
   "shan-chu-ji-lu": "Delete Record",
   "wanttodeletefirst": "Please select the record to delete first",
-  "xuan-ze": "choose"
+  "xuan-ze": "choose",
+  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "Update information on existing projects"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1389,5 +1389,6 @@
   "deletethisrecord": "确定要删除该记录吗?",
   "profitratetrendchart": "利润率趋势图",
   "li-run-shuai": "利润率(%)",
-  "bai-fen-bi": "百分比"
+  "bai-fen-bi": "百分比",
+  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "对已有项目进行信息更新"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -43,7 +43,10 @@
             </el-select> -->
 
             <el-select v-model="personnelValue" filterable clearable :placeholder="$t('pleaseselectpersonnel')"  size="small" style="margin-top: 10px;width: 350px" v-if="radio == $t('ren-yuan')" @change="personnel()">
-                <el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name"></el-option>
+                <el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name">
+                    <span style="float: left">{{ item.name }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
+                </el-option>
             </el-select>
         </el-col>
         <el-col :span="4">

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -50,9 +50,10 @@
                         
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item v-if="permissions.projectImport">
-                                <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
+                                <el-link type="primary" :underline="false" @click="importProjectBefore">{{ $t('importproject') }}</el-link>
+                                <!-- <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
                                     <el-link type="primary" :underline="false" >{{ $t('importproject') }}</el-link>
-                                </el-upload>
+                                </el-upload> -->
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectImport">
                                 <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1 || user.timeType.mainProjectState == 1 || user.companyId == '936'">{{ $t('Downloadthetemplate') }}</el-link>
@@ -1086,6 +1087,15 @@
             </div>
         </el-dialog>
 
+        <el-dialog :title="$t('importproject')" v-if="importProjectBeforeDialog" :visible.sync="importProjectBeforeDialog" width="30%">
+            <el-checkbox v-model="paramData1" style="margin-left:10px">{{ $t('dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin') }}</el-checkbox>
+            <div slot="footer" class="dialog-footer" style="text-algin:center;">
+                <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
+                    <el-button type="primary">{{ $t('importproject') }}</el-button>
+                </el-upload>
+            </div>
+        </el-dialog>
+
         <el-dialog append-to-body :title="$t('projectimportresult')" v-if="showImportResult" :visible.sync="showImportResult" width="40%">
                 <div >
                     {{importResultMsg}}
@@ -1287,7 +1297,10 @@ a {
                 addFormkeyNodes: {
                     name: ''
                 },
-                participationId: ''
+                participationId: '',
+
+                importProjectBeforeDialog: false,
+                paramData1: false
             };
         },
         // 过滤器
@@ -2946,6 +2959,10 @@ a {
                     });
                 });
             },
+            importProjectBefore(){
+                this.paramData1 = true
+                this.importProjectBeforeDialog = true
+            },
             importProject(item) {
                 //首先判断文件类型
                 let str = item.file.name.split(".");
@@ -2960,6 +2977,7 @@ a {
                     let formData = new FormData();
                     formData.append("file", item.file);
                     formData.append("userId", this.user.id);
+                    formData.append('key',this.paramData1 ? 1 : 0)
                     this.http.uploadFile('/project/importData', formData,
                     res => {
                         this.$refs.upload.clearFiles();
@@ -2971,6 +2989,7 @@ a {
                             // },5000);
                             //弹窗显示
                             this.showImportResult = true;
+                            this.importProjectBeforeDialog = false
                             this.importResultMsg = res.data;
 
                             this.getList();

fhKeeper/formulahousekeeper/timesheet_h5/public/index.html

@@ -15,10 +15,7 @@
     <!-- <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
     <script src="./axios.min.js"></script> 
     <script>
-        console.log('我被触发了')
         window.onerror = function(err) {
-            console.log('触发了没',err)
-            console.log('出现脚本错误')
             return true
         }
     </script>
@@ -30,7 +27,6 @@
     if (isProductEnv) {    !(function(c,i,e,b){var h=i.createElement("script");var f=i.getElementsByTagName("script")[0];h.type="text/javascript";h.crossorigin=true;h.onload=function(){c[b]||(c[b]=new c.wpkReporter({bid:"dta_2_71020"}));c[b].installAll()};f.parentNode.insertBefore(h,f);h.src=e})(window,document,"https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js","__wpk"); }</script>
 
     <script>
-        window.onload = function(){
         function IsPC() { 
             var userAgentInfo = navigator.userAgent;
             var Agents = ["Android", "iPhone",
@@ -63,7 +59,6 @@
                 location.href = 'http://mldworktime.ttkuaiban.com:9097/';
             }
         }
-        }
     </script>
 </head>