页面更改

src/components/selectTree/index.vue

@@ -35,10 +35,10 @@ export default {
       
     },
     props: {
-        param: {
-          type: Array,
-          required: true
-        },
+        // param: {
+        //   type: Array,
+        //   required: true
+        // },
         placeholder: {
             type: String,
             default: '请选择'
@@ -73,10 +73,18 @@ export default {
             default: ''
         }
     },
-    created() {
-        this.dataList = this.handleTree(this.param, this.formatId);
-    },
+    // created() {
+    //     console.log('this.param', this.param);
+    //     this.param.length > 0 && (this.dataList = this.handleTree(this.param, this.formatId));
+    // },
     methods: {
+        init(param, formatId = 'deptId') {
+            console.log('param', param, 'fromatId', formatId);
+            this.$nextTick(() => {
+                this.dataList = this.handleTree(param, formatId);
+            })
+           
+        },
         handleNodeClick(data) {
           this.$emit('setNodeValue', data)
           this.$refs.selectUpResId.blur()

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -2,10 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="部门" prop="deptName">
-        <el-select v-model="form.deptName" @change="deptSelect" placeholder="请选择">
+        <!-- <el-select v-model="form.deptName" @change="deptSelect" placeholder="请选择">
           <el-option v-for="(item, index) in deptList" :key="index" :label="item.deptName" :value="index">
           </el-option>
-        </el-select>
+        </el-select> -->
+         <!-- 树状结构组件引用 -->
+         <select-tree ref="selectTree" :placeholder="'请选择部门'" :modelValue="searchDeptName" @setNodeValue="handleNodeClick" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -251,13 +253,16 @@ import {
   addENTERPRISETRADEPERFORMANCE,
   updateENTERPRISETRADEPERFORMANCE,
 } from "@/api/portal/ENTERPRISETRADEPERFORMANCE/ENTERPRISETRADEPERFORMANCE";
+import selectTree from '@/components/selectTree'
 
 export default {
   name: "ENTERPRISETRADEPERFORMANCE",
+  components: { selectTree },
   data() {
     return {
       // 部门列表
       deptList: [],
+      searchDeptName: '',
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -510,10 +515,9 @@ export default {
   created() {
     this.getList();
     getBaseDeptList().then((res) => {
-      console.log(res);
       this.deptList = res.rows;
-      console.log(this.deptList);
-    });
+      this.$refs.selectTree.init(this.deptList)
+    })
   },
   methods: {
     /** 查询企业贸易绩效数据（每个月填报）列表 */
@@ -525,6 +529,15 @@ export default {
         this.loading = false;
       });
     },
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.deptId
+      this.searchDeptName = data.deptName
+      this.$set(this.form, 'deptId', data.deptId)
+      this.$set(this.form, 'deptName', data.deptName)
+    },
+    // setSelectTreeData(){
+    //   this.$refs.selectTree.init(this.deptList)
+    // },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/GARDENBASEDATA/index.vue

@@ -11,7 +11,7 @@
     <el-form-item label="部门名称" prop="deptId">
       <el-select filterable v-model="queryParams.deptId" placeholder="请选择">
         <el-option
-          v-for="item in detpList"
+          v-for="item in deptList"
           :key="item.value"
           :label="item.deptName"
           :value="item.deptId"
@@ -231,7 +231,7 @@
               <el-col :span="12">
                 <el-form-item label="部门" prop="deptName">
                   <!-- 树状结构组件引用 -->
-                  <select-tree :param="detpList" :placeholder="'请选择部门'" :modelValue="form.deptName" @setNodeValue="handleNodeClick" />
+                  <select-tree ref="selectTree" :placeholder="'请选择部门'" :modelValue="form.deptName" @setNodeValue="handleNodeClick" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -341,7 +341,7 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="企业结构  " prop="enterpriseStructureValue">
-                  <el-select v-model="form.enterpriseStructureValue" placeholder="请选择" style="width: 100%">
+                  <el-select v-model="form.enterpriseStructureValue" multiple placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="dict in dict.type.enterprise_structure"
                       :key="dict.value"
@@ -353,7 +353,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="业务构成  " prop="businessEventsValue">
-                  <el-select v-model="form.businessEventsValue" placeholder="请选择" style="width: 100%">
+                  <el-select v-model="form.businessEventsValue" multiple placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="dict in dict.type.business_events"
                       :key="dict.value"
@@ -518,8 +518,6 @@
           </el-form>
         </el-tab-pane>
       </el-tabs>
-
-
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -549,7 +547,7 @@ export default {
       // 新增标签索引
       tabMsg: "basicMsg",
       // 部门列表
-      detpList: [],
+      deptList: [],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -752,9 +750,9 @@ export default {
   created() {
     this.getList();
     getEnterprise().then((res) => {
-      this.detpList = res.data
-
+      this.deptList = res.data
     });
+    
   },
   methods: {
     changeIsShowStatus(val) {
@@ -838,18 +836,27 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      let that = this
       this.reset();
       this.open = true;
       this.title = "添加园区内企业基础数据";
+      this.$nextTick(() => {
+        that.$refs.selectTree.init(that.deptList)
+      })
+      
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      let that = this
       const id = row.id || this.ids;
       getGARDENBASEDATA(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改园区内企业基础数据";
+        this.$nextTick(() => {
+        that.$refs.selectTree.init(that.deptList)
+      })
       });
     },
     /** 提交按钮 */
@@ -870,15 +877,23 @@ export default {
       this.$refs["form"].validate((valid) => {
 
         if (valid) {
+
+          /*
+              以下处理建立在  字典值的  value  和  sort 值排序顺序一致
+          */
           // 获取选中的企业结构 获取 label数据和 sort排序数据
-          let currentEnterpriseStructure = this.dict.type.enterprise_structure?.find(({value}) => value == this.form.enterpriseStructureValue)
-          this.form.enterpriseStructure = currentEnterpriseStructure?.label
-          this.form.enterpriseStructureSort = currentEnterpriseStructure?.raw?.dictSort
+          let currentEnterpriseStructure = this.dict.type.enterprise_structure?.filter(({ value }) => this.form.enterpriseStructureValue.sort((a, b) => a - b).includes(value))
+          this.form.enterpriseStructure = currentEnterpriseStructure?.map(({ label }) => label).join()
+          this.form.enterpriseStructureSort = currentEnterpriseStructure?.map(({ raw }) => raw?.dictSort).join()
 
           // 获取选中的业务结构
-          let currentBusinessEvents = this.dict.type.business_events?.find(({value}) => value == this.form.businessEventsValue)
-          this.form.businessEvents = currentBusinessEvents?.label
-          this.form.businessEventsSort = currentBusinessEvents?.raw?.dictSort
+          let currentBusinessEvents = this.dict.type.business_events?.filter(({ value }) => this.form.businessEventsValue.sort((a, b) => a - b).includes(value))
+          this.form.businessEvents = currentBusinessEvents?.map(({ label }) => label).join()
+          this.form.businessEventsSort = currentBusinessEvents?.map(({ raw }) => raw?.dictSort).join()
+
+          // 将选中的label数据数组转换为字符串
+          this.form.enterpriseStructureValue = this.form.enterpriseStructureValue.sort((a, b) => a - b).join()
+          this.form.businessEventsValue = this.form.businessEventsValue.sort((a, b) => a - b).join()
 
           if (this.form.id != null) {
             updateGARDENBASEDATA(this.form).then((response) => {