Explorar el Código

Merge remote-tracking branch 'zkqyOrigin/master'

lucky hace 2 meses
padre
commit
908ddc5907

+ 50 - 2
zkqy-admin/src/main/resources/initialize_sys_tenant_menu1.json

@@ -1548,5 +1548,53 @@
         "children": [],
         "tenantName": null,
         "tenantId": null
-    }
-]
+    },{
+        "createBy": null,
+        "createTime": "2025-03-08 15:22:00",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 11441,
+        "menuName": "树形表格",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 5,
+        "path": "treeTable",
+        "component": "treeTable/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "form",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },{
+    "createBy": null,
+    "createTime": "2025-03-08 15:22:01",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 11442,
+    "menuName": "树形表格编辑",
+    "parentName": null,
+    "parentId": 1103,
+    "orderNum": 6,
+    "path": "treeTableMange",
+    "component": "treeTableMange/index",
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "C",
+    "visible": "1",
+    "status": "0",
+    "perms": "",
+    "icon": "form",
+    "children": [],
+    "tenantName": null,
+    "tenantId": null
+}
+]

+ 50 - 2
zkqy-admin/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -1573,5 +1573,53 @@
         "children": [],
         "tenantName": null,
         "tenantId": null
-    }
-]
+    },{
+    "createBy": null,
+    "createTime": "2025-03-08 15:22:00",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 11441,
+    "menuName": "树形表格",
+    "parentName": null,
+    "parentId": 1103,
+    "orderNum": 5,
+    "path": "treeTable",
+    "component": "treeTable/index",
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "C",
+    "visible": "0",
+    "status": "0",
+    "perms": "",
+    "icon": "form",
+    "children": [],
+    "tenantName": null,
+    "tenantId": null
+},{
+    "createBy": null,
+    "createTime": "2025-03-08 15:22:01",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 11442,
+    "menuName": "树形表格编辑",
+    "parentName": null,
+    "parentId": 1103,
+    "orderNum": 6,
+    "path": "treeTableMange",
+    "component": "treeTableMange/index",
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "C",
+    "visible": "1",
+    "status": "0",
+    "perms": "",
+    "icon": "form",
+    "children": [],
+    "tenantName": null,
+    "tenantId": null
+}
+]

+ 65 - 85
zkqy-ui/node_modules/k-form-design/packages/components/KFormDesign/index.vue

@@ -3,20 +3,10 @@
     <div class="form-designer-container-9136076486841527" v-if="loadState">
       <k-header v-if="showHead" :title="title" />
       <!-- 操作区域 start -->
-      <operatingArea
-        v-if="toolbarsTop"
-        :showToolbarsText="showToolbarsText"
-        :toolbars="toolbars"
-        @handleSave="handleSave"
-        @handlePreview="handlePreview"
-        @handleOpenImportJsonModal="handleOpenImportJsonModal"
-        @handleOpenCodeModal="handleOpenCodeModal"
-        @handleOpenJsonModal="handleOpenJsonModal"
-        @handleReset="handleReset"
-        @handleClose="handleClose"
-        @handleUndo="handleUndo"
-        @handleRedo="handleRedo"
-      >
+      <operatingArea v-if="toolbarsTop" :showToolbarsText="showToolbarsText" :toolbars="toolbars"
+        @handleSave="handleSave" @handlePreview="handlePreview" @handleOpenImportJsonModal="handleOpenImportJsonModal"
+        @handleOpenCodeModal="handleOpenCodeModal" @handleOpenJsonModal="handleOpenJsonModal" @handleReset="handleReset"
+        @handleClose="handleClose" @handleUndo="handleUndo" @handleRedo="handleRedo">
         <template slot="left-action">
           <slot name="left-action"></slot>
         </template>
@@ -26,32 +16,18 @@
         </template>
       </operatingArea>
       <!-- 操作区域 end -->
