From 811071680d0923b7b3c04c1cffb202fd5145f2b4 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 10:02:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?Revert=20"[=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0](pet)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5c21788daf1e8247abaf8977e61a2c294b1e0d77. --- src/views/safetyenvironmental/inspection/components/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 4389bb3..7d38400 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -471,7 +471,7 @@ export default { }).then(() => { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hide', + '/safetyenvironmental/hide', { INSPECTION_ID: id, hide: '1' From 03225846fc079c756644f92bb7d82bc8afb5e682 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 10:02:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?Revert=20"[=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0](dev)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 95525221d5e1734fdf47c3bede388348365760a8. --- src/views/corpInfo/user/components/edit.vue | 30 +++++++++---------- src/views/corpInfo/user/components/list.vue | 8 ++--- .../corpInfo/userCenter/components/list.vue | 7 ++--- .../archive/components/assign.vue | 2 +- .../archive/components/info.vue | 2 +- .../hidden/components/assign.vue | 2 +- .../inspection/components/info.vue | 2 +- .../inspection/components/list.vue | 2 +- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index 3fa86e8..00c1136 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -798,12 +798,12 @@ export default { { validator: hasUser, trigger: 'blur' } ], EMAIL: [ - { required: false, message: '请输入邮箱', trigger: 'blur' }, + { required: true, message: '请输入邮箱', trigger: 'blur' }, { pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, message: '请输入正确的邮箱' - } - // { validator: hasEmail, trigger: 'blur' } + }, + { validator: hasEmail, trigger: 'blur' } ], PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }], ROLE_NAME: [{ required: true, message: '请选择角色组', trigger: 'change' }], @@ -811,8 +811,8 @@ export default { DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }], DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }], SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }], - NATION: [{ required: false, trigger: 'blur' }], - SEX: [{ required: false, trigger: 'blur' }], + NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }], + SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }], POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }], DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }], DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }], @@ -827,7 +827,7 @@ export default { TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }], DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }], // /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/ - USER_ID_CARD: [{ required: false, trigger: 'blur' }, + USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, { pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: '请输入正确的身份证号' @@ -1055,8 +1055,8 @@ export default { this.ISCHECK = false } } else { - // this.$message.warning('请确认身份证号与手机号后进行校验') - this.ISCHECK = true + this.$message.warning('请确认身份证号与手机号后进行校验') + this.ISCHECK = false } }, getScheduleAll() { @@ -1441,13 +1441,13 @@ export default { // debugger // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息 this.$refs.form.validate(valid => { - // if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { - // this.$message({ - // message: '请上传人脸照片', - // type: 'error' - // }) - // return false - // } + if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { + this.$message({ + message: '请上传人脸照片', + type: 'error' + }) + return false + } let isUpdateFace = '0' if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) { isUpdateFace = '1' diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 90422c7..3dac564 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -48,11 +48,9 @@ 一键密码重置 - - - - - + + 导入 + 导出 diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index 7a22021..630be9a 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,10 +48,9 @@ 一键密码重置 - - - - + + 导入 + 导出 diff --git a/src/views/safetyenvironmental/archive/components/assign.vue b/src/views/safetyenvironmental/archive/components/assign.vue index 8cbbb66..aaceb36 100644 --- a/src/views/safetyenvironmental/archive/components/assign.vue +++ b/src/views/safetyenvironmental/archive/components/assign.vue @@ -340,7 +340,7 @@ export default { }) this.listLoading = true requestFN( - '/hidden/assign', + '/safetyenvironmental/V2/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index cdc7b26..c0c30af 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -243,7 +243,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/goShow', + '/safetyenvironmental/V2/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/hidden/components/assign.vue b/src/views/safetyenvironmental/hidden/components/assign.vue index 78a49c1..53728ea 100644 --- a/src/views/safetyenvironmental/hidden/components/assign.vue +++ b/src/views/safetyenvironmental/hidden/components/assign.vue @@ -436,7 +436,7 @@ export default { }) this.listLoading = true requestFN( - '/hidden/assign', + '/safetyenvironmental/V2/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index 2414b31..a0d65fd 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -306,7 +306,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/goShow', + '/safetyenvironmental/V2/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 7d38400..3077154 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -357,7 +357,7 @@ export default { getList() { this.listLoading = true requestFN( - '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { ...this.search, INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], From c6406f81919285ce3f69c82e479cc612f1b9aab5 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Sat, 14 Sep 2024 10:04:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firefighting/points/components/list.vue | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index d28bce7..c9590ce 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -73,7 +73,7 @@ 否 - + @@ -255,6 +263,24 @@ export default { // const jsonStr = JSON.stringify(json) // this.qrcodeStr = jsonStr }, + handleShowRecordQr(ROW) { + this.dialogFormShow = true; + // 确保qrInfo绑定了需要显示的数据字段 + this.qrInfo = { + FIRE_REGION_NAME: ROW.FIRE_REGION_NAME, // 消防区域 + FIRE_POINT_NAME: ROW.FIRE_POINT_NAME, // 消防点位 + DEPARTMENT_NAME: ROW.DEPARTMENT_NAME, // 负责部门 + USERNAME: ROW.USERNAME // 负责人 + }; + const json = { + MANAGER_TYPE: 'checkRecordManager', + USER_ID: ROW.USER_ID, + DEPARTMENT_ID: ROW.DEPARTMENT_ID, + FIRE_POINT_ID: ROW.FIRE_POINT_ID + }; + const jsonStr = JSON.stringify(json); + this.qrcodeStr = jsonStr; + }, handleEdit(FIRE_POINT_ID) { this.$parent.FIRE_POINT_ID = FIRE_POINT_ID this.$parent.activeName = 'Edit' From 7c766ad93c72b71b82d2999c2737b949d3e9c465 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 10:15:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?Revert=20"[=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0](pet)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5c21788daf1e8247abaf8977e61a2c294b1e0d77. --- src/views/safetyenvironmental/archive/components/assign.vue | 2 +- src/views/safetyenvironmental/archive/components/info.vue | 2 +- src/views/safetyenvironmental/hidden/components/assign.vue | 2 +- src/views/safetyenvironmental/inspection/components/info.vue | 2 +- src/views/safetyenvironmental/inspection/components/list.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/safetyenvironmental/archive/components/assign.vue b/src/views/safetyenvironmental/archive/components/assign.vue index aaceb36..8cbbb66 100644 --- a/src/views/safetyenvironmental/archive/components/assign.vue +++ b/src/views/safetyenvironmental/archive/components/assign.vue @@ -340,7 +340,7 @@ export default { }) this.listLoading = true requestFN( - '/safetyenvironmental/V2/assign', + '/hidden/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index c0c30af..cdc7b26 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -243,7 +243,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/hidden/components/assign.vue b/src/views/safetyenvironmental/hidden/components/assign.vue index 53728ea..78a49c1 100644 --- a/src/views/safetyenvironmental/hidden/components/assign.vue +++ b/src/views/safetyenvironmental/hidden/components/assign.vue @@ -436,7 +436,7 @@ export default { }) this.listLoading = true requestFN( - '/safetyenvironmental/V2/assign', + '/hidden/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index a0d65fd..2414b31 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -306,7 +306,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 3077154..7d38400 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -357,7 +357,7 @@ export default { getList() { this.listLoading = true requestFN( - '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { ...this.search, INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], From 715f12c80e213cc466ab823527e8378b3ae6cb32 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 10:22:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"[BUG=E4=BF=AE=E5=A4=8D](dev)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit aec58b0f91b3d90505983600d712e90d4f228c9e. --- src/views/safetyenvironmental/inspection/components/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 7d38400..4389bb3 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -471,7 +471,7 @@ export default { }).then(() => { this.listLoading = true requestFN( - '/safetyenvironmental/hide', + '/safetyenvironmental/V2/hide', { INSPECTION_ID: id, hide: '1' From e57940b6f5294643e495cd6d105ded8c316013b6 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sat, 14 Sep 2024 10:26:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?Reapply=20"[=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0](dev)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 03225846fc079c756644f92bb7d82bc8afb5e682. --- src/views/corpInfo/user/components/edit.vue | 30 +++++++++---------- src/views/corpInfo/user/components/list.vue | 8 +++-- .../corpInfo/userCenter/components/list.vue | 7 +++-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index 00c1136..3fa86e8 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -798,12 +798,12 @@ export default { { validator: hasUser, trigger: 'blur' } ], EMAIL: [ - { required: true, message: '请输入邮箱', trigger: 'blur' }, + { required: false, message: '请输入邮箱', trigger: 'blur' }, { pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, message: '请输入正确的邮箱' - }, - { validator: hasEmail, trigger: 'blur' } + } + // { validator: hasEmail, trigger: 'blur' } ], PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }], ROLE_NAME: [{ required: true, message: '请选择角色组', trigger: 'change' }], @@ -811,8 +811,8 @@ export default { DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }], DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }], SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }], - NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }], - SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }], + NATION: [{ required: false, trigger: 'blur' }], + SEX: [{ required: false, trigger: 'blur' }], POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }], DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }], DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }], @@ -827,7 +827,7 @@ export default { TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }], DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }], // /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/ - USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, + USER_ID_CARD: [{ required: false, trigger: 'blur' }, { pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: '请输入正确的身份证号' @@ -1055,8 +1055,8 @@ export default { this.ISCHECK = false } } else { - this.$message.warning('请确认身份证号与手机号后进行校验') - this.ISCHECK = false + // this.$message.warning('请确认身份证号与手机号后进行校验') + this.ISCHECK = true } }, getScheduleAll() { @@ -1441,13 +1441,13 @@ export default { // debugger // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息 this.$refs.form.validate(valid => { - if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { - this.$message({ - message: '请上传人脸照片', - type: 'error' - }) - return false - } + // if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { + // this.$message({ + // message: '请上传人脸照片', + // type: 'error' + // }) + // return false + // } let isUpdateFace = '0' if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) { isUpdateFace = '1' diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 32dfabb..0509a79 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -48,9 +48,11 @@ 一键密码重置 - - 导入 - + + + + + 导出 diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index 630be9a..7a22021 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,9 +48,10 @@ 一键密码重置 - - 导入 - + + + + 导出