Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能

src/views/xgf/insert/components/corpInfoEdit.vue

@@ -448,16 +448,13 @@ export default {
       return list
     },
     cascaderChange(e) {
-      // console.log('e', e)
       const newVal = e[e.length - 1]
-      // console.log('选中', newVal[newVal.length - 1])
       if (newVal === '1' || newVal === '2' || newVal === '3' || newVal === '4') {
         this.$message({
           message: '请选择正确的属地...',
           type: 'error'
         })
         this.form.POSSESSION.pop()
-        // console.log('移除', this.corpStateForm.REGULATORY_DEPARTMENT_ARR)
       }
     },
     // 加载级联的方法
@@ -525,7 +522,8 @@ export default {
           '/department/listTreeManageAndCorp1/',
           {}
         ).then((data) => {
-          this.treeData = JSON.parse(data.zTreeNodes)
+          const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          this.treeData = this.removeEmptyChildren(treeData)
         }).catch((e) => {
         })
         resolve()
@@ -599,7 +597,7 @@ export default {
     getDict() {
       return new Promise((resolve, reject) => {
         requestFN(
-          '/corpinfo/listTreeManageAndCorpHasOrder',
+          '/department/listTree/',
           {}
         ).then((data) => {
           const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')