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/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 @@ 培训中 未培训 - - - - + 已培训 申请中 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) { 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 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..ef2a763 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="1100px" destroy-on-close> - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
关 闭 @@ -48,7 +77,39 @@ 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: [] + }, + 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' } + ] + } } }, methods: { @@ -80,32 +141,83 @@ 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.form.APPOINT_DEPARTMENT_ID = null + this.form.APPOINT_DEPARTMENT_NAME = '' + this.form.APPOINT_USER_ID = '' + this.form.APPOINT_USER_NAME = '' + this.form.user = '' + this.getDepartmentTree() }, 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() { - const corp_id = JSON.parse(this.corp_id).CORPINFO_ID - requestFN( - '/trainingbatch/sendMessage', - { - list: this.heirloom, - corp_id: corp_id, - corp_name: this.corp_name, - tm: new Date().getTime() - } - ).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', '') + this.beforeClose() + } + }) } }) + }, + 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.form.APPOINT_USER_ID = '' + this.form.APPOINT_USER_NAME = '' + this.form.user = '' + 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 } + } }