From ff31836619826cf8240450749ecf4b93e2d42fec Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 4 Jan 2024 09:35:40 +0800 Subject: [PATCH 01/12] =?UTF-8?q?13323=20=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F=20=E6=98=AF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E4=BA=86=E8=BF=98=E8=AE=A9=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/index.vue | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 5e04581..4a01cd2 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -16,11 +16,6 @@ @node-click="handleNodeClick"/> - - - @@ -386,6 +364,7 @@ export default { } ).then((data) => { this.form = Object.assign({}, data.pd) // copy obj + this.form.DEPT_SORT = Number(this.form.DEPT_SORT) this.pds = data.pds || [] // 父级部门信息 this.dialogFormAdd = true From 64935b4b5425cabc8b618cb4cf4d901a9d2ee178 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 5 Jan 2024 09:29:48 +0800 Subject: [PATCH 02/12] =?UTF-8?q?13025=20=E7=94=A8=E5=B7=A5=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/corpinfo/edit/components/corpInfoEdit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/corpinfo/edit/components/corpInfoEdit.vue b/src/views/corpinfo/edit/components/corpInfoEdit.vue index 993f11c..b5a9fb3 100644 --- a/src/views/corpinfo/edit/components/corpInfoEdit.vue +++ b/src/views/corpinfo/edit/components/corpInfoEdit.vue @@ -877,6 +877,7 @@ export default { this.dataForm.businessLicenseDate = [] this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_START) this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_END) + this.dataForm.USER_NAME = this.dataForm.USER_NAME ? this.dataForm.USER_NAME : this.dataForm.USER_NAME_B this.$forceUpdate() // 将对象中的 选取形式 转为数组以多选形式展现 2023-08-31 转换开始 if (this.dataForm.SELECT_FORM) { From a567d36025c396f3b9ae6eb9b65c63c09f7c06fb Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 17 Jan 2024 18:43:02 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/flow/components/list.vue | 6 ++---- src/views/train/synInfo/components/sendUtil.vue | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/views/train/flow/components/list.vue b/src/views/train/flow/components/list.vue index cf2631d..167fe59 100644 --- a/src/views/train/flow/components/list.vue +++ b/src/views/train/flow/components/list.vue @@ -45,12 +45,10 @@ - + diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 125d89f..c1aeff2 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -8,8 +8,8 @@ width="500px" destroy-on-close> - - + + Date: Fri, 19 Jan 2024 18:35:26 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 12 ++ .../train/synInfo/components/sendUtil.vue | 118 ++++++++++++++---- 2 files changed, 109 insertions(+), 21 deletions(-) diff --git a/src/main.js b/src/main.js index f9b2e9f..5e9c056 100644 --- a/src/main.js +++ b/src/main.js @@ -54,6 +54,18 @@ Vue.config.productionTip = false Vue.use(Element, { size: Cookies.get('size') || 'small' // set element-ui default size }) + +// 树数据结构去除空子级 +Vue.prototype.removeEmptyChildren = function(data) { + for (let i = 0; i < data.length; i++) { + if (data[i].nodes && data[i].nodes.length > 0) { + this.removeEmptyChildren(data[i].nodes) + } else { + delete data[i].nodes + } + } + return data +} /* eslint-disable no-new */ new Vue({ el: '#app', diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index c1aeff2..6e06834 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -5,18 +5,47 @@ :append-to-body="appendToBody" :before-close="beforeClose" title="推送" - width="500px" + width="1000px" destroy-on-close> - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
关 闭 @@ -48,7 +77,28 @@ export default { corp_id: null, corp_name: '', heirloom: {}, - listFlag: false + listFlag: false, + departmentTree: [], + peopleList: [], + normalizer(node) { + return { + id: node.id, + label: node.name, + children: node.nodes + } + }, + form: { + STATUS: null, + APPOINT_CORP_ID: '', + APPOINT_CORP_NAME: '', + APPOINT_DEPARTMENT_ID: null, + APPOINT_DEPARTMENT_NAME: '', + APPOINT_USER_ID: '', + APPOINT_USER_NAME: '', + user: '', + tm: new Date().getTime(), + list: [] + } } }, methods: { @@ -80,22 +130,19 @@ export default { }, getInfo(e) { const info = JSON.parse(e) - this.corp_name = info.CORP_NAME + this.form.APPOINT_CORP_ID = info.CORPINFO_ID + this.form.APPOINT_CORP_NAME = info.CORP_NAME + this.getDepartmentTree() }, beforeClose() { this.corp_id = null this.visible = false }, sendMessage() { - const corp_id = JSON.parse(this.corp_id).CORPINFO_ID + this.form.list = this.heirloom + console.log(this.form) requestFN( - '/trainingbatch/sendMessage', - { - list: this.heirloom, - corp_id: corp_id, - corp_name: this.corp_name, - tm: new Date().getTime() - } + '/trainingbatch/sendMessage', this.form ).then((data) => { if (data.code !== '0') { this.$message.error(data.msg) @@ -105,7 +152,36 @@ export default { this.$emit('refresh', '') } }) + }, + getDepartmentTree() { + requestFN( + '/companyApi/department/listTree', + { CORPINFO_ID: this.form.APPOINT_CORP_ID } + ).then((data) => { + this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes)) + }).catch((e) => { + console.log(e) + }) + }, + getPeopleList(e) { + this.form.APPOINT_DEPARTMENT_NAME = e.name + requestFN( + '/companyApi/user/listAll', + { + DEPARTMENT_ID: e.id + } + ).then((data) => { + this.peopleList = data.userList + }).catch((e) => { + console.log(e) + }) + }, + chooseUser(e) { + const entity = JSON.parse(e) + this.form.APPOINT_USER_ID = entity.USER_ID + this.form.APPOINT_USER_NAME = entity.NAME } + } } From efd87d7ac5c978dd8181f6ca4e75e0cf47c9ca45 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Jan 2024 20:03:38 +0800 Subject: [PATCH 05/12] =?UTF-8?q?13818=20=E6=89=B9=E9=87=8F=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=92=8C=E5=8D=95=E7=8B=AC=E6=8E=A8=E9=80=81=20?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9=20=E7=9B=91=E7=AE=A1?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8D=E5=90=88=E9=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../train/synInfo/components/sendUtil.vue | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 6e06834..36a958b 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -4,13 +4,13 @@ :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" - title="推送" + title="推送??" width="1000px" destroy-on-close> - + - + - + - + @@ -98,6 +98,17 @@ export default { user: '', tm: new Date().getTime(), list: [] + }, + rules: { + APPOINT_DEPARTMENT_ID: [ + { required: true, message: '请选择指定监管部门', trigger: 'change' } + ], + APPOINT_USER_ID: [ + { required: true, message: '请选择指定监管部门审批人', trigger: 'change' } + ], + APPOINT_CORP_ID: [ + { required: true, message: '请选择企业', trigger: 'change' } + ] } } }, @@ -139,17 +150,21 @@ export default { this.visible = false }, sendMessage() { - this.form.list = this.heirloom - console.log(this.form) - requestFN( - '/trainingbatch/sendMessage', this.form - ).then((data) => { - if (data.code !== '0') { - this.$message.error(data.msg) + this.$refs.form.validate((valid) => { + if (!valid) { + this.$message.error('请填写完整信息') } else { - this.$message.success('推送成功') - this.visible = false - this.$emit('refresh', '') + this.form.list = this.heirloom + requestFN('/trainingbatch/sendMessage', this.form + ).then((data) => { + if (data.code !== '0') { + this.$message.error(data.msg) + } else { + this.$message.success('推送成功') + this.visible = false + this.$emit('refresh', '') + } + }) } }) }, From 426a7648c92bdef3149a5418ed84b79d8aa486d6 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 16:03:31 +0800 Subject: [PATCH 06/12] =?UTF-8?q?13856=20=E5=AE=A1=E6=A0=B8=E5=AE=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=BA=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B8=8B=E4=B8=80=E4=B8=AA=E4=BA=BA=EF=BC=8C=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=86=85=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 36a958b..71baf47 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -148,6 +148,18 @@ export default { beforeClose() { this.corp_id = null this.visible = false + this.form = { + STATUS: null, + APPOINT_CORP_ID: '', + APPOINT_CORP_NAME: '', + APPOINT_DEPARTMENT_ID: null, + APPOINT_DEPARTMENT_NAME: '', + APPOINT_USER_ID: '', + APPOINT_USER_NAME: '', + user: '', + tm: new Date().getTime(), + list: [] + } }, sendMessage() { this.$refs.form.validate((valid) => { From be9d06d48175c2c532b515f9df650fbd56dd0937 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 16:06:28 +0800 Subject: [PATCH 07/12] =?UTF-8?q?13853=20=E5=88=A4=E7=A9=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=20=E8=B7=9F=E6=A0=87=E9=A2=98=E5=AF=B9?= =?UTF-8?q?=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 71baf47..9c9122b 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -101,10 +101,10 @@ export default { }, rules: { APPOINT_DEPARTMENT_ID: [ - { required: true, message: '请选择指定监管部门', trigger: 'change' } + { required: true, message: '请选择指定部门', trigger: 'change' } ], APPOINT_USER_ID: [ - { required: true, message: '请选择指定监管部门审批人', trigger: 'change' } + { required: true, message: '请选择指定审批人', trigger: 'change' } ], APPOINT_CORP_ID: [ { required: true, message: '请选择企业', trigger: 'change' } From d74cb3930d87757901e2ee457988bdaee75913c6 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 16:09:30 +0800 Subject: [PATCH 08/12] =?UTF-8?q?13854=20=E9=80=89=E6=8B=A9=E6=A1=86?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E5=BA=A6=E9=95=BF=E5=BA=A6=E4=B8=8D=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 9c9122b..3e1614e 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -4,14 +4,14 @@ :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" - title="推送??" - width="1000px" + title="推送" + width="1100px" destroy-on-close> - + From d7d5fd6fa9781343263d4cd8678145ffd6cdbecd Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 16:13:10 +0800 Subject: [PATCH 09/12] =?UTF-8?q?13817=20=E6=89=B9=E9=87=8F=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=92=8C=E5=8D=95=E7=8B=AC=E6=8E=A8=E9=80=81=20?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 3e1614e..2362c91 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -11,7 +11,7 @@ - + Date: Mon, 29 Jan 2024 13:20:27 +0800 Subject: [PATCH 10/12] =?UTF-8?q?1=E3=80=81=E6=B5=81=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=E3=80=81=E6=89=93=E5=9B=9E=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=AE=A1=E6=89=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PersonManager/user/components/list.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/PersonManager/user/components/list.vue b/src/views/PersonManager/user/components/list.vue index 9c9f890..40cbf36 100644 --- a/src/views/PersonManager/user/components/list.vue +++ b/src/views/PersonManager/user/components/list.vue @@ -118,12 +118,7 @@ 培训中 未培训 - - - - + 已培训 申请中 From c5919657e5268c72d98bebd9b9f9b18fa6bf55cb Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 17:20:47 +0800 Subject: [PATCH 11/12] =?UTF-8?q?1=E3=80=81=E9=94=99=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=202=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=203?= =?UTF-8?q?=E3=80=81=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 2362c91..5ba1adc 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -143,6 +143,10 @@ export default { const info = JSON.parse(e) this.form.APPOINT_CORP_ID = info.CORPINFO_ID this.form.APPOINT_CORP_NAME = info.CORP_NAME + this.form.APPOINT_DEPARTMENT_ID = null + this.form.APPOINT_DEPARTMENT_NAME = '' + this.form.APPOINT_USER_ID = '' + this.form.APPOINT_USER_NAME = '' this.getDepartmentTree() }, beforeClose() { @@ -175,6 +179,7 @@ export default { this.$message.success('推送成功') this.visible = false this.$emit('refresh', '') + this.beforeClose() } }) } @@ -198,6 +203,9 @@ export default { DEPARTMENT_ID: e.id } ).then((data) => { + this.form.APPOINT_USER_ID = '' + this.form.APPOINT_USER_NAME = '' + this.form.user = '' this.peopleList = data.userList }).catch((e) => { console.log(e) From 4be34ded89e1b3e1f2056f6a483ccb0a9fc10ae6 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 10:51:51 +0800 Subject: [PATCH 12/12] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=90=86=202?= =?UTF-8?q?=E3=80=81=E5=9C=B0=E5=9B=BE=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9=203?= =?UTF-8?q?=E3=80=81=E6=B6=88=E9=98=B2=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A6=E6=83=85=E5=90=8E=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/synInfo/components/sendUtil.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue index 5ba1adc..ef2a763 100644 --- a/src/views/train/synInfo/components/sendUtil.vue +++ b/src/views/train/synInfo/components/sendUtil.vue @@ -147,6 +147,7 @@ export default { this.form.APPOINT_DEPARTMENT_NAME = '' this.form.APPOINT_USER_ID = '' this.form.APPOINT_USER_NAME = '' + this.form.user = '' this.getDepartmentTree() }, beforeClose() {