树形工具端新增字段后页面修改

zkqy-ui/.env.development

@@ -14,6 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 #数据引擎模块
 VUE_APP_BASE_API2 = 'http://192.168.110.83:8099/'
 #表单引擎模块
-VUE_APP_BASE_API3 = 'http://192.168.110.83:8088/'
+VUE_APP_BASE_API3 = 'http://192.168.10.8:8088/'
 #流程引擎模块
-VUE_APP_BASE_API4 = 'http://192.168.110.83:8055/'
+VUE_APP_BASE_API4 = 'http://192.168.110.83:8055/'

zkqy-ui/src/views/treeTableMange/index.vue

@@ -9,7 +9,7 @@
         <el-card shadow="always">
           <DynamicForm ref="dynamicForm" :formItems="treeFormItems" :formButtons="mode != 4 ? treeFormButtons : []"
             :Showbuttons="mode != 4" @cancelTree="cancelTree" @confirmTree="confirmTree"
-            @query-params-change="handleQueryParamsChange">
+>
           </DynamicForm>
         </el-card>
       </div>
@@ -17,8 +17,6 @@
       <div class="tree_table_mange_tabulation_title">
         <span>表格字段配置</span>
         <el-card shadow="always" v-loading="loading">
-          <!-- 表格配置 -->
-          <!--   @query-params-change="handleQueryParamsChange" -->
           <DynamicForm ref="treeTableFormItems" :formItems="treeTableFormItems" :Showbuttons="false"
             @query-params-change="handleQueryParamsTableChange">
           </DynamicForm>
@@ -63,6 +61,7 @@ export default {
 
   data() {
     return {
+      treeSelect:true,
       // 标记，2增加3修改4查看
       mode: 4,
       //id查询的数组
@@ -158,16 +157,16 @@ export default {
           ]
         },
         {//treeTableConditionColumn
-          label: '匹配名',
+          label: '匹配模式',
           prop: 'treeTableCondition',
           component: 'el-select',
           attrs: {
-            placeholder: '请选择匹配名',
+            placeholder: '请选择匹配模式',
             clearable: true,
           },
           options: [{
-            label: '根据id关联',
-            value: 'id'
+            label: '根据value关联',
+            value: 'value'
           },
           {
             label: '根据label关联',
@@ -175,7 +174,7 @@ export default {
           }],
           selectSlot: true,
           rules: [
-            { required: true, message: '匹配名不能为空', trigger: 'blur' }
+            { required: true, message: '匹配模式不能为空', trigger: 'blur' }
           ]
         },
         {//treeRecursiveValue
@@ -664,6 +663,8 @@ export default {
       this.treeTableFormItems[1].options = []
       this.$refs.treeTableFormItems.queryParams.treeTableJoinTableCondition = null; // 或者设置为空数组 []
       let data = this.treeTableFormItems[0].options.filter(item => item.tId == value)[0]
+      console.log('[[data-----]]',data)
+
       if (data?.spare) {
         let spare = JSON.parse(JSON.parse(JSON.stringify(data.spare)))
         if (Array.isArray(spare)) {
@@ -677,33 +678,29 @@ export default {
           console.error('Expected an array for spare but got:', typeof spare);
           this.treeTableFormItems[1].options = []
           this.$refs.treeTableFormItems.queryParams.treeTableJoinTableCondition = null; // 或者设置为空数组 []
-
-
           // 根据实际情况处理 spare 不是数组的情况
         }
-
       }
       // this.treeTableFormItems[1].options
     },
-    // 监听表单值发生变化queryParams
-    handleQueryParamsChange(newParams) {
-      // console.log('queryParams 发生变化:', newParams);
-    },
     // 监听表单值发生变化-表单配置的下方表单
     handleQueryParamsTableChange(newParams) {
-      console.log('newParams',newParams)
-      if (newParams.tableId) {
-        this.tableLoading = true
-        this.getList(newParams.tableId)
+      if(this.treeSelect){
+        console.log('newParams',newParams)
+          if (newParams.tableId) {
+            this.tableLoading = true
+            this.getList(newParams.tableId,newParams)
+          }
       }
     },
     /** 查询动态格列表 */
-    getList(id) {
+    getList(id,newParams) {
       let queryParams = {
         isEnablePaging: false,
       }
       listTable(queryParams).then((response) => {
         if (response.code == 200) {
+          
           this.treeTableFormItems[0].options = response.rows.map(item => {
             return {
               ...item,
@@ -711,8 +708,9 @@ export default {
               value: item.tId,
             }
           })
+
           if (id) {
-            console.log('--------newParams.tableId存在--------------', id, this.$refs.treeTableFormItems.queryParams)
+            console.log('--------newParams.tableId存在--------------', id,newParams, this.$refs.treeTableFormItems.queryParams)
             // tableList是表格字段配置下面的表格
             this.tableList = [];
             // 如果id存在，则找出response.rows中id等于response.rows的item.tId的一项，给表格字段配置下面的表格赋值
@@ -721,12 +719,16 @@ export default {
               this.tableList = [selectedItem];
               this.tableLoading = false
               //让关联表格下拉框有值
-
             } else {
               console.error("未找到与提供的ID匹配的项");
               this.tableList = [];
               this.tableLoading = false
             }
+            if(this.editor.treeTableJoinTableCondition)  {
+              this.handleTableChangeTree(id)
+              this.$refs.treeTableFormItems.queryParams.treeTableJoinTableCondition = this.editor.treeTableJoinTableCondition
+              this.treeSelect = false
+              }
           } else {
 
             this.loading = false
@@ -751,6 +753,8 @@ export default {
       if (res.code === 200) {
         this.editor = res.data
         this.handleTableChange(this.editor.treeTableName)
+        // this.handleTableChangeTree(Number(this.editor.tableId))
+
         console.log("res.data",res.data)
         let {
           menuName,
@@ -775,8 +779,10 @@ export default {
         });
         Object.assign(this.$refs.treeTableFormItems.queryParams, {
           tableId: Number(tableId),
-          treeTableJoinTableCondition,
+          // treeTableJoinTableCondition,
         });
+            // this.handleTableChangeTree(Number(tableId))
+
         this.$refs.dynamicForm.queryParams.menuId = this.getParentMenuId(
           res.data.menuId,
           this.treeFormItems[2].menus,

zkqy-ui/vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
         // target: `http://192.168.110.52:8080`,
         // target: `http://192.168.110.76:8080`,
         // target: `http://175.27.169.173:8080`,
-        target: `http://192.168.10.3:8080`,
-        
+        target: `http://192.168.10.8:8080`,
+
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -61,7 +61,7 @@ module.exports = {
       '/FORM': {
         // target: `http://192.168.110.59:8088`,
         // target: `http://175.27.169.173:8088`,
-        target: `http://192.168.10.3:8088`,
+        target: `http://192.168.10.8:8088`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + '/FORM']: ''
@@ -182,4 +182,4 @@ module.exports = {
         }
       )
   }
-}
+}