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/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..200a066 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -9,12 +9,6 @@ width="60%">

申请信息

- - - - - -
@@ -30,7 +24,7 @@ - + @@ -38,15 +32,15 @@ - + - + - + @@ -59,33 +53,47 @@

申请人员列表

- - - - - - - + + + + + + +
- +
关 闭 @@ -150,7 +158,7 @@
- + @@ -162,9 +170,9 @@ - + - + @@ -200,7 +208,7 @@ - + - + - + - +
安全监督部门 {{ pd.SUPERVISION_DEPT_NAME }} 审核人员{{ pd.SUPERVISION_USER_USERNAME }}{{ pd.SUPERVISION_USER_NAME }} 审核时间 {{ pd.SUPERVISION_TIME }}
主管部门 {{ pd.MANAGER_DEPT_NAME }} 审核人员{{ pd.MANAGER_USER_USERNAME }}{{ pd.MANAGER_USER_NAME }} 审核时间 {{ pd.MANAGER_TIME }}
管理部门集团单位 {{ pd.ERRITORIALITY_DEPT_NAME }} 审核人员{{ pd.ERRITORIALITY_USER_USERNAME }}{{ pd.ERRITORIALITY_USER_NAME }} 审核时间 {{ pd.TERRITORIALITY_TIME }}
民族{{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }}{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }} 婚姻状况 {{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} 政治面貌
户口所在地{{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }}{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }} 现住址{{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }}{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }} 联系电话 {{ userDetailForm.PHONE }}
是否参加三级安全培训{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} 三级安全培训照片 @@ -220,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) }}

特种作业人员信息

- +
@@ -251,9 +259,6 @@ - - -
证书名称 {{ item.CERTIFICATE }}{{ item.REVIEW_TIME }} 有效期 {{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}
@@ -270,7 +275,7 @@ - + @@ -423,6 +428,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 +444,6 @@ export default { return } } - requestFN( '/flowTrain/approveUser', { ...this.form } ).then((data) => { @@ -524,6 +529,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' + } } } } 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(',')