diff --git a/src/views/corpInfo/information/qualifications/components/edit.vue b/src/views/corpInfo/information/qualifications/components/edit.vue index 8ec6e4c..ecd971b 100644 --- a/src/views/corpInfo/information/qualifications/components/edit.vue +++ b/src/views/corpInfo/information/qualifications/components/edit.vue @@ -85,8 +85,7 @@ export default { rules: { NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }], VALIDITYTIME: [{ required: true, message: '证书有效期不能为空', trigger: 'blur' }], - NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }], - FILE: [{ required: true, message: '图片不能为空', trigger: 'blur' }] + NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }] } } }, @@ -191,6 +190,8 @@ export default { if (!isImage) { this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!') fileList.pop() + } else { + this.beforeFileUpload(file) } }, handlePictureCardPreview(file) { diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index ffe26cf..eda6399 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -42,7 +42,7 @@ - + 如果修改手机号,登录密码则会变成初始密码“Aa@123456789” @@ -63,18 +63,90 @@ 补充证照信息 - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + + + + + + + + + +
+
+
+
+
+ +
+ + + +
+
(若新上传人脸图片将覆盖旧人脸信息,不上传则不做修改)
+
* 图像格式:JPEG、JPG、PNG、BMP
+
* 图像大小:不超过1M。
+
* 图像分辨率:大于32×32像素,小于4096×4096像素,
人脸占比不低于64×64像素。
+
(如无合适照片请该人员登陆曹港APP中进行人脸照片采集)
+
+
+
@@ -151,33 +223,6 @@
- 编辑 - 删除 + 编辑 + 删除 + 推送 @@ -441,6 +442,67 @@ export default { // this.getLearnerCategory() // 学员类型已取消 }, methods: { + goPush(row) { + requestFN( + 'user/goPush', + { + USER_ID: row.USER_ID, + STATUS: row.STATUS, + BZ: row.BZ, + SKIN: row.SKIN, + PHONE: row.PHONE, + NUMBER: row.NUMBER, + ISMAIN: row.ISMAIN, + OPENID: row.APPID, + SORT: row.SORT, + LEARNERCATEGORY: row.LEARNERCATEGORY, + USERAVATARPREFIX: row.USERAVATARPREFIX, + USERAVATARURL: row.USERAVATARURL, + SHIFTDUTYONE: row.SHIFTDUTYONE, + SHIFTDUTYTWO: row.SHIFTDUTYTWO, + DURATION: row.DURATION, + WORKSTATUS: row.WORKSTATUS, + WORKPERIOD: row.WORKPERIOD, + PERSONNEL_TYPE: row.PERSONNEL_TYPE, + TITLE: row.TITLE, + ISSTATE: row.ISSTATE, + INCUMBENCY: row.INCUMBENCY, + WORKING_DATE: row.WORKING_DATE, + ENTRY_DATE: row.ENTRY_DATE, + TYPE_OF_WORK: row.TYPE_OF_WORK, + DUTIES: row.DUTIES, + DEGREE_OF_EDUCATION: row.DEGREE_OF_EDUCATION, + DATE_OF_BIRTH: row.DATE_OF_BIRTH, + POLITICAL_OUTLOOK: row.POLITICAL_OUTLOOK, + CARD_NO: row.CARD_NO, + USERNAME: row.USERNAME, + NAME: row.NAME, + CORPINFO_ID: row.CORPINFO_ID, + CORPINFO_NAME: row.CORPINFO_NAME || '', + DEPARTMENT_ID: row.DEPARTMENT_ID, + DEPARTMENT_NAME: row.DEPARTMENT_NAME, + IMGFILES_ID: row.IMGFILES_ID, + FOREIGN_KEY: row.FOREIGN_KEY, + FILEPATH: row.FILEPATH, + EMAIL: row.EMAIL || '', + CARD_TYPE: '111', + CARD_TYPE_NAME: '身份证', + NATION: row.NATION || '', + SEX: row.SEX || '', + USER_TYPE: '1', + ISDELETE: row.ISDELETE + } + ).then((data) => { + if (data.result === 'success') { + this.$message.success('推送成功') + this.getList() + } else { + this.$message.error('推送失败,' + data.msg) + } + }).catch((e) => { + this.listLoading = false + }) + }, // schedulingChange(e) { // // console.log(e) // // this.PARENTID = e @@ -669,8 +731,9 @@ export default { this.$parent.activeName = 'Edit' this.$parent.USER_ID = '' }, - handleEdit(USER_ID) { - this.$parent.USER_ID = USER_ID + handleEdit(row) { + this.$parent.USER_ID = row.USER_ID + this.$parent.IMGFILES_ID = row.IMGFILES_ID this.$parent.activeName = 'Edit' }, getQuery() { @@ -732,7 +795,8 @@ export default { SHIFTDUTYONE: this.SHIFTDUTYONE, SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, - USER_ID: this.USER_ID + USER_ID: this.USER_ID, + ISPUSH: '1' } ).then((data) => { this.listLoading = false @@ -862,7 +926,7 @@ export default { }).catch(() => { }) }, - handleDelete(id, name) { + handleDelete(id, name, ispush) { this.$confirm('确定要删除[' + name + ']吗?', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -872,7 +936,8 @@ export default { requestFN( '/user/deleteUser', { - USER_ID: id + USER_ID: id, + ISPUSH: ispush } ).then(() => { this.$message({ diff --git a/src/views/corpInfo/userCenter/components/edit.vue b/src/views/corpInfo/userCenter/components/edit.vue new file mode 100644 index 0000000..eda6399 --- /dev/null +++ b/src/views/corpInfo/userCenter/components/edit.vue @@ -0,0 +1,2085 @@ + + + + + + diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue new file mode 100644 index 0000000..d67d29e --- /dev/null +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -0,0 +1,1315 @@ + + + + + + + diff --git a/src/views/corpInfo/userCenter/index.vue b/src/views/corpInfo/userCenter/index.vue new file mode 100644 index 0000000..80f56d4 --- /dev/null +++ b/src/views/corpInfo/userCenter/index.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index a16744e..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,38 +269,36 @@ export default { handleShowQr(ROW) { this.dialogFormShow = true this.qrInfo = ROW - // this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID + this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID + }, + handleShowRecordQr(ROW) { + this.dialogRecordFormShow = true const json = { MANAGER_TYPE: 'fireListManager', - FIRE_POINT_ID: ROW.FIRE_POINT_ID + USER_ID: ROW.USER_ID, + DEPARTMENT_ID: ROW.DEPARTMENT_ID } - const jsonStr = JSON.stringify(json) - this.qrcodeStr = jsonStr + 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 = [] @@ -298,7 +319,8 @@ export default { }).catch((e) => { this.listLoading = false }) - }, goKeyReset() { + }, + goKeyReset() { this.FIRE_POINT_NAME = '' this.FIRE_POINT_CODE = '' this.IS_PUNCTUATION = '' @@ -344,7 +366,6 @@ export default { this.listLoading = false }) }, - // 部门列表树 getTreeData() { requestFN( '/department/listTreeV2', @@ -354,7 +375,6 @@ export default { }).catch((e) => { }) }, - // 批量修改负责人 handleEditUser(row) { this.editDataIds = [] if (row.FIRE_POINT_ID) { @@ -504,15 +524,15 @@ export default { } -