Merge remote-tracking branch 'origin/重点工程定位需求' into 重点工程定位需求

src/views/xgf/flow_audit/users.vue

@@ -83,7 +83,7 @@
               @click="getUserInfo(row)">电子合格证
             </el-button>
             <el-button
-              v-if="(row.STATUS === 0 ||row.STATUS === 1 )&& viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.SUPERVISION_USER_ID === USER_ID && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2') || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS)))"
+              v-if="(row.STATUS === 0 ||row.STATUS === 1 )&& viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.SUPERVISION_USER_ID === USER_ID && row.MANAGER_STATE === 1 && row.STEP_STATUS === '2') || (row.TERRITORIALITY_USER_ID === USER_ID && row.SUPERVISION_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS)))"
               type="success"
               icon="el-icon-edit"
               size="mini"
@@ -180,8 +180,6 @@
         <tr>
           <th>文化程度</th>
           <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-          <!--            <th>本企业从业开始日期</th>-->
-          <!--            <td>{{ userDetailForm.CORP_START_DATE }}</td>-->
           <th>岗位名称(工种)</th>
           <td colspan="3">{{ userDetailForm.POST_ID }}</td>
         </tr>
@@ -332,7 +330,8 @@ export default {
       },
       heirloom: {},
       message: '',
-      operator: ''
+      operator: '',
+      photosOfLevel: []
     }
   },
   methods: {
@@ -397,6 +396,7 @@ export default {
       this.userInfoDialog = true
       this.heirloom = row
       console.log(row)
+      console.log('?????')
       if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) {
         if (row.SUPERVISION_STATE === 0) {
           this.message = row.SUPERVISION_OPINION
@@ -468,7 +468,7 @@ export default {
           this.listLoading = false
           // this.userDetailForm = Object.assign(this.userDetailForm, data.pd)
           this.userPhotoFile = data.userPhotoFile
-          if (this.userPhotoFile.length > 0) {
+          if (this.userPhotoFile && this.userPhotoFile.length > 0) {
             this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
           }
           this.insuranceFileList = data.insuranceFile