Bladeren bron

提交企业微信验收的问题

Lijy 2 jaren geleden
bovenliggende
commit
b2c6dfd37e

+ 0 - 30
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -953,7 +953,6 @@ export default {
       this.getUsers() // 获取人员信息
       this.getDepartment();
       this.getAl();
-      this.getApproverList();
       this.getAuditWorkflow();
     }
   },
@@ -1207,35 +1206,6 @@ export default {
       this.getVacationList(1)
     },
 
-
-
-
-    getApproverList(){
-      this.http.post('/project/getMyParticiPMList',{
-      },res => {
-        if(res.code == 'ok'){
-          this.approverList = res.data
-          if(this.approverList.length == 0){
-            this.$message({
-              message: this.$t('configureanapprover'),
-              type: 'warning'
-            })
-          }
-          // console.log('list',res.data);
-        }else {
-          this.$message({
-            message: res.msg,
-            type: 'error'
-          })
-        }
-      },error => {
-        this.$message({
-          message: error,
-          type: 'error'
-        })
-      })
-    },
-
     changeAltime(e){
       if(e == 0 && this.AlchangeP.length == 0){
           this.$message(this.$t('selecttheitemsyouwanttobatchset'))

+ 9 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -652,7 +652,10 @@
                                                 {{$t('dai-fen-pei')}}
                                             </span>
                                             <span v-else>
-                                                <ww-open-data type='userName' :openid='scope.row.executorName'></ww-open-data>
+                                                <span v-for="item,index in scope.row.executorName" :key="index">
+                                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                    <span v-if="index < scope.row.executorName.length - 1">,</span>
+                                                </span>
                                             </span>
                                         </span>
                                     </template>
@@ -2754,6 +2757,11 @@
                 this.http.post('/task/getTask',{id: id},
                 res => {
                     if (res.code == "ok") {
+                        if(this.user.userNameNeedTranslate == 1) {
+                            for(var i in res.data.subTaskList) {
+                                res.data.subTaskList[i].executorName = res.data.subTaskList[i].executorName.split(',')
+                            }
+                        }
                         this.addForm = res.data;
                         this.addForm.createDate = null;
                         this.addForm.indate = null;