From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
index 3056f86..2acc434 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
@@ -9,7 +9,7 @@
              width="1620px"
              @close="cancelDialog">
     <div style="min-height: 665px;max-height: 85vh;padding-bottom: 50px;">
-      <basic-form key="linkQueryForm" ref="form"
+      <basic-form key="businessQueryForm" ref="form"
                   :formData="form"
                   :formItems="formItems"
                   :span="4"
@@ -226,11 +226,7 @@
           return false;
         },
         allowDrag: (dropNode) => {
-          if (dropNode.data.attrs && dropNode.data.attrs.length > 0) {
-            return false;
-          } else {
-            return true;
-          }
+          return true;
         },
         props: {
           label: 'name',
@@ -299,7 +295,6 @@
       this.$refs.form.validate((valid) => {
         if (valid) {
           const formData = this.initFormData();
-          console.log(formData)
           btmSave(formData).then(res => {
             if (res.data.success) {
               this.$message.success("淇濆瓨鎴愬姛");
@@ -369,7 +364,7 @@
       this.orderFieldList.unshift({
         id: data.row.orderField
       });
-      this.tableFormOption.column[0].dicData = this.orderFieldList
+      this.$refs.tableForm.updateDic('orderField',this.orderFieldList);
     },
     //鑾峰彇鎺掑簭璁剧疆涓墍鏈夋帓搴忓瓧娈�
     getAllAttr() {
@@ -426,10 +421,7 @@
     },
     businessQueryDefineChange(data) {
       if (data.value) {
-        this.businessTreeData = [{
-          name: data.value,
-          attrs: data.item.attrs
-        }]
+        this.businessTreeData = [data.item]
       }
     },
     // 寮�濮嬫嫋鎷芥爲鑺傜偣浜嬩欢

--
Gitblit v1.9.3