From ef3d7da288ff2ea53fd5d4590c3129c0532685d8 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 12 Dec 2023 19:16:03 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/insert/components/corpInfoEdit.vue | 260 +++++++++++++----- .../xgf/insert/components/corpInfoList.vue | 4 +- 2 files changed, 188 insertions(+), 76 deletions(-) diff --git a/src/views/xgf/insert/components/corpInfoEdit.vue b/src/views/xgf/insert/components/corpInfoEdit.vue index 82ba6b1..5cb09f2 100644 --- a/src/views/xgf/insert/components/corpInfoEdit.vue +++ b/src/views/xgf/insert/components/corpInfoEdit.vue @@ -3,9 +3,51 @@
- + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + @@ -49,16 +94,21 @@ - + - + + + + + + - + @@ -77,7 +127,7 @@ - + @@ -89,7 +139,7 @@ - + @@ -101,25 +151,33 @@ - + - - - + + + + - - + + - +
保存 @@ -252,6 +310,14 @@ export default { children: 'nodes', label: 'name' }, + normalizergfjg(node) { + return { + id: node.id, + label: node.name, + children: node.nodes, + isDisabled: node.pId === '0' + } + }, areaProps: { lazy: true, lazyLoad: async(node, resolve) => { @@ -277,9 +343,14 @@ export default { checkStrictly: true }, CREATOR_NAME: JSON.parse(sessionStorage.getItem('user')).NAME, + treeDataSupervise: [], form: { CREATOR: JSON.parse(sessionStorage.getItem('user')).USER_ID, OPERATOR: JSON.parse(sessionStorage.getItem('user')).USER_ID, + SUPERVISE_DEPARTMENT_ID: null, + COMPETENT_DEPT_ID: null, + MANAGER_DEPARTMENT_ID: null, + SUPERVISE_CORPINFO_ID: '', MAIN_DEPARTMENT: '', RELEVANT_UNIT_NAME: '', SOCIAL_CODE: '', @@ -291,8 +362,10 @@ export default { LEGAL_PERSON: '', CONTACT_PERSON: '', CONTACT_TEL: '', - EMPLOYMENT_FORM: '', + EMPLOYMENT_FORM: null, + CORP_TYPE: '', SELECT_FORM: '', + SELECT_FORMS: [], FLOATING_PERCENT: '', COMPANY_AREA: '', POSSESSION: [], @@ -312,6 +385,7 @@ export default { corpTypeList: [], // 行业类型 rules: { MAIN_DEPARTMENT: [{ required: true, message: '请选择主管部门', trigger: 'blur' }], + CORP_TYPE: [{ required: true, message: '请选择集团单位', trigger: 'blur' }], RELEVANT_UNIT_NAME: [ { required: true, message: '相关方单位名称不能为空', trigger: 'blur' }, { validator: hasName, trigger: 'blur' } @@ -340,7 +414,6 @@ export default { } ], EMPLOYMENT_FORM: [{ required: false, message: '用工形式不能为空', trigger: 'blur' }], - SELECT_FORM: [{ required: false, message: '选取形式不能为空', trigger: 'blur' }], POSSESSION: [{ required: false, message: '属地不能为空', trigger: 'blur' }], FLOATING_PERCENT: [ { required: false, message: '流动人员比例不能为空', trigger: 'blur' }, @@ -353,17 +426,18 @@ export default { } } }, - created() { - // this.listLoading = false - // this.getList() - this.getData() - this.getDict() - this.getTreeList() + async created() { + await this.getDict() + await this.getTreeList() + await this.getData() }, mounted() { // this.getNextTickData() }, methods: { + selectValue(value, node, extra) { + this.form.SUPERVISE_CORPINFO_ID = value.CORPINFO_ID + }, async getAreaDict(DICTIONARIES_ID) { const { list } = await requestFN( '/xgf/dictionaries/getAreaLevels', @@ -399,13 +473,26 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/xgf/corp/getCorpInfoDetail', + '/relevantunits/getCorpInfoDetail', { CORPINFO_ID: this.$parent.CORPINFO_ID, tm: new Date().getTime() } ).then((data) => { this.form = Object.assign(this.form, data.pd) + var sz = this.form.SELECT_FORM + var cdi = this.form.COMPETENT_DEPT_ID + var mdi = this.form.MANAGER_DEPARTMENT_ID + + this.form.SELECT_FORMS = sz.split(',') + if (cdi) { + this.form.COMPETENT_DEPT_ID = cdi.split(',') + } + if (mdi) { + this.form.MANAGER_DEPARTMENT_ID = mdi.split(',') + } + if (!this.form.EMPLOYMENT_FORM) this.form.EMPLOYMENT_FORM = null + if (!this.form.SUPERVISE_DEPARTMENT_ID) this.form.SUPERVISE_DEPARTMENT_ID = null this.form.POSSESSION = [] if (data.pd.PROVINCE != '') this.form.POSSESSION.push(data.pd.PROVINCE) if (data.pd.CITY != '') this.form.POSSESSION.push(data.pd.CITY) @@ -433,12 +520,15 @@ export default { this.LONGITUDE = this.form.LONGITUDE }, getTreeList() { - requestFN( - '/department/listTree/', - {} - ).then((data) => { - this.treeData = JSON.parse(data.zTreeNodes) - }).catch((e) => { + return new Promise((resolve, reject) => { + requestFN( + '/department/listTreeManageAndCorp1/', + {} + ).then((data) => { + this.treeData = JSON.parse(data.zTreeNodes) + }).catch((e) => { + }) + resolve() }) }, filterNode(value, data) { @@ -459,6 +549,14 @@ export default { // this.form.STREET = this.form.POSSESSION[4] || '' // this.form.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : '' } + // 将数组转为字符串存入数据对象 2023-08-31 存入对象开始 + this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',') + if (this.form.COMPETENT_DEPT_ID) { + this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',') + } + if (this.form.MANAGER_DEPARTMENT_ID) { + this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',') + } /* if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) { this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || '' this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || '' @@ -498,38 +596,50 @@ export default { this.$parent.activeName = 'CorpInfoList' }, // 获取数据字典数据 - getDict: function() { - requestFN( - '/xgf/dictionaries/getLevels', - { - DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88' - } - ).then((data) => { - this.employmentTypeList = data.list - }) - requestFN( - '/xgf/dictionaries/getLevels', - { - DICTIONARIES_ID: '9ce2e9a4636b4d41b460ce16c346d497' - } - ).then((data) => { - this.selectFormList = data.list - }) - requestFN( - '/xgf/dictionaries/getLevels', - { - DICTIONARIES_ID: 'f2598ba72e864eadabf0ca4b664d26b9' - } - ).then((data) => { - this.industryList = data.list - }) - requestFN( - '/xgf/dictionaries/getLevels', - { - DICTIONARIES_ID: '37d8385931f14bb0b962082cf6bb3395' - } - ).then((data) => { - this.corpTypeList = data.list + getDict() { + return new Promise((resolve, reject) => { + requestFN( + '/corpinfo/listTreeManageAndCorpHasOrder', + {} + ).then((data) => { + const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.treeDataSupervise = this.removeEmptyChildren(treeData) + }).catch((e) => { + }) + requestFN( + '/xgf/dictionaries/listSelectTree', + { + DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88' + } + ).then((data) => { + const employmentTypeList = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.employmentTypeList = this.removeEmptyChildren(employmentTypeList) + }) + requestFN( + '/xgf/dictionaries/getLevels', + { + DICTIONARIES_ID: '9ce2e9a4636b4d41b460ce16c346d497' + } + ).then((data) => { + this.selectFormList = data.list + }) + requestFN( + '/xgf/dictionaries/getLevels', + { + DICTIONARIES_ID: 'f2598ba72e864eadabf0ca4b664d26b9' + } + ).then((data) => { + this.industryList = data.list + }) + requestFN( + '/xgf/dictionaries/getLevels', + { + DICTIONARIES_ID: '37d8385931f14bb0b962082cf6bb3395' + } + ).then((data) => { + this.corpTypeList = data.list + }) + resolve() }) }, // 地图相关 diff --git a/src/views/xgf/insert/components/corpInfoList.vue b/src/views/xgf/insert/components/corpInfoList.vue index fb26d77..7f56a02 100644 --- a/src/views/xgf/insert/components/corpInfoList.vue +++ b/src/views/xgf/insert/components/corpInfoList.vue @@ -96,9 +96,11 @@ - +