From 0422c83c25a5868f5d6378645b160794325ed79a Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 6 Dec 2023 15:02:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/insert/components/corpInfoAdd.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/xgf/insert/components/corpInfoAdd.vue b/src/views/xgf/insert/components/corpInfoAdd.vue index ca22578..32e05ed 100644 --- a/src/views/xgf/insert/components/corpInfoAdd.vue +++ b/src/views/xgf/insert/components/corpInfoAdd.vue @@ -436,7 +436,6 @@ export default { this.form.CITY = this.form.POSSESSION[1] || '' this.form.COUNTY = this.form.POSSESSION[2] || '' this.form.VILLAGE = this.form.POSSESSION[3] || '' - // this.form.STREET = this.form.POSSESSION[4] || '' this.form.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : '' } this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',') From 5c76e3a777225e491e4ae86465a55e9f8a4635c8 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 6 Dec 2023 16:52:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow_audit/index.vue | 9 +-------- src/views/xgf/flow_audit/users.vue | 18 +++++++----------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue index 4284de7..2cc1e97 100644 --- a/src/views/xgf/flow_audit/index.vue +++ b/src/views/xgf/flow_audit/index.vue @@ -20,13 +20,6 @@ /> - - - - - - - @@ -65,7 +58,7 @@ diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue index d20cafb..57b707d 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -9,12 +9,6 @@ width="60%">

申请信息

- - - - - -
@@ -79,7 +73,7 @@ size="mini" @click="getUserInfo(row)">电子合格证 - 审核 + 审核 @@ -251,9 +245,6 @@ - - -
{{ item.REVIEW_TIME }} 有效期 {{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}
@@ -423,6 +414,7 @@ export default { this.form.USER_COUNT = this.pd.USER_COUNT this.form.type = '2' this.form.USER_ID = row.USER_ID + this.form.STEP_STATUS = row.STEP_STATUS this.dialogVisible = true }, // 提交审批意见 @@ -438,7 +430,6 @@ export default { return } } - requestFN( '/flowTrain/approveUser', { ...this.form } ).then((data) => { @@ -524,6 +515,11 @@ export default { !(row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0)) { return '评审中' } + }, + tableRowClassName({ row, rowIndex }) { + if (row.STEP_STATUS === '3') { + return 'warning-row' + } } } } From df4337b95a8c40537ea5ab96dfd346c4cd73c850 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 7 Dec 2023 15:02:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=86=E5=8F=B2bug=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_audit/users.vue | 60 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue index 57b707d..04debc5 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -24,7 +24,7 @@ 安全监督部门 {{ pd.SUPERVISION_DEPT_NAME }} 审核人员 - {{ pd.SUPERVISION_USER_USERNAME }} + {{ pd.SUPERVISION_USER_NAME }} 审核时间 {{ pd.SUPERVISION_TIME }} @@ -32,7 +32,7 @@ 主管部门 {{ pd.MANAGER_DEPT_NAME }} 审核人员 - {{ pd.MANAGER_USER_USERNAME }} + {{ pd.MANAGER_USER_NAME }} 审核时间 {{ pd.MANAGER_TIME }} @@ -40,7 +40,7 @@ 管理部门 {{ pd.ERRITORIALITY_DEPT_NAME }} 审核人员 - {{ pd.ERRITORIALITY_USER_USERNAME }} + {{ pd.ERRITORIALITY_USER_NAME }} 审核时间 {{ pd.TERRITORIALITY_TIME }} @@ -53,33 +53,47 @@

申请人员列表

- - - - - - - + + + + + + +
- +
关 闭 @@ -144,7 +158,7 @@ 民族 - {{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }} + {{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }} 婚姻状况 {{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} 政治面貌 @@ -156,9 +170,9 @@ 户口所在地 - {{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }} + {{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }} 现住址 - {{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }} + {{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }} 联系电话 {{ userDetailForm.PHONE }} @@ -194,7 +208,7 @@ 是否参加三级安全培训 - {{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} + {{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} 三级安全培训照片 @@ -214,18 +228,18 @@ 是否缴纳保险 - {{ formatLabelBf(userDetailForm.IS_BF) }} + {{ formatLabelBf(userDetailForm.IS_BF) }} 是否特殊工种 - {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} + {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} 是否流动人员 - {{ formatLabel(userDetailForm.ISFLOW) }} + {{ formatLabel(userDetailForm.ISFLOW) }}

特种作业人员信息

- +
@@ -261,7 +275,7 @@ - + From b5edd17703876c19609c6da400d625ddbe9a0eb4 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 12 Dec 2023 16:27:18 +0800 Subject: [PATCH 4/4] =?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 --- .../security_commitment/promise_book/components/details.vue | 2 +- src/views/xgf/flow_audit/users.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/security_commitment/promise_book/components/details.vue b/src/views/security_commitment/promise_book/components/details.vue index 9a09130..fd52cc9 100644 --- a/src/views/security_commitment/promise_book/components/details.vue +++ b/src/views/security_commitment/promise_book/components/details.vue @@ -25,7 +25,7 @@ diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue index 04debc5..200a066 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -37,7 +37,7 @@ - +
证书名称 {{ item.CERTIFICATE }} {{ pd.MANAGER_TIME }}
管理部门集团单位 {{ pd.ERRITORIALITY_DEPT_NAME }} 审核人员 {{ pd.ERRITORIALITY_USER_NAME }}