-      <div
-        class="content"
-        :class="{
-          'show-head': showHead,
-          'toolbars-top': toolbarsTop,
-          'show-head-and-toolbars-top': toolbarsTop && showHead
-        }"
-      >
+      <div class="content" :class="{
+    'show-head': showHead,
+    'toolbars-top': toolbarsTop,
+    'show-head-and-toolbars-top': toolbarsTop && showHead
+  }">
         <!-- 左侧控件区域 start -->
         <aside class="left">
-          <a-collapse
-            @change="collapseChange"
-            :defaultActiveKey="collapseDefaultActiveKey"
-          >
+          <a-collapse @change="collapseChange" :defaultActiveKey="collapseDefaultActiveKey">
             <!-- 基础控件 start -->
-            <a-collapse-panel
-              v-for="(item, index) in schemaGroup"
-              :header="item.title"
-              :key="index"
-            >
-              <collapseItem
-                :list="item.list"
-                @generateKey="generateKey"
-                @handleListPush="handleListPush"
-                @start="handleStart"
-              />
+            <a-collapse-panel v-for="(item, index) in schemaGroup" :header="item.title" :key="index">
+              <collapseItem :list="item.list" @generateKey="generateKey" @handleListPush="handleListPush"
+                @start="handleStart" />
             </a-collapse-panel>
             <!-- 基础控件 end -->
           </a-collapse>
@@ -61,20 +37,11 @@
         <!-- 中间面板区域 start -->
         <section>
           <!-- 操作区域 start -->
-          <operatingArea
-            v-if="!toolbarsTop"
-            :showToolbarsText="showToolbarsText"
-            :toolbars="toolbars"
-            @handleSave="handleSave"
-            @handlePreview="handlePreview"
-            @handleOpenImportJsonModal="handleOpenImportJsonModal"
-            @handleOpenCodeModal="handleOpenCodeModal"
-            @handleOpenJsonModal="handleOpenJsonModal"
-            @handleReset="handleReset"
-            @handleClose="handleClose"
-            @handleUndo="handleUndo"
-            @handleRedo="handleRedo"
-          >
+          <operatingArea v-if="!toolbarsTop" :showToolbarsText="showToolbarsText" :toolbars="toolbars"
+            @handleSave="handleSave" @handlePreview="handlePreview"
+            @handleOpenImportJsonModal="handleOpenImportJsonModal" @handleOpenCodeModal="handleOpenCodeModal"
+            @handleOpenJsonModal="handleOpenJsonModal" @handleReset="handleReset" @handleClose="handleClose"
+            @handleUndo="handleUndo" @handleRedo="handleRedo">
             <template slot="left-action">
               <slot name="left-action"></slot>
             </template>
@@ -83,18 +50,11 @@
               <slot name="right-action"></slot>
             </template>
           </operatingArea>
-          <!-- 操作区域 end --> 
+          <!-- 操作区域 end -->
           <!-- 中间控件渲染区域 start -->
-          <k-form-component-panel
-            :class="{ 'no-toolbars-top': !toolbarsTop }"
-            :data="data"
-            :selectItem="selectItem"
-            :noModel="noModel"
-            :hideModel="hideModel"
-            :startType="startType"
-            ref="KFCP"
-            @handleSetSelectItem="handleSetSelectItem"
-          />
+          <k-form-component-panel :class="{ 'no-toolbars-top': !toolbarsTop }" :data="data" :selectItem="selectItem"
+            :noModel="noModel" :hideModel="hideModel" :startType="startType" ref="KFCP"
+            @handleSetSelectItem="handleSetSelectItem" />
           <!-- 中间控件渲染区域 end -->
 
           <!-- 操作区域 start -->
@@ -107,24 +67,13 @@
 
         <!-- 右侧控件属性区域 start -->
         <aside class="right">
-          <a-tabs
-            :activeKey="activeKey"
-            @change="changeTab"
-            :tabBarStyle="{ margin: 0 }"
-          >
+          <a-tabs :activeKey="activeKey" @change="changeTab" :tabBarStyle="{ margin: 0 }">
             <a-tab-pane :key="1" tab="表单属性设置">
-              <formProperties
-                :config="data.config"
-                :previewOptions="previewOptions"
-              />
+              <formProperties :config="data.config" :previewOptions="previewOptions" />
             </a-tab-pane>
             <a-tab-pane :key="2" tab="控件属性设置">
-              <formItemProperties
-                class="form-item-properties"
-                :selectItem="selectItem"
-                :hideModel="hideModel"
-                @changeOptionsListData="changeOptionsListData"
-              />
+              <formItemProperties class="form-item-properties" :selectItem="selectItem" :hideModel="hideModel"
+                @changeOptionsListData="changeOptionsListData" />
             </a-tab-pane>
           </a-tabs>
         </aside>
@@ -286,7 +235,7 @@ export default {
         this.selectItem.options.optionsListData.push('');
         console.log(this.selectItem.options.optionsListData);
       } else (
-        this.selectItem.options.optionsListData.split(index,1)
+        this.selectItem.options.optionsListData.split(index, 1)
       )
     },
     generateKey(list, index) {
@@ -349,7 +298,7 @@ export default {
     },
     handlePreview() {
       // 打开预览模态框
-      console.log('[打开预览模态框]',this.data,this.previewOptions.width)
+      console.log('[打开预览模态框]', this.data, this.previewOptions.width)
       this.$refs.previewModal.jsonData = this.data;
       this.$refs.previewModal.previewWidth = this.previewOptions.width;
       this.$refs.previewModal.visible = true;
@@ -512,14 +461,45 @@ export default {
     handleSave() {
       // 保存函数
       // console.log(this.data)
-      if(this.data.list.length == 0){
+      if (this.data.list.length == 0) {
         message.error("请拖拽组件");
         return
       }
-      if (!this.data.config.formName || !this.data.config.nickFormName){
+      if (!this.data.config.formName || !this.data.config.nickFormName) {
         message.error("请填写表单名称和表单别名");
         return
       }
+      // 遍历列表,检查每一项
+      for (let i = 0; i < this.data.list.length; i++) {
+        const item = this.data.list[i];
+        if (item.type == 'calculation_table') {
+          console.log('[item]', item);
+
+          // 检查表名和关联字段
+          if (!item.tableName) {
+            message.error("请选择表名");
+            return;
+          }
+          if (!item.joinTableName) {
+            message.error("请选择关联表字段");
+            return;
+          }
+          if (!item.options.mainTableCondition) {
+            message.error("请选择表名");
+            return;
+          }
+          if (!item.options.joinTableCondition) {
+            message.error("请选择条件表字段");
+            return;
+          }
+
+          // 更新 options 中的表名和关联字段
+          item.options.tableName = item.tableName;
+          item.options.joinTableName = item.joinTableName;
+        }
+      }
+
+      // console.log('[保存的data]',JSON.stringify(this.data))
       this.$emit("save", JSON.stringify(this.data));
     },
     getValue() {
@@ -531,17 +511,17 @@ export default {
     }
   },
   created() {
-    let blackList=['评分','警告提示','HTML','富文本','按钮','级联选择器']
+    let blackList = ['评分', '警告提示', 'HTML', '富文本', '按钮', '级联选择器']
     this.loadState = true;
     nodeSchema.addComputed(this.schemaGroup);
     this.schemaGroup = tempData;
-    console.log('this.schemaGroup123',this.schemaGroup);
+    console.log('this.schemaGroup123', this.schemaGroup);
     this.schemaGroup[0].list = this.schemaGroup[0].list.filter(item => {
-      return !blackList.some(v=>v==item.label)
+      return !blackList.some(v => v == item.label)
     })
     this.schemaGroup[0].list.forEach(item => {
       if (item.label == '树形选择器') {
-        item.label='级联选择器'
+        item.label = '级联选择器'
       }
     })
   }

+ 97 - 29
zkqy-ui/node_modules/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -10,14 +10,6 @@
 
         <!-- +++ -->
         <a-form-item v-if="!hideModel && isDefined(selectItem.model)" label="表名">
-          <!-- <Select
-            v-model="formList.tableName"
-            :fieldNames="{
-              'label': tableComment, 'value': tableName
-            }"
-            @change="getFormList"
-            mode="tags"
-          /> -->
           <el-select v-model="selectItem.tableName" placeholder="请选择" filterable @change="getListName(selectItem)">
             <el-option v-for="item in formList.formName" :key="item.tableName" :label="item.tableComment"
               :value="item.tableName">
@@ -26,6 +18,35 @@
             </el-option>
           </el-select>
         </a-form-item>
+        <!-- +++ -->
+        <a-form-item v-if="isDefined(options.jsTableFlag) && !hideModel && isDefined(selectItem.model)" label="关联表字段">
+          <el-select v-model="options.mainTableCondition" placeholder="请选择关联表字段" filterable>
+            <el-option v-for="item in formList.listName" :key="item.value" :label="item.label" :value="item.value"
+              @change="getOptionsGLZD(options)">
+              <span class="discribe" style="float: left">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.fieldDescription }}</span>
+            </el-option>
+          </el-select>
+        </a-form-item>
+        <a-form-item v-if="isDefined(options.jsTableFlag) && !hideModel && isDefined(selectItem.model)" label="条件表">
+          <el-select v-model="selectItem.joinTableName" placeholder="请选择" filterable @change="getListName2(selectItem)">
+            <el-option v-for="item in formList2.formName" :key="item.tableName" :label="item.tableComment"
+              :value="item.tableName">
+              <span class="discribe" style="float: left">{{ item.tableComment }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.tableName }}</span>
+            </el-option>
+          </el-select>
+        </a-form-item>
+        <a-form-item v-if="isDefined(options.jsTableFlag) && !hideModel && isDefined(selectItem.model)" label="条件表字段">
+          <el-select v-model="options.joinTableCondition" placeholder="请选择条件表字段" filterable>
+            <el-option v-for="item in formList2.listName" :key="item.value" :label="item.label" :value="item.value"
+              @change="getOptionsGLZD(options)">
+              <span class="discribe" style="float: left">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.fieldDescription }}</span>
+            </el-option>
+          </el-select>
+        </a-form-item>
+
         <a-form-item v-if="!hideModel && isDefined(selectItem.model) && isNeedColumn(selectItem)" label="列名">
           <el-select v-model="selectItem.model" @change="changeModel" filterable placeholder="请选择">
             <el-option v-for="item in formList.listName" :key="item.value" :label="item.label" :value="item.value">
@@ -36,18 +57,7 @@
         </a-form-item>
         <a-form-item v-if="!hideModel && isDefined(selectItem.columns)" label="编辑列">
           <el-button type="primary" icon="el-icon-edit" @click="editTableColumns(selectItem)">编辑</el-button>
-          <!-- <el-select v-model="selectItem.model" @change="changeModel" filterable placeholder="请选择">
-            <el-option
-              v-for="item in formList.listName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              <span style="float: left">{{ item.label }}</span>
-      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.fieldDescription }}</span>
-            </el-option>
-          </el-select> -->
         </a-form-item>
-
         <!-- input type start -->
         <a-form-item v-if="selectItem.type === 'input'" label="输入框type">
           <Input v-model="options.type" placeholder="请输入" />
@@ -58,7 +68,6 @@
           <Input placeholder="请输入" v-model="options.rangePlaceholder[0]" />
           <Input placeholder="请输入" v-model="options.rangePlaceholder[1]" />
         </a-form-item>
-
         <a-form-item v-else-if="isDefined(options.placeholder)" label="占位内容">
           <Input placeholder="请输入" v-model="options.placeholder" />
         </a-form-item>
@@ -577,6 +586,11 @@ export default {
         listName: [],
         tableName: ""
       },
+      formList2: { // 新增的第二个下拉框数据
+        formName: [],
+        listName: [],
+        tableName: ""
+      },
       tableShowData: {
         isShow: false,
         columns: []
@@ -587,12 +601,18 @@ export default {
     options() {
       if (!this.selectItem.tableName) {
         this.formList.listName = [];
+
+      }
+      if (!this.selectItem.joinTableName) {
+        this.formList2.listName = [];
       }
+
       return this.selectItem.options || {};
     },
 
   },
   props: {
+    // selectItem从props获取,
     selectItem: {
       type: Object,
       required: true
@@ -604,14 +624,17 @@ export default {
 
   },
   methods: {
+    getOptionsGLZD(options) {
+      console.log('glzd----', options)
+    },
     delectTableColumns(item) {
-      console.log('item00000000',item)
+      // console.log('item00000000', item)
       this.options.tableColumns = this.options.tableColumns.filter(column => column.prop !== item);
 
-      console.log('------0000', this.options.tableColumns); // 输出更新后的 tableColumns 数组
+      // console.log('------0000', this.options.tableColumns); // 输出更新后的 tableColumns 数组
     },
     addTableColumns(item) {
-      console.log('add---',item)
+      // console.log('add---', item)
 
       this.options.tableColumns = item
 
@@ -672,11 +695,9 @@ export default {
         ... this.$store.state.user.dataSource
       }
       let res = await getUncommonTable()
+      console.log('getUncommonTable', res)
       this.formList.formName = res
-      // console.log(res);
-      // getFormName(par).then(res=>{
-      //   this.formList.formName = res.data
-      // });
+      this.formList2.formName = res
     },
     getListName(item = {}) {
       let notNeedColumnList = ['batch', 'selectInputList'];
@@ -690,6 +711,9 @@ export default {
       } else {
         item.model = ''
       }
+      // if (this.options) {
+      //  
+      // }
       let par2 = {
         ... this.$store.state.user.dataSource,
         'tableName': this.selectItem.tableName
@@ -702,16 +726,60 @@ export default {
             fieldDescription: item.fieldDescription
           }
         });
+        let x = this.formList.listName.filter(item => item.value == this.options?.mainTableCondition)
+        if (!(x.length > 0)) {
+          this.options.mainTableCondition = '';
+        }
+
       })
-      // console.log('[this.formList.listName]',t?is.formList.listName)
+
+    },
+    getListName2(item = {}) {
+      console.log('getListName2被调用', this.options.joinTableCondition)
+      let notNeedColumnList = ['batch', 'selectInputList'];
+      let flag = notNeedColumnList.includes(item.type);
+      if (flag) {
+        item.model = 'batch.' + item.joinTableName; // 注意:这里使用 tableName2
+      } else if (item.type) {
+        item.model = 'tableShow.' + item.joinTableName; // 注意:这里使用 tableName2
+      } else {
+        item.model = '';
+      }
+      // // 清空条件表字段
+      // if (this.options) {
+      //   this.options.joinTableCondition = '';
+      // }
+      let par2 = {
+        ...this.$store.state.user.dataSource,
+        tableName: this.selectItem.joinTableName // 注意:这里使用 tableName2
+      };
+
+      getListName(par2).then(res => {
+        this.formList2.listName = res.map(item => {
+          return {
+            label: item.fieldName,
+            value: item.fieldName,
+            fieldDescription: item.fieldDescription
+          };
+        });
+        let x = this.formList2.listName.filter(item => item.value == this.options?.joinTableCondition)
+        if (!(x.length > 0)) {
+          this.options.joinTableCondition = '';
+        }
+      });
+
     }
   },
   mounted() {
     this.getFormList();
-    console.log('this.selectItem', this.selectItem);
     if (this.selectItem.tableName) {
+      console.log('this.selectItem---tableName存在的情况', this.selectItem.tableName);
       this.getListName()
     }
+    if (this.selectItem.joinTableName) {
+      console.log('this.selectItem---joinTableName存在的情况', this.selectItem.joinTableName);
+      this.getListName2();
+    }
   },
 
 };

+ 8 - 2
zkqy-ui/node_modules/k-form-design/packages/components/KFormula/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form>
       <el-form-item>
-        <el-select v-model="calculationType" placeholder="请选择计算方式" @change="onCalculationTypeChange">
+        <el-select v-model="localCalculationType" placeholder="请选择计算方式" @change="onCalculationTypeChange">
           <el-option label="总计" value="sum" />
           <el-option label="平均值" value="average" />
           <el-option label="最大值" value="max" />
@@ -23,7 +23,7 @@ export default {
   name: "KFormula",
   data() {
     return {
-      calculationType: 'sum',
+      localCalculationType: this.value, // 使用传入的value初始化
     };
   },
   props: {
@@ -33,6 +33,12 @@ export default {
     },
 
   },
+  watch: {
+    value(newVal) {
+      // 监听外部传入的value变化,并更新localCalculationType
+      this.localCalculationType = newVal;
+    }
+  },
   computed: {
 
   },

+ 8 - 0
zkqy-ui/src/assets/js/kFormDesign.js

@@ -702,6 +702,14 @@ let tempData = [
           "formula":'sum',
           "tableColor": "#fafafa",
           "tableTextColor": "#000",
+          "jsTableFlag":true,
+          // 表关联
+          "mainTableCondition":'',
+          // 条件表字段
+          "joinTableCondition":'',
+
+          // "jsTableValue":'',
+          // "tjbzdTableValue":'',
           "eventAttribute":true,
           "eventAttributeList":[
             {

+ 9 - 1
zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -1157,6 +1157,10 @@ export default {
             label: "表单组",
             value: "dragFormGroup",
           },
+          {
+            label: "计算表单",
+            value: "calculateForm",
+          },
           {
             label: "其它",
             value: "other",
@@ -1165,7 +1169,7 @@ export default {
       }
     },
     formList() {
-      if (this.btnGroupFormData.btnFormType === "dragForm") {
+      if (this.btnGroupFormData.btnFormType === "dragForm" || this.btnGroupFormData.btnFormType === "calculateForm") {
         return this.formOptions;
       } else if (this.btnGroupFormData.btnFormType === "dragFormGroup") {
         return this.groupFormOptions;
@@ -1215,6 +1219,10 @@ export default {
             value: "TOAST",
             label: "消息提示",
           },
+          {
+            value:"CALCULATE",
+            label:"计算合计",
+          },
         ];
       } else {
         return [

+ 4 - 1
zkqy-ui/src/views/treeTableMange/index.vue

@@ -397,7 +397,7 @@ export default {
                 let data = {}
                 let judgmentMenuResult = await this.judgmentMenu(this.mode);
                 if (judgmentMenuResult.code == 200) {
-                  console.log('this.tableList[1]',this.tableList)
+                  console.log('this.tableList[1]',this.tableList,this.tableList[0].primaryKey)
                   data = {
                     menuId: judgmentMenuResult.data,//菜单id
                     menuName: formTopData.menuName,//菜单名称
@@ -409,6 +409,7 @@ export default {
                     treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
                     tableId: x.tableId,//关联表 
                     tableNameDes: this.tableList[0].dtName,//关联表
+                    treeTableJoinTablePrimaryKey: this.tableList[0].primaryKey,//关联表主键
                     treeTableJoinTableCondition:x.treeTableJoinTableCondition,
                     treeTableJoinTable: this.tableList[0].dtTableName,//关联表表名
                     treeTableKey: this.treeTableKey//  树形菜单的treeTableKey
@@ -425,6 +426,7 @@ export default {
                       this.$message.warning("新增成功");
                     }
                   } else {
+                    console.log('this.tableList[0].primaryKey',this.tableList[0].primaryKey)
                     data = {
                       id: this.editorId,
                       menuId: judgmentMenuResult.data,//菜单id
@@ -437,6 +439,7 @@ export default {
                       treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
                       tableId: x.tableId,//关联表 
                       tableNameDes: this.tableList[0].dtName,//关联表
+                      treeTableJoinTablePrimaryKey: this.tableList[0].primaryKey,//关联表主键
                       treeTableJoinTableCondition:x.treeTableJoinTableCondition,
                       treeTableJoinTable: this.tableList[0].dtTableName,//关联表表名
                       treeTableKey: this.treeTableKey//  树形菜单的treeTableKey

+ 1 - 1
zkqy-ui/vue.config.js

@@ -52,7 +52,7 @@ module.exports = {
       },
       '/DB': {
         // target: `http://192.168.110.59:8099`,
-        target: `http://175.27.169.173:8099`,
+        target: `http://192.168.10.8:8099`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + '/DB']: ''