From 38adefd0fb7b12bd0069f1922739ac90aa4140dc Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 10 Jul 2024 14:22:13 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=20-=20=E9=87=8D=E5=A4=8D=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/allPeopleList/components/list.vue | 94 ++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/src/views/xgf/allPeopleList/components/list.vue b/src/views/xgf/allPeopleList/components/list.vue index 4f4de6e..8a8bd8f 100644 --- a/src/views/xgf/allPeopleList/components/list.vue +++ b/src/views/xgf/allPeopleList/components/list.vue @@ -60,11 +60,12 @@ - + - + @@ -108,13 +109,16 @@ - + - - + + + + + @@ -147,6 +151,15 @@ + + + + + @@ -167,7 +180,8 @@ @@ -245,12 +259,13 @@ export default { keyDeptType: '', keyDepeName: '', keyJobLeven: '', + ISCHECK: false, dialogFormEdit: false, editloading: false, dialogType: 'add', rules: { 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: '请输入正确的邮箱' @@ -262,7 +277,10 @@ export default { ], USERNAME: [ { required: true, message: '用户名不能为空', trigger: 'blur' }, - { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }, + { + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, + message: '用户名需使用手机号码格式' + }, { validator: hasUser, trigger: 'blur' } ], NAME: [ @@ -272,6 +290,9 @@ export default { SEX: [ { required: true, message: '请选择性别', trigger: 'blur' } ], + NATION: [ + { required: true, message: '请选择民族', trigger: 'blur' } + ], PHONE: [ { required: true, message: '手机号不能为空', trigger: 'blur' }, { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' }, @@ -294,9 +315,20 @@ export default { ], ISASSESS: [ { required: true, message: '请选择是否审核人员', 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: '请输入正确的身份证号' + } ] }, + uesrInfoDic: { + minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd + xingbieList: [], // 性别情况 21501808bbc344d593fbf9ccfe6c4531 + }, pd: { + USER_ID: '', ROLE_ID: [], // 角色ID USERNAME: '', // 用户名 NAME: '', // 姓名 @@ -315,7 +347,9 @@ export default { VILLAGE: '', // 所属乡镇 JOB_LEVEL: '', // 职务级别 ISASSESS: '', - JOB: ''// 职务 + JOB: '', // 职务 + USER_ID_CARD: '', //身份证号 + NATION: '' //民族 }, roleList: [], multipleSelectionAll: [], // 所有选中的数据包含跨页数据 @@ -374,6 +408,8 @@ export default { created() { this.getList() this.hasButton() + this.getDict2('0a0e406f27f74ee698fe9979d25f62dd', 'minzuList') + this.getDict2('21501808bbc344d593fbf9ccfe6c4531', 'xingbieList') this.getDict('3e057d284c294a48af32948d58e92e3d', 'deptTypeLevenAllList') this.getDict('3f3a6ac41247438e91df2830765068ba', 'unitTypeList') this.getDepartTreeList() @@ -382,6 +418,103 @@ export default { this.getTreeList() }, methods: { + goPush(row) { + requestFN( + 'user/goPush', + { + 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, + PROVINCE: row.PROVINCE, + CITY: row.CITY, + COUNTRY: row.COUNTRY, + VILLAGE: row.VILLAGE, + USER_ID: row.USER_ID, + CARD_NO: row.USER_ID_CARD, + 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, + EMAIL: row.EMAIL || '', + CARD_TYPE: '111', + CARD_TYPE_NAME: '身份证', + NATION: row.NATION_NAME || '', + SEX: row.SEX === '0' ? '男' : '女', + USER_TYPE: '1', + ISDELETE: row.ISDELETE + } + ).then((data) => { + if (data.result === 'success') { + this.$message.success('推送成功') + this.getList() + } else { + this.$message.error('推送失败,' + data.msg) + this.getList() + } + }).catch((e) => { + this.listLoading = false + }) + }, + goCheck() { + if (this.pd.USER_ID_CARD && this.pd.USERNAME) { + const phoneJudge = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[0-9])\d{8}$/ + const phoneResult = phoneJudge.test(this.pd.USERNAME) + const cardJudge = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + const cardResult = cardJudge.test(this.pd.USER_ID_CARD) + if (phoneResult && cardResult) { + console.log('格式校验通过') + requestFN( + 'user/goCheck', + { + CARD_NO: this.pd.USER_ID_CARD, + USERNAME: this.pd.USERNAME, + USER_ID: this.pd.USER_ID || '' + } + ).then((data) => { + if (data.result === 'success') { + this.$message.success('验证通过') + this.ISCHECK = true + } else { + this.$message.error('验证失败,请确认身份证号与手机号是否正确') + this.ISCHECK = false + } + }).catch((e) => { + this.listLoading = false + this.ISCHECK = false + }) + } else { + this.ISCHECK = false + } + } else { + this.ISCHECK = false + } + }, getList() { this.listLoading = true requestFN( @@ -397,7 +530,8 @@ export default { PROVINCE: this.keyShudi[0] || '', CITY: this.keyShudi[1] || '', COUNTRY: this.keyShudi[2] || '', - VILLAGE: this.keyShudi[3] || '' + VILLAGE: this.keyShudi[3] || '', + ISPUSH: '1' } ).then((data) => { this.listLoading = false @@ -471,6 +605,7 @@ export default { }, handleAdd() { this.dialogFormEdit = true + this.ISCHECK = false this.pd = {} this.dialogType = 'saveUser' this.pd.PASSWORD = 'Aa@123456789' @@ -501,7 +636,7 @@ export default { this.varList = [] this.$refs.deptTree.clearHandle() this.listQuery.page = 1 - this.getList() + this.goPush(data.pd) }).catch((e) => { this.listLoading = false }) @@ -643,6 +778,7 @@ export default { ).then((data) => { if (data.result == 'success') { this.listLoading = false + this.goPush(row) this.getList() } }).catch((e) => { @@ -684,6 +820,17 @@ export default { this.listLoading = false }) }, + // 获取数据字典数据 + getDict2(dicID, listName) { + requestFN( + 'dictionaries/getLevels', + { DICTIONARIES_ID: dicID } + ).then((data) => { + this.uesrInfoDic[listName] = data.list + }).catch((e) => { + this.listLoading = false + }) + }, getDepartTreeList() { this.pd.DEPARTMENT_ID = '' if (this.$refs.deptTree) { diff --git a/src/views/system/group/userCenter/index.vue b/src/views/system/group/userCenter/index.vue new file mode 100644 index 0000000..06394eb --- /dev/null +++ b/src/views/system/group/userCenter/index.vue @@ -0,0 +1,924 @@ + + + + From 5082d741d3a35a78e0fd26022086dc21ad0a7d1a Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jul 2024 13:47:42 +0800 Subject: [PATCH 05/20] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B6=88?= =?UTF-8?q?=E9=98=B2=E7=82=B9=E4=BD=8D=E6=89=AB=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=82=B9=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AFH5bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/personStrucManage/basicInfo.vue | 22 + .../xgf/personStrucManage/components/list.vue | 774 ++++++++++++++++++ 2 files changed, 796 insertions(+) create mode 100644 src/views/xgf/personStrucManage/basicInfo.vue create mode 100644 src/views/xgf/personStrucManage/components/list.vue diff --git a/src/views/xgf/personStrucManage/basicInfo.vue b/src/views/xgf/personStrucManage/basicInfo.vue new file mode 100644 index 0000000..b532844 --- /dev/null +++ b/src/views/xgf/personStrucManage/basicInfo.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue new file mode 100644 index 0000000..e1286a0 --- /dev/null +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -0,0 +1,774 @@ + + + + + From f699d2c125775a9973a0b28baf94daf4f320c39d Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jul 2024 13:58:06 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardLibrary/components/list.vue | 1 + .../xgf/personStrucManage/components/list.vue | 31 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/views/threeSystems/standardLibrary/components/list.vue b/src/views/threeSystems/standardLibrary/components/list.vue index d815fe2..af860ab 100644 --- a/src/views/threeSystems/standardLibrary/components/list.vue +++ b/src/views/threeSystems/standardLibrary/components/list.vue @@ -95,6 +95,7 @@ align="center"/> + diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue index e1286a0..fa94697 100644 --- a/src/views/xgf/personStrucManage/components/list.vue +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -626,37 +626,6 @@ export default { }, // 导出指定数据项至 excel 表格 exportExcelHandler(ids, head) { - // return new Promise((resolve, reject) => { - // axios - // .post( - // config.httpurl + '/xgf/user/exportExcel?' + `ids=${ids}&head=${head}`, - // {}, - // { - // responseType: 'blob' - // } - // ) - // .then(res => { - // setTimeout(() => { - // const blob = new Blob([res.data], { - // type: 'application/vnd.ms-excel' - // }) - // const downloadElement = document.createElement('a') - // const href = window.URL.createObjectURL(blob) - // downloadElement.style.display = 'none' - // downloadElement.href = href - // downloadElement.download = moment().format('YYYY-MM-DD HH:mm:ss') - // document.body.appendChild(downloadElement) - // downloadElement.click() - // document.body.removeChild(downloadElement) - // window.URL.revokeObjectURL(href) - // resolve(res) - // }, 2000) - // }) - // .catch(e => { - // reject(e) - // this.$message.error('导出失败,或未查询到隐患') - // }) - // }) window.open(`${this.config.httpurl}/xgf/user/exportExcel?ids=${ids}&head=${head}`) }, // 点击操作打开菜单选择框 From a8683a2125a709db14ed3311f816d9147da8f865 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jul 2024 14:48:41 +0800 Subject: [PATCH 07/20] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9Eexcel?= =?UTF-8?q?=E6=94=AF=E6=8C=81=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A1=A8=E6=A0=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/personStrucManage/components/list.vue | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue index fa94697..b7d519b 100644 --- a/src/views/xgf/personStrucManage/components/list.vue +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -44,8 +44,7 @@ stripe highlight-current-row @selection-change="selectionChange" - @select-all="selectAll" - @row-click="rowClick"> + @select-all="selectAll"> @@ -99,42 +98,42 @@ - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + @@ -152,8 +151,8 @@ import Pagination from '@/components/Pagination' import { requestFN } from '@/utils/request' import waves from '@/directive/waves' -import axios from 'axios' -import moment from 'moment' +// import axios from 'axios' +// import moment from 'moment' export default { components: { Pagination }, @@ -592,9 +591,6 @@ export default { selectAll(selection) { this.selectionSelected = selection }, - rowClick(row, column, event) { - console.log('row :>> ', row) - }, handleExportBtn() { const ids = this.selectionSelected .map(item => { From 7b6903fd2b0833bc74553735c87e2e693c2b9204 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 5 Aug 2024 16:31:54 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=20-=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/personStrucManage/components/list.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue index b7d519b..19c6a45 100644 --- a/src/views/xgf/personStrucManage/components/list.vue +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -605,7 +605,8 @@ export default { return item.CORPINFO_ID }).length === 0 ) { - this.$message.error('请选择数据项后导出!') + // 不用选啦~不选就是全部导出 modified by xuyifeng + // this.$message.error('请选择数据项后导出!') } this.exportExcelHandler(ids, this.head) }, From 223e4d0e371da177673868c78cc24fd939cef936 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 9 Aug 2024 10:30:41 +0800 Subject: [PATCH 09/20] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=97=AE=E9=A2=98,=E5=8D=87=E7=BA=A7jq?= =?UTF-8?q?=E7=89=88=E6=9C=AC=202.=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chief/components/information.vue | 10 +- static/bi-first/js/jquery.js | 9048 +--------------- static/qrcode/assets/js/jquery-1.7.2.js | 9404 ----------------- static/qrcode/assets/js/jquery-3.7.1.min.js | 2 + static/qrcode/views/bsbw/detail.html | 2 +- static/qrcode/views/bsbw/part-detail.html | 2 +- static/qrcode/views/bsbw/part-list.html | 2 +- static/qrcode/views/bsbw/record_list.html | 2 +- .../views/electronic_work_card/index.html | 2 +- static/qrcode/views/fxfb/detail.html | 6 +- static/qrcode/views/fxfb/index.html | 2 +- static/qrcode/views/fxfb/part-detail.html | 2 +- static/qrcode/views/fxfb/part-list.html | 2 +- static/qrcode/views/fxfb/record_list.html | 2 +- 14 files changed, 25 insertions(+), 18463 deletions(-) delete mode 100644 static/qrcode/assets/js/jquery-1.7.2.js create mode 100644 static/qrcode/assets/js/jquery-3.7.1.min.js diff --git a/src/views/safetyenvironmental/chief/components/information.vue b/src/views/safetyenvironmental/chief/components/information.vue index 2914ac3..ae1db23 100644 --- a/src/views/safetyenvironmental/chief/components/information.vue +++ b/src/views/safetyenvironmental/chief/components/information.vue @@ -62,6 +62,11 @@ + + + + + @@ -99,6 +104,8 @@ + + + + + - + @@ -183,6 +184,193 @@ 打 印 + +

待确认的安全环保检查

+ + + + + + + + + + + +

待整改隐患

+ + + + + + + + + + + + + + + + + + + + + + + + + +

待验收隐患

+ + + + + + + + + + + + + + + + + + + + + + + + + +

待处罚

+ + + + + + + + + + + + + +

待反馈处罚

+ + + + + + + + + + + + + +