bug修复

src/views/PersonManager/user/components/add.vue

@@ -237,10 +237,7 @@
           <el-col :span="12">
             <el-form-item label="岗位名称(工种)" prop="POST_ID" class="input-width">
               <!--    20230612改成输入框    -->
-              <el-input v-model="form.POST_ID" placeholder="这里输入岗位..."/>
+              <el-input v-model="form.POST_ID" placeholder="这里输入岗位名称(工种)..."/>
-              <!-- <el-select v-model="form.POST_ID" placeholder="请选择" class="filter-item" style="width: 290px">
-                <el-option v-for="item in postList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.BIANMA"/>
-              </el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -279,6 +276,7 @@
               </el-radio-group>
             </el-form-item>
             <el-alert
+              :closable="false"
               title="新增完成后请提示该用户去相关方app端完善特种证书信息"
               type="error"
               class="alertClass"
@@ -295,16 +293,6 @@
         </el-row>
 
         <el-row>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="工种" prop="PERSON_WORK_TYPE" class="input-width">-->
-          <!--              &lt;!&ndash;    20230612改成输入框    &ndash;&gt;-->
-          <!--              <el-input v-model="form.PERSON_WORK_TYPE" placeholder="这里输入工种..."/>-->
-          <!--              &lt;!&ndash; <el-select v-model="form.PERSON_WORK_TYPE" placeholder="请选择" class="filter-item" style="width: 290px">-->
-          <!--                <el-option v-for="item in workTypeList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.BIANMA"/>-->
-          <!--              </el-select>&ndash;&gt;-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
           <!--第八行-->
           <el-col :span="12"/>
           <el-col :span="12"/>
@@ -542,8 +530,7 @@ export default {
         ADDRESS: [{ required: false, message: '请输入现住址', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '请选择文化程度', trigger: 'blur' }],
         CORP_START_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
-        POST_ID: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+        POST_ID: [{ required: true, message: '请输入岗位名称(工种)', trigger: 'blur' }],
-        // PERSON_WORK_TYPE: [{ required: true, message: '请输入工种', trigger: 'blur' }],
         ENTRY_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
         PHONE: [
           { required: true, message: '请输入手机号码', trigger: 'blur' },
@@ -789,23 +776,6 @@ export default {
       }).catch((e) => {
         this.listLoading = false
       })
-
-      /* requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
-      ).then((data) => {
-        this.postList = data.list
-      }).catch((e) => {
-        this.listLoading = false
-      }) */
-      /* requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: '55484e491a5e442d839c4595380713ec' }
-      ).then((data) => {
-        this.workTypeList = data.list
-      }).catch((e) => {
-        this.listLoading = false
-      }) */
     },
     changePersonType(e) {
       this.dialogFormLicenseInformation = true
@@ -843,20 +813,6 @@ export default {
         })
       })
     },
-    /* getTreetreeDataList() {
-      this.treeLoading = true
-      requestFN(
-        'dictionaries/getLevels',
-        {
-          DICTIONARIES_ID: 'beafb40e1d5f48e3addbccf1d6f29572'
-        }
-      ).then((data) => {
-        this.treeLoading = false
-        this.wenhuachengduList = data.list
-      }).catch((e) => {
-        this.treeLoading = false
-      })
-    }, */
     getLearnerCategory() {
       requestFN(
         '/dictionariesCorp/getLevels',
@@ -932,33 +888,6 @@ export default {
                 }
               }
             }
-            // if (this.form.IS_INJURIES_PAY === '1') {
-            //   if (this.$refs['gongshangFileList'].uploadFiles.length > 0) {
-            //     for (let i = 0; i < this.$refs['gongshangFileList'].uploadFiles.length; i++) {
-            //       if (this.$refs['gongshangFileList'].uploadFiles[i]) {
-            //         formData.append('gongshang', this.$refs['gongshangFileList'].uploadFiles[i].raw)
-            //       }
-            //     }
-            //   }
-            // }
-            // if (this.form.ISPAY === '1') {
-            //   if (this.$refs['insuranceFileList'].uploadFiles.length > 0) {
-            //     for (let i = 0; i < this.$refs['insuranceFileList'].uploadFiles.length; i++) {
-            //       if (this.$refs['insuranceFileList'].uploadFiles[i]) {
-            //         formData.append('insuranceFile', this.$refs['insuranceFileList'].uploadFiles[i].raw)
-            //       }
-            //     }
-            //   }
-            // }
-            // if (this.form.IS_SIGN_LABOR === '1') {
-            //   if (this.$refs['contractFileList'].uploadFiles.length > 0) {
-            //     for (let i = 0; i < this.$refs['contractFileList'].uploadFiles.length; i++) {
-            //       if (this.$refs['contractFileList'].uploadFiles[i]) {
-            //         formData.append('contractFile', this.$refs['contractFileList'].uploadFiles[i].raw)
-            //       }
-            //     }
-            //   }
-            // }
             formData.append('CORPINFO_ID', JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
             upload(
               '/user/' + this.dialogType,
@@ -988,14 +917,6 @@ export default {
       ).then((data) => {
         this.form = Object.assign({}, data.pd) // copy obj
         this.pdrelated = Object.assign({}, data.pdrelated)
-        /* if (this.treeData.length > 0) {
-          for (let i = 0; i < this.treeData.length; i++) {
-            const obj = this.treeData[i]
-            if (this.form.DEPARTMENT_ID == obj.id) {
-              this.DEPARTMENT_NAME = obj.name
-            }
-          }
-        } */
       }).catch((e) => {
         this.listLoading = false
       })

src/views/train/apply/components/record.vue

@@ -59,7 +59,7 @@
       <el-table-column prop="CREATTIME" label="申请时间" align="center" />
       <el-table-column prop="CREATOR" label="申请人员" align="center" />
       <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
-      <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
       <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
       <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
         <template slot-scope="{row}">

src/views/train/apply/components/users.vue

@@ -9,10 +9,6 @@
       width="60%">
       <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
         <h1>申请信息</h1>
-<!--        <span v-if="pd.AUDIT_STATUS === 0">待审核</span>-->
-<!--        <span v-if="pd.AUDIT_STATUS === 1">审核中</span>-->
-<!--        <span v-if="pd.AUDIT_STATUS === 2">待培训</span>-->
-<!--        <span v-if="pd.AUDIT_STATUS === 3">已完成</span>-->
       </div>
       <table class="table-ui" style="margin-bottom: 20px;">
         <tr>
@@ -33,7 +29,7 @@
         </tr>
         <tr>
           <th>主管部门</th>
-          <td>{{ pd.MANAGER_DEPARTMENT_NAME }}</td>
+          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
           <th>审核人</th>
           <td>{{ pd.MANAGER_USER_NAME }}</td>
           <th>审核时间</th>
@@ -72,14 +68,6 @@
             <el-tag v-else type="success">待审核</el-tag>
           </template>
         </el-table-column>
-<!--        <el-table-column prop="STATUS" label="培训状态" align="center" >-->
-<!--          <template slot-scope="{row}">-->
-<!--            <span v-if="row.STATUS === 0">未培训</span>-->
-<!--            <span v-if="row.STATUS === 1">培训中</span>-->
-<!--            <span v-if="row.STATUS === 2">已培训</span>-->
-<!--            <span v-if="row.STATUS === -1">培训未通过</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
         <el-table-column label="操作" align="center" width="200" >
           <template slot-scope="{row}">
             <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
@@ -159,7 +147,7 @@
           <th>政治面貌</th>
           <td>{{ userDetailForm.zzName }} {{
             userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-            }}
+          }}
           </td>
         </tr>
 
@@ -325,50 +313,8 @@
           <td>{{ item.REVIEW_TIME }}</td>
           <th>有效期</th>
           <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-
-          <!--          &lt;!&ndash;          <td v-if="!userEntryForm.TRAIN_AREA">暂无</td>&ndash;&gt;-->
-          <!--          &lt;!&ndash;          <td v-else style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>&ndash;&gt;-->
         </tr>
       </table>
-      <!--      <div v-if="userDetailForm.STATUS === 2" class="level-title mt-20">-->
-<!--      <div class="level-title mt-20">-->
-<!--        <h1>电子入场证</h1>-->
-<!--      </div>-->
-      <!--      <table v-if="userDetailForm.STATUS === 2" class="table-ui" style="margin-bottom: 20px;" >-->
-<!--      <table class="table-ui" style="margin-bottom: 20px;" >-->
-<!--        <tr>-->
-<!--          <th>照片</th>-->
-<!--          <td style="width: 28%">-->
-<!--            <span v-if="imgUrl != ''">-->
-<!--              <div class="img-flex">-->
-<!--                <img :src="imgUrl" width="100" height="100">-->
-<!--              </div>-->
-<!--            </span>-->
-<!--            <span v-else/>-->
-<!--          </td>-->
-<!--          <th>姓名</th>-->
-<!--          <td>{{ userEntryForm.NAME }}</td>-->
-<!--          <th>身份证号</th>-->
-<!--          <td>{{ userEntryForm.CARD_ID }}</td>-->
-<!--        </tr>-->
-<!--        <tr>-->
-<!--          <th>所在单位</th>-->
-<!--          <td>{{ userEntryForm.RELEVANT_UNIT_NAME }}</td>-->
-<!--          <th>工种</th>-->
-<!--          <td>{{ userEntryForm.POST_ID }}</td>-->
-<!--          <th>资质</th>-->
-<!--          <td v-if="userEntryForm.CERTIFICATE">{{ userEntryForm.CERTIFICATE }}</td>-->
-<!--          <td v-else>暂无</td>-->
-<!--        </tr>-->
-<!--        <tr>-->
-<!--          <th>培训时间</th>-->
-<!--          <td>{{ formatDate(userEntryForm.START_DATE) }}</td>-->
-<!--          <th>有效期限</th>-->
-<!--          <td>{{ formatDate(userEntryForm.END_DATE) }}</td>-->
-<!--          <th>二维码</th>-->
-<!--          <td style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>-->
-<!--        </tr>-->
-<!--      </table>-->
 
       <div v-if="userDetailForm.SUPERVISION_STATE === 0 || userDetailForm.MANAGER_STATE === 0 || userDetailForm.TERRITORIALITY_STATE === 0" class="level-title mt-20">
         <h1>打回信息</h1>