From ba894bd4f32133b71c567391cc865ee9b490a948 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 28 Dec 2023 14:46:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/list.vue        |   2 +-
 src/views/xgf/flow/components/userInfo.vue    | 409 ------------------
 .../xgf/flowApply/components/userInfo.vue     |   7 +-
 src/views/xgf/flowList/components/list.vue    |   2 +-
 .../xgf/flowList/components/userInfo.vue      | 409 ------------------
 5 files changed, 8 insertions(+), 821 deletions(-)
 delete mode 100644 src/views/xgf/flow/components/userInfo.vue
 delete mode 100644 src/views/xgf/flowList/components/userInfo.vue

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index bf01575..27767b3 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -67,7 +67,7 @@ import vueQr from 'vue-qr'
 import apply from './apply'
 import user from './user.vue'
 import SendUtil from './sendUtil.vue'
-import UserInfo from './userInfo.vue'
+import UserInfo from '../../flowApply/components/userInfo.vue'
 
 export default {
   components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
diff --git a/src/views/xgf/flow/components/userInfo.vue b/src/views/xgf/flow/components/userInfo.vue
deleted file mode 100644
index 3b7e987..0000000
--- a/src/views/xgf/flow/components/userInfo.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-loading="loading"
-      v-if="visible"
-      :visible.sync="visible"
-      :append-to-body="true"
-      title="查看"
-      width="80%">
-      <div class="information">
-        <el-scrollbar style="height: 550px;margin-bottom: 10px">
-          <table class="table-ui" style="margin-bottom: 20px;">
-            <div class="level-title">
-              <h1>人员信息</h1>
-            </div>
-            <tr>
-              <th>照片</th>
-              <td>
-                <span v-if="imgUrl != ''">
-                  <div class="img-flex">
-                    <viewer>
-                      <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-                <span v-else/>
-              </td>
-              <th>姓名</th>
-              <td>{{ userDetailForm.NAME }}</td>
-              <th>性别</th>
-              <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-            </tr>
-            <tr>
-              <th>出生年月</th>
-              <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-              <th>年龄</th>
-              <td>{{ userDetailForm.AGE }}</td>
-              <th>手机号</th>
-              <td>{{ userDetailForm.PHONE }}</td>
-            </tr>
-            <tr>
-              <th>身份证</th>
-              <td>{{ userDetailForm.CARD_ID }}</td>
-              <th>身份证照片</th>
-              <!--if条件不可删除-->
-              <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in userCardIDPhotoFile"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-
-            <tr>
-              <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-              <th>婚姻状况</th>
-              <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-              <th>政治面貌</th>
-              <td>{{ userDetailForm.zzName }} {{
-                userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-              }}
-              </td>
-            </tr>
-
-            <tr>
-              <th>户口所在地</th>
-              <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-              <th>现住址</th>
-              <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-              <th>联系电话</th>
-              <td>{{ userDetailForm.PHONE }}</td>
-            </tr>
-            <tr>
-              <th>文化程度</th>
-              <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-              <th>岗位名称(工种)</th>
-              <td colspan="5">{{ userDetailForm.POST_ID }}</td>
-            </tr>
-            <tr>
-              <th>是否缴纳社保</th>
-              <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-              <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-              <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-              <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-              <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in socialPhotoFile"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-            <tr>
-              <th>是否参加三级安全培训</th>
-              <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-              <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-              <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in photosOfLevel"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-            <tr>
-              <th>是否缴纳保险</th>
-              <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
-              <th>是否特殊工种</th>
-              <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-              <th>是否流动人员</th>
-              <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-            </tr>
-          </table>
-          <div>
-            <div class="level-title">
-              <h1>培训记录</h1>
-            </div>
-            <el-table
-              :data="trainRecordList"
-              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-              tooltip-effect="dark"
-              border
-              fit
-              highlight-current-row>
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column type="index" label="序号" width="50" align="center"/>
-              <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
-              <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
-              <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
-              <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-              <el-table-column label="培训有效期" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-              <h1>特种作业人员信息</h1>
-            </div>
-            <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-              <tr>
-                <th style="width: 150px">证书名称</th>
-                <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-                <th style="width: 150px">作业类别</th>
-                <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-                <th style="width: 150px">操作项目</th>
-                <td>{{ item.OPERATION_TYPE_NAME }}</td>
-              </tr>
-              <tr>
-                <th>特种作业证书编号</th>
-                <td>{{ item.SPECIAL_NUMBER }}</td>
-                <th>发证机关</th>
-                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-              </tr>
-              <tr>
-                <th>复审时间</th>
-                <td>{{ item.REVIEW_TIME }}</td>
-                <th>有效期</th>
-                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-              </tr>
-            </table>
-            <div v-if="applyList.length > 0" class="level-title mt-20">
-              <h1>申请信息</h1>
-            </div>
-            <el-table
-              v-if="applyList.length > 0"
-              :data="applyList"
-              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-              tooltip-effect="dark"
-              border
-              fit
-              highlight-current-row>
-              <el-table-column type="expand">
-                <template slot-scope="props">
-                  <el-row>
-                    <el-form label-position="left" inline class="demo-table-expand">
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="属地管理部门">
-                          <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="审批人">
-                          <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="审批结果">
-                          <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
-                          <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item v-if="false" label="审批意见">
-                          <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="5">
-                        <el-form-item label="主管部门">
-                          <span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span>{{ props.row.MANAGER_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
-                          <span v-if="props.row.MANAGER_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item label="审批意见">
-                          <span>{{ props.row.MANAGER_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="5">
-                        <el-form-item label="主管部门">
-                          <span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span>{{ props.row.SUPERVISION_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
-                          <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item label="审批意见">
-                          <span>{{ props.row.SUPERVISION_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-                    </el-form>
-                  </el-row>
-                </template>
-              </el-table-column>
-              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
-              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
-              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
-                  <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
-              <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.MANAGER_STATE === 0">不通过</span>
-                  <span v-if="row.MANAGER_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
-              <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
-                  <span v-if="row.SUPERVISION_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <div slot="footer" class="dialog-footer">
-                <el-button @click="visible = false">关 闭</el-button>
-              </div>
-            </el-table>
-          </div>
-        </el-scrollbar>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">取 消</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import vueQr from 'vue-qr'
-import dateformat from '@/utils/dateformat'
-import { requestFN } from '@/utils/request'
-
-export default {
-  components: { vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      imgUrl: '',
-      userDetailForm: {},
-      userCardIDPhotoFile: [], // 身份证照片
-      trainRecordList: [],
-      photosOfLevel: [], // 三级教育照片
-      specialUsersList: {},
-      insuranceFileList: [], // 保险文件
-      contractFileList: [],
-      socialPhotoFile: [],
-      gongshangbaoxianFile: [],
-      applyList: [],
-      loading: false,
-      heirloom: {},
-      config: config
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.heirloom = JSON.parse(JSON.stringify(e))
-      this.getUserInfoById(this.heirloom)
-    },
-    formatDate(date, column) {
-      if (date) {
-        return dateformat(date, 'YYYY-MM-DD')
-      } else {
-        return ''
-      }
-    },
-    getUserInfoById(row) {
-      this.loading = true
-      requestFN(
-        '/xgf/user/getInfo',
-        {
-          XGF_USER_ID: row.XGF_USER_ID,
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-          CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
-        }
-      ).then((data) => {
-        this.loading = false
-        Object.assign(this.userDetailForm, data.info)
-        const picture = data.img
-        this.userPhotoFile = picture.userPhotoFile
-        if (this.userPhotoFile.length > 0) {
-          this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
-        }
-        this.photosOfLevel = picture.photosOfLevel
-        this.specialUsersList = picture.specialUsers
-        this.insuranceFileList = picture.insuranceFile
-        this.contractFileList = picture.contractFile
-        this.userCardIDPhotoFile = picture.userCardIDPhotoFile
-        this.socialPhotoFile = picture.socialPhotoFile
-        this.gongshangbaoxianFile = picture.gongshangbaoxianFile
-        if (row.STATUS === '2') {
-          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
-        } else {
-          this.qrCodeStr = ''
-        }
-        this.trainRecordList = data.trainRecordList
-        this.applyList = data.applyList
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
-    formatLabel(value) {
-      if (value == '1') {
-        return '是'
-      } else if (value == '0') {
-        return '否'
-      } else {
-        return ''
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
-<style scoped>
-.information >>> .el-scrollbar__wrap {
-  overflow-x: hidden;
-}
-</style>
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index bb3a701..05b7242 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -154,7 +154,12 @@
               <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
               <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
               <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-              <el-table-column prop="TRAINING_HOURS" label="培训学时" align="center"/>
+              <el-table-column prop="TRAINING_HOURS" label="培训结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.STATUS === '0'">不合格</span>
+                  <span v-if="row.STATUS === '1'">合格</span>
+                </template>
+              </el-table-column>
               <el-table-column label="培训有效期" align="center">
                 <template slot-scope="{row}">
                   <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
diff --git a/src/views/xgf/flowList/components/list.vue b/src/views/xgf/flowList/components/list.vue
index a6ffa55..0b313c5 100644
--- a/src/views/xgf/flowList/components/list.vue
+++ b/src/views/xgf/flowList/components/list.vue
@@ -70,7 +70,7 @@ import vueQr from 'vue-qr'
 import apply from './apply'
 import user from './user.vue'
 import SendUtil from './sendUtil.vue'
-import UserInfo from './userInfo.vue'
+import UserInfo from '../../flowApply/components/userInfo.vue'
 
 export default {
   components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
diff --git a/src/views/xgf/flowList/components/userInfo.vue b/src/views/xgf/flowList/components/userInfo.vue
deleted file mode 100644
index 3b7e987..0000000
--- a/src/views/xgf/flowList/components/userInfo.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-loading="loading"
-      v-if="visible"
-      :visible.sync="visible"
-      :append-to-body="true"
-      title="查看"
-      width="80%">
-      <div class="information">
-        <el-scrollbar style="height: 550px;margin-bottom: 10px">
-          <table class="table-ui" style="margin-bottom: 20px;">
-            <div class="level-title">
-              <h1>人员信息</h1>
-            </div>
-            <tr>
-              <th>照片</th>
-              <td>
-                <span v-if="imgUrl != ''">
-                  <div class="img-flex">
-                    <viewer>
-                      <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-                <span v-else/>
-              </td>
-              <th>姓名</th>
-              <td>{{ userDetailForm.NAME }}</td>
-              <th>性别</th>
-              <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-            </tr>
-            <tr>
-              <th>出生年月</th>
-              <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-              <th>年龄</th>
-              <td>{{ userDetailForm.AGE }}</td>
-              <th>手机号</th>
-              <td>{{ userDetailForm.PHONE }}</td>
-            </tr>
-            <tr>
-              <th>身份证</th>
-              <td>{{ userDetailForm.CARD_ID }}</td>
-              <th>身份证照片</th>
-              <!--if条件不可删除-->
-              <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in userCardIDPhotoFile"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-
-            <tr>
-              <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-              <th>婚姻状况</th>
-              <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-              <th>政治面貌</th>
-              <td>{{ userDetailForm.zzName }} {{
-                userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-              }}
-              </td>
-            </tr>
-
-            <tr>
-              <th>户口所在地</th>
-              <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-              <th>现住址</th>
-              <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-              <th>联系电话</th>
-              <td>{{ userDetailForm.PHONE }}</td>
-            </tr>
-            <tr>
-              <th>文化程度</th>
-              <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-              <th>岗位名称(工种)</th>
-              <td colspan="5">{{ userDetailForm.POST_ID }}</td>
-            </tr>
-            <tr>
-              <th>是否缴纳社保</th>
-              <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-              <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-              <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-              <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-              <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in socialPhotoFile"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-            <tr>
-              <th>是否参加三级安全培训</th>
-              <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-              <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-              <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
-                <span>
-                  <div class="img-flex">
-                    <viewer>
-                      <img
-                        v-for="item in photosOfLevel"
-                        :src="config.fileUrl + item.FILEPATH"
-                        :key="item.IMGFILES_ID"
-                        width="40"
-                        height="40"
-                        style="object-fit: cover;">
-                    </viewer>
-                  </div>
-                </span>
-              </td>
-            </tr>
-            <tr>
-              <th>是否缴纳保险</th>
-              <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
-              <th>是否特殊工种</th>
-              <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-              <th>是否流动人员</th>
-              <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-            </tr>
-          </table>
-          <div>
-            <div class="level-title">
-              <h1>培训记录</h1>
-            </div>
-            <el-table
-              :data="trainRecordList"
-              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-              tooltip-effect="dark"
-              border
-              fit
-              highlight-current-row>
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column type="index" label="序号" width="50" align="center"/>
-              <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
-              <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
-              <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
-              <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-              <el-table-column label="培训有效期" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-              <h1>特种作业人员信息</h1>
-            </div>
-            <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-              <tr>
-                <th style="width: 150px">证书名称</th>
-                <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-                <th style="width: 150px">作业类别</th>
-                <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-                <th style="width: 150px">操作项目</th>
-                <td>{{ item.OPERATION_TYPE_NAME }}</td>
-              </tr>
-              <tr>
-                <th>特种作业证书编号</th>
-                <td>{{ item.SPECIAL_NUMBER }}</td>
-                <th>发证机关</th>
-                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-              </tr>
-              <tr>
-                <th>复审时间</th>
-                <td>{{ item.REVIEW_TIME }}</td>
-                <th>有效期</th>
-                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-              </tr>
-            </table>
-            <div v-if="applyList.length > 0" class="level-title mt-20">
-              <h1>申请信息</h1>
-            </div>
-            <el-table
-              v-if="applyList.length > 0"
-              :data="applyList"
-              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-              tooltip-effect="dark"
-              border
-              fit
-              highlight-current-row>
-              <el-table-column type="expand">
-                <template slot-scope="props">
-                  <el-row>
-                    <el-form label-position="left" inline class="demo-table-expand">
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="属地管理部门">
-                          <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="审批人">
-                          <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item v-if="false" label="审批结果">
-                          <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
-                          <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item v-if="false" label="审批意见">
-                          <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="5">
-                        <el-form-item label="主管部门">
-                          <span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span>{{ props.row.MANAGER_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
-                          <span v-if="props.row.MANAGER_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item label="审批意见">
-                          <span>{{ props.row.MANAGER_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="5">
-                        <el-form-item label="主管部门">
-                          <span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span>{{ props.row.SUPERVISION_USER_NAME }}</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="5">
-                        <el-form-item label="审批人">
-                          <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
-                          <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="9">
-                        <el-form-item label="审批意见">
-                          <span>{{ props.row.SUPERVISION_OPINION }}</span>
-                        </el-form-item>
-                      </el-col>
-                    </el-form>
-                  </el-row>
-                </template>
-              </el-table-column>
-              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
-              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
-              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
-                  <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
-              <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.MANAGER_STATE === 0">不通过</span>
-                  <span v-if="row.MANAGER_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
-              <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
-                <template slot-scope="{row}">
-                  <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
-                  <span v-if="row.SUPERVISION_STATE ===1">通过</span>
-                </template>
-              </el-table-column>
-              <div slot="footer" class="dialog-footer">
-                <el-button @click="visible = false">关 闭</el-button>
-              </div>
-            </el-table>
-          </div>
-        </el-scrollbar>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">取 消</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import vueQr from 'vue-qr'
-import dateformat from '@/utils/dateformat'
-import { requestFN } from '@/utils/request'
-
-export default {
-  components: { vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      imgUrl: '',
-      userDetailForm: {},
-      userCardIDPhotoFile: [], // 身份证照片
-      trainRecordList: [],
-      photosOfLevel: [], // 三级教育照片
-      specialUsersList: {},
-      insuranceFileList: [], // 保险文件
-      contractFileList: [],
-      socialPhotoFile: [],
-      gongshangbaoxianFile: [],
-      applyList: [],
-      loading: false,
-      heirloom: {},
-      config: config
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.heirloom = JSON.parse(JSON.stringify(e))
-      this.getUserInfoById(this.heirloom)
-    },
-    formatDate(date, column) {
-      if (date) {
-        return dateformat(date, 'YYYY-MM-DD')
-      } else {
-        return ''
-      }
-    },
-    getUserInfoById(row) {
-      this.loading = true
-      requestFN(
-        '/xgf/user/getInfo',
-        {
-          XGF_USER_ID: row.XGF_USER_ID,
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-          CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
-        }
-      ).then((data) => {
-        this.loading = false
-        Object.assign(this.userDetailForm, data.info)
-        const picture = data.img
-        this.userPhotoFile = picture.userPhotoFile
-        if (this.userPhotoFile.length > 0) {
-          this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
-        }
-        this.photosOfLevel = picture.photosOfLevel
-        this.specialUsersList = picture.specialUsers
-        this.insuranceFileList = picture.insuranceFile
-        this.contractFileList = picture.contractFile
-        this.userCardIDPhotoFile = picture.userCardIDPhotoFile
-        this.socialPhotoFile = picture.socialPhotoFile
-        this.gongshangbaoxianFile = picture.gongshangbaoxianFile
-        if (row.STATUS === '2') {
-          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
-        } else {
-          this.qrCodeStr = ''
-        }
-        this.trainRecordList = data.trainRecordList
-        this.applyList = data.applyList
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
-    formatLabel(value) {
-      if (value == '1') {
-        return '是'
-      } else if (value == '0') {
-        return '否'
-      } else {
-        return ''
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
-<style scoped>
-.information >>> .el-scrollbar__wrap {
-  overflow-x: hidden;
-}
-</style>

From c6bacc5cff243ce2bf10295b55331af78ae14c19 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 4 Jan 2024 10:56:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?13075=20=E6=9C=AA=E5=81=9A=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E9=87=8C=E8=BE=B9=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=A0=E9=99=A4=E5=90=8E=E6=89=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=88=A0=E9=99=A4=E5=A4=96=E8=BE=B9=E7=9A=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promise_book/components/list.vue          | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/views/security_commitment/promise_book/components/list.vue b/src/views/security_commitment/promise_book/components/list.vue
index 1c80b01..97b0068 100644
--- a/src/views/security_commitment/promise_book/components/list.vue
+++ b/src/views/security_commitment/promise_book/components/list.vue
@@ -241,18 +241,37 @@ export default {
       this.$confirm(`确定要删除当前承诺书吗？`, {
         type: 'warning'
       }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         requestFN(
-          '/corppromise/delete',
-          {
-            PROMISE_ID
-          }
+          '/corppromise/peopledetails?showCount=10&currentPage=1',
+          { PROMISE_ID: PROMISE_ID }
         ).then((data) => {
-          this.listQuery.limit = this.listQuery.limit
-          this.listQuery.page = this.listQuery.page
-          this.$message.success('操作成功')
-          this.getList()
+          if ((!data.varList) || data.varList.length > 0) {
+            this.$message.error('当前承诺书已经被使用，不能删除')
+            loading.close()
+            return
+          }
+          requestFN(
+            '/corppromise/delete',
+            {
+              PROMISE_ID
+            }
+          ).then((data) => {
+            this.listQuery.limit = this.listQuery.limit
+            this.listQuery.page = this.listQuery.page
+            this.$message.success('操作成功')
+            this.getList()
+          }).catch((e) => {
+            this.$message.success('操作失败')
+          })
+          loading.close()
         }).catch((e) => {
-          this.$message.success('操作失败')
+          loading.close()
         })
       }).catch(() => {})
     }

From 07b12c3c051ac0f062cb244599319adb36256203 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 5 Jan 2024 09:29:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?13025=20=E7=94=A8=E5=B7=A5=E5=BD=A2?=
 =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/audit/components/edit.vue       | 36 +++----------------
 .../xgf/insert/components/corpInfoEdit.vue    |  3 --
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/views/xgf/audit/components/edit.vue b/src/views/xgf/audit/components/edit.vue
index 2e0317c..6e98470 100644
--- a/src/views/xgf/audit/components/edit.vue
+++ b/src/views/xgf/audit/components/edit.vue
@@ -172,7 +172,7 @@
               <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
                 <Treeselect
                   :options="employmentTypeList"
-                  :normalizer="SpecialNormalizer"
+                  :normalizer="normalizer"
                   v-model="dataForm.EMPLOYMENT_FORM"
                   placeholder="请选择用工形式"
                   no-options-text="暂无数据"
@@ -886,12 +886,13 @@ export default {
     },
     getDict() {
       requestFN(
-        '/xgf/dictionaries/getLevels',
+        '/xgf/dictionaries/listSelectTree',
         {
           DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
         }
       ).then((data) => {
-        this.employmentTypeList = data.list
+        const employmentTypeList = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+        this.employmentTypeList = this.removeEmptyChildren(employmentTypeList)
       })
       requestFN(
         '/xgf/dictionaries/getLevels',
@@ -929,35 +930,6 @@ export default {
 
     // 获取数据字典数据
     getDictByDicId(dicId) {
-      /* var dicListVal = []
-      return new Promise((resolve) => {
-        let id = ''
-        if (!dicId) {
-          id = '0'
-        } else {
-          id = dicId
-        }
-        requestFN(
-          '/dictionaries/getLevelsAndSCount',
-          {
-            DICTIONARIES_ID: id
-          }
-        ).then((data) => {
-          if (data.list.length > 0) {
-            dicListVal = data.list.map((e) => {
-              if (e.zcount == '0') {
-                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, leaf: true }
-              } else {
-                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, children: [], leaf: false }
-              }
-            })
-          } else {
-            dicListVal = undefined
-          }
-          return resolve(dicListVal)
-        }).catch((e) => {
-        })
-      }) */
     },
     // 地图相关
     mapOpen() {
diff --git a/src/views/xgf/insert/components/corpInfoEdit.vue b/src/views/xgf/insert/components/corpInfoEdit.vue
index 38985d0..85186a1 100644
--- a/src/views/xgf/insert/components/corpInfoEdit.vue
+++ b/src/views/xgf/insert/components/corpInfoEdit.vue
@@ -154,9 +154,6 @@
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
-                <!--                <el-select v-model="form.EMPLOYMENT_FORM" style="width: 100%;">-->
-                <!--                  <el-option v-for="item in employmentTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />-->
-                <!--                </el-select>-->
                 <Treeselect
                   :options="employmentTypeList"
                   :normalizer="normalizer"