立项管理bug修改

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -75,7 +75,7 @@
                         </el-table-column>
                         <el-table-column prop="status" :label="'审核状态'" min-width="100" >
                             <template slot-scope="scope">
-                                {{scope.row.status == null?"-":approvalStatusStr[scope.row.status]}}
+                                {{scope.row.status == null?"-":approvalStatusStr[scope.row.status-1]}}
                             </template>
                         </el-table-column>
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
@@ -320,7 +320,7 @@
                         <div class="line"><span>{{'项目描述：'}}</span><span>{{projectApprocalDetail.projectDesc}}</span></div>
                         <div class="line"><span>{{'全部参与人：'}}</span>
                             <span v-if="user.userNameNeedTranslate != 1">{{projectApprocalDetail.participationApprovalList.map(v=>v.userName).join(",")}}</span>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='projectApprocalDetail.participationApprovalList.map(v=>v.userName).join(",")'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='projectApprocalDetail.participationApprovalList?projectApprocalDetail.participationApprovalList.map(v=>v.userName).join(","):""'></ww-open-data></span>
                         </div>
                         <div class="line"><span>{{'项目经理：'}}</span>
                             <span v-if="user.userNameNeedTranslate != 1">{{projectApprocalDetail.inchargerName}}</span>
@@ -328,7 +328,7 @@
                         </div>
                         <div class="line"><span>{{'日报审核人：'}}</span>
                             <span v-if="user.userNameNeedTranslate != 1">{{projectApprocalDetail.projectApprovalAuditorList.map(v=>v.auditorName).join(",")}}</span>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='projectApprocalDetail.projectApprovalAuditorList.map(v=>v.auditorName).join(",")'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='projectApprocalDetail.projectApprovalAuditorList?projectApprocalDetail.projectApprovalAuditorList.map(v=>v.auditorName).join(","):""'></ww-open-data></span>
                         </div>
                         <div class="line"><span>{{'级别：'}}</span><span>{{importanceListLable[projectApprocalDetail.level-1]}}</span></div>
                         <div class="line"><span>{{'合同金额：'}}</span><span>{{projectApprocalDetail.contractAmount}}</span></div>
@@ -668,6 +668,16 @@ methods: {
             }
             var arr=[]
             var names=""
+            let namesLiss = [] // 企业微信用到的参与者
+            for(var j in list) {
+                arr.push(list[j].id)
+                names += list[j].name+',';
+                namesLiss.push(list[j].name)
+            }
+            if (names.length > 0) {
+                names = names.substring(0, names.length -1);
+            }
+            this.addFormUserNames = namesLiss
             var auditorArr=[]
             if(theData.participationApprovalList){
                 for(let i in theData.participationApprovalList){