From d5edfcdaf790ec271d9eaa2dc7434bf3588e9aed Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Mon, 19 Aug 2024 17:04:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0](pe?= =?UTF-8?q?t)=20safetyenvironmental=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BAV2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/safetyenvironmental/archive/components/accept.vue | 2 +- src/views/safetyenvironmental/inspected/components/list.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue index ee6fcf1..a2ec907 100644 --- a/src/views/safetyenvironmental/archive/components/accept.vue +++ b/src/views/safetyenvironmental/archive/components/accept.vue @@ -595,7 +595,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { requestFN( - '/hidden/finalcheck', + '/safetyenvironmental/V2/finalcheck', { HIDDEN_ID: this.HIDDEN_ID, FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR, diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index 2427552..a2dfef5 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -330,7 +330,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmentalexplain/hiddencount', + '/safetyenvironmental/V2/hiddencount', { INSPECTION_ID: INSPECTION_ID } From 202af29c014f7168aaa221b141f0857af71d6c89 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 3 Sep 2024 18:07:42 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firefighting/points/components/list.vue | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index d28bce7..b8c08de 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -73,7 +73,7 @@ 否 - + @@ -143,6 +151,22 @@ 打 印 + + +
+
+

检查记录二维码

+
+
+ +
+
+
+ 关 闭 + 打 印 +
+ + @@ -157,7 +181,6 @@ 取 消 确 定 - @@ -171,9 +194,7 @@ import waves from '@/directive/waves' // waves directive import SelectTree from '@/components/SelectTree' export default { - components: { Pagination, SelectTree, vueQr }, - directives: { waves }, data() { return { @@ -181,7 +202,9 @@ export default { addBtnType: true, listLoading: true, dialogFormShow: false, + dialogRecordFormShow: false, qrcodeStr: '', + recordQrcodeStr: '', qrInfo: {}, add: false, del: false, @@ -246,39 +269,36 @@ export default { handleShowQr(ROW) { this.dialogFormShow = true this.qrInfo = ROW - // 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID - // const json = { - // MANAGER_TYPE: 'fireListManager', - // FIRE_POINT_ID: ROW.FIRE_POINT_ID - // } - // const jsonStr = JSON.stringify(json) - // this.qrcodeStr = jsonStr + }, + handleShowRecordQr(ROW) { + this.dialogRecordFormShow = true + const json = { + MANAGER_TYPE: 'fireListManager', + USER_ID: ROW.USER_ID, + DEPARTMENT_ID: ROW.DEPARTMENT_ID + } + this.recordQrcodeStr = JSON.stringify(json) }, handleEdit(FIRE_POINT_ID) { this.$parent.FIRE_POINT_ID = FIRE_POINT_ID this.$parent.activeName = 'Edit' }, selectable(row, index) { - // return row.DEVICE_COUNT == 0 return true }, getRowKey(row) { return row.FIRE_POINT_ID }, - // 添加 handleAdd() { this.$parent.activeName = 'Edit' this.$parent.FIRE_POINT_ID = '' this.$parent.FIRE_POINT_CODE = '' this.$parent.FIRE_POINT_NAME = '' }, - // 搜索 getQuery() { - // this.$refs.multipleTable.clearSelection() this.getList() }, - // 获取列表 getList(pid) { this.listLoading = true this.varList = [] @@ -299,7 +319,8 @@ export default { }).catch((e) => { this.listLoading = false }) - }, goKeyReset() { + }, + goKeyReset() { this.FIRE_POINT_NAME = '' this.FIRE_POINT_CODE = '' this.IS_PUNCTUATION = '' @@ -345,7 +366,6 @@ export default { this.listLoading = false }) }, - // 部门列表树 getTreeData() { requestFN( '/department/listTreeV2', @@ -355,7 +375,6 @@ export default { }).catch((e) => { }) }, - // 批量修改负责人 handleEditUser(row) { this.editDataIds = [] if (row.FIRE_POINT_ID) { @@ -505,15 +524,15 @@ export default { } - diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js index 4472aad..82c02e8 100644 --- a/src/views/map/js/ry_dragentity.js +++ b/src/views/map/js/ry_dragentity.js @@ -30,6 +30,16 @@ export default class DragEntity { heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, disableDepthTestDistance: Number.POSITIVE_INFINITY }, + label: { + text: point.name ? point.name : point.id, + font: '13px sans-serif', + pixelOffset: new Cesium.Cartesian2(0, -55), + showBackground: true, + // eslint-disable-next-line new-cap + backgroundColor: new Cesium.Color.fromCssColorString('rgba(20, 58, 142, 1)'), + backgroundPadding: new Cesium.Cartesian2(7, 5), + disableDepthTestDistance: Number.POSITIVE_INFINITY + }, orientation: new Cesium.VelocityOrientationProperty(point.property), monitoItems: { @@ -43,7 +53,9 @@ export default class DragEntity { this.viewer.clock.clockRange = Cesium.ClockRange.CLAMPED this.viewer.clock.shouldAnimate = false } - + delEntity(point) { + this.viewer.entities.remove(point) + } getPosition(point) { if (this.viewer.clock.shouldAnimate === false) { this.viewer.clock.shouldAnimate = true From f033a6c128c0b8a893f7c5d2533c6b0e26d23873 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Thu, 5 Sep 2024 14:48:47 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0](pe?= =?UTF-8?q?t)=20=20-=20add.vue=20=20=20=20-=20=E5=AE=89=E5=85=A8=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=96=B0=E5=A2=9E=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=B8=BA=E7=9B=B8=E5=85=B3=E6=96=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E9=80=BB=E8=BE=91=20=20-=20edit.vue?= =?UTF-8?q?=20=20=20=20-=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=82=AE=E7=AE=B1=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=82=AE=E7=AE=B1=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 1 - src/views/corpInfo/user/components/edit.vue | 6 +- .../inspection/components/add.vue | 66 +++++++++++++++++-- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3ef1396..8f4e844 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -309,7 +309,6 @@ export default { } }, setShowModel(model) { - console.log("test===========================") this.$store.dispatch('permission/setShowModel', model) }, toggleSideBar() { diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index eda6399..2ed7592 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' }], diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index 37b6a8e..eccae03 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -13,6 +13,16 @@ + + + + + 是 + 否 + + + + @@ -86,7 +96,7 @@ - + @@ -421,7 +431,8 @@ export default { CONFIRM_MESSAGE_SIGN: '', CONFIRM_MESSAGE_TIME: '', situationList: [{ INSPECTION_SITUATION_ID: '', SITUATION: '' }], // 检查情况 - hiddenList: [{ ...this.hiddenForm }] // 隐患信息集合 + hiddenList: [{ ...this.hiddenForm }], // 隐患信息集合 + IS_XGF: '' // 是否相关方 }, hiddenCurIndex: -1, hdFile: [], // 隐患附件 @@ -519,7 +530,7 @@ export default { this.INSPECTED_SITEUSER_List = [] } if (newVal != null && newVal != '') { - this.getUserList(newVal) + this.getXgfUserList(newVal) } }, immediate: false @@ -587,8 +598,9 @@ export default { this.INSPECTOR_List.push([]) }, updateInspecteDept(DEPARTMENT_ID, i) { - this.form.inspectorList[i].INSPECTION_USER_ID = '' - this.getInspectorList(DEPARTMENT_ID, i) + // this.form.inspectorList[i].INSPECTION_USER_ID = '' + // this.getInspectorList(DEPARTMENT_ID, i) + this.getXgfUserList(DEPARTMENT_ID) }, // 获取人员列表 getInspectorList(DEPARTMENT_ID, i) { @@ -1039,6 +1051,50 @@ export default { }) }) }, + // 获取相关方被检查单位数据 + getXgfTreeData(value) { + console.info(value) + if (value == '1') { + requestFN( + '/department/getXgfListTree', + {} + ).then((data) => { + this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + }).catch((e) => { + }) + } else { + requestFN( + '/department/listTree', + {} + ).then((data) => { + this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + }).catch((e) => { + }) + } + }, + // 获取相关方被检查单位现场负责人 + getXgfUserList(DEPARTMENT_ID) { + console.info(this.form.IS_XGF) + if (this.form.IS_XGF == '1') { + requestFN( + '/user/xgfListAll', + { DEPARTMENT_ID: DEPARTMENT_ID } + ).then((data) => { + this.INSPECTED_SITEUSER_List = data.userList + }).catch((e) => { + }) + } else { + requestFN( + '/user/listAll', + { DEPARTMENT_ID: DEPARTMENT_ID } + ).then((data) => { + this.INSPECTED_SITEUSER_List = data.userList + }).catch((e) => { + }) + } + }, // 获取隐患部位 下拉树 getHiddenReginTreeList() { return new Promise((resolve) => { From 2572f05bf901a9080ee436f0c06fd6978ef6fbbe Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Thu, 5 Sep 2024 17:07:49 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0](pe?= =?UTF-8?q?t)=20=20-=20list.vue=20=20=20=20-=20=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9C=AA=E5=90=8C=E6=AD=A5=E4=BA=BA=E5=91=98=E4=B8=AD?= =?UTF-8?q?=E5=8F=B0=EF=BC=8C=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/corpInfo/user/components/list.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 059f7ea..db0d5a4 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -48,7 +48,9 @@ 一键密码重置 - + + + 导入 From e6020b59760641c209f5814218c88b2197aa61c9 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Fri, 6 Sep 2024 11:43:25 +0800 Subject: [PATCH 09/11] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0](pe?= =?UTF-8?q?t)=20=20-=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F=20=20-=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=EF=BC=8C?= =?UTF-8?q?=E6=B0=91=E6=97=8F=EF=BC=8C=E6=80=A7=E5=88=AB=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BA=BA=E8=84=B8=E7=85=A7=E7=89=87=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=20=20-=20=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F=20=20-?= =?UTF-8?q?=20=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/corpInfo/user/components/edit.vue | 66 +++++++++---------- src/views/corpInfo/user/components/list.vue | 6 +- .../corpInfo/userCenter/components/list.vue | 10 +-- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index 2ed7592..7240fca 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -732,27 +732,27 @@ export default { callback() }) } - var hasEmail = (rule, value, callback) => { - if (value) { - requestFN( - '/user/hasEmail', - { - EMAIL: value, - USERNAME: this.form.USERNAME - } - ).then((data) => { - if (data.result == 'success') { - callback() - } else { - callback(new Error('邮箱重复')) - } - }).catch((e) => { - - }) - } else { - callback() - } - } + // var hasEmail = (rule, value, callback) => { + // if (value) { + // requestFN( + // '/user/hasEmail', + // { + // EMAIL: value, + // USERNAME: this.form.USERNAME + // } + // ).then((data) => { + // if (data.result == 'success') { + // callback() + // } else { + // callback(new Error('邮箱重复')) + // } + // }).catch((e) => { + // + // }) + // } else { + // callback() + // } + // } return { ISCHECK: false, dayTime: [], @@ -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 db0d5a4..5cf7dbb 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -50,9 +50,9 @@ - - 导入 - + + + 导出 diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index d67d29e..5902be6 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,9 +48,10 @@ 一键密码重置 - - 导入 - + + + + 导出 @@ -94,7 +95,8 @@ 编辑 删除 - 推送 + + From 9883455926d4f853a2d7403d402a032873c6b3dc Mon Sep 17 00:00:00 2001 From: water_xu Date: Fri, 6 Sep 2024 14:23:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20-?= =?UTF-8?q?=20=E6=9A=82=E6=97=B6=E8=B0=83=E6=95=B4ISPUSH=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=80=BC=E4=B8=BA2(=E5=85=81=E8=AE=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/corpInfo/user/components/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 059f7ea..7ec601c 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -796,7 +796,7 @@ export default { SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, USER_ID: this.USER_ID, - ISPUSH: '1' + ISPUSH: '2' } ).then((data) => { this.listLoading = false From 1696e625beeec726c946f68f1db47e355d38b601 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Mon, 9 Sep 2024 16:30:29 +0800 Subject: [PATCH 11/11] =?UTF-8?q?1.=E8=BF=98=E5=8E=9F=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/corpInfo/user/components/edit.vue | 2 +- src/views/corpInfo/user/components/list.vue | 11 +++++------ src/views/corpInfo/userCenter/components/list.vue | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index 7240fca..60dc0bc 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -812,7 +812,7 @@ export default { DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }], SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }], NATION: [{ required: false, trigger: 'blur' }], - SEX: [{ 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' }], diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index c18353d..7e19783 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -50,9 +50,9 @@ - - - + + + 导出 @@ -96,7 +96,7 @@ 编辑 删除 - 推送 + @@ -797,8 +797,7 @@ export default { SHIFTDUTYONE: this.SHIFTDUTYONE, SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, - USER_ID: this.USER_ID, - ISPUSH: '2' + USER_ID: this.USER_ID } ).then((data) => { this.listLoading = false diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index 5902be6..7a22021 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,10 +48,10 @@ 一键密码重置 - - - - + + + + 导出