From f31d6505363fa191fb715976826369484c26cf16 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 03 十二月 2024 12:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue |   89 ++++++++++++++++++++++++--------------------
 1 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
index e4b9c2d..1c23959 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
@@ -37,6 +37,19 @@
         <!--瀵煎叆    -->
         <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
                      @updata="uploadCallBack"></upload-file>
+
+        <div>
+          <fieldset>
+            <legend>&nbsp;鏌ヨ鏉′欢&nbsp;</legend>
+            <form-query-dialog ref="formQuery"
+                               style="height: 260px;"
+                               :readOnly="true"
+                               :queryCondition="queryCondition"
+                               :queryTree="queryTree"
+                               :levelFlag.sync="levelFlag"
+            ></form-query-dialog>
+          </fieldset>
+        </div>
       </basic-container>
     </el-main>
 
@@ -51,9 +64,10 @@
 import func from "@/util/func";
 import {dateFormat} from "@/util/date";
 import FormDialog from "./formDialog.vue"
+import formQueryDialog from "@/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue";
 export default {
   name: "index",
-  components: {FormDialog},
+  components: {FormDialog,formQueryDialog},
   data() {
     return {
       treeOption: {
@@ -68,7 +82,7 @@
         }
       },
       nodeRow: {},
-      treeData: [  {
+      treeData: [{
         label: '涓氬姟绫诲瀷鏍�',
         oid: 'topNode',
         children: []
@@ -95,7 +109,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: -40,
+        calcHeight: 300,
         tip: false,
         header:false,
         column: [{
@@ -115,6 +129,11 @@
       ],
       upFileType: ['vciqtf'],
       fileUrl: 'api/templateController/impBtmTemplate',
+      //楂樼骇鏌ヨ鏉′欢
+      queryTree:{},
+      //鏅�氭煡璇㈡潯浠�
+      queryCondition:[],
+      levelFlag:0
     }
   },
   created() {
@@ -126,30 +145,50 @@
       const loading = this.$loading({});
       getBizTypes().then(res => {
         const data = res.data.data.map(item => {
-          item.label = item.attributes.id;
-          return item;
+          this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
+          item.attributes.label = item.attributes.id;
+          return item.attributes;
         });
         this.treeData[0].children = data;
         loading.close();
+      }).catch(error=>{
+        loading.close();
       })
     },
-
+    // 澶勭悊鏍戝舰缁撴瀯
+    processChildren(item) {
+      if (item.children && item.children.length > 0) {
+        item.attributes.children = item.children.map(child => {
+          child.attributes.label = child.attributes.id;
+          this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
+          return child.attributes; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
+        });
+      }
+    },
     // 鏍戠偣鍑�
     nodeClick(row) {
       this.nodeRow = row;
       this.tableLoading = true;
       this.getTemp();
     },
+    //妯℃澘鍒楄〃鏁版嵁
     getTemp() {
       getObjTypeQTs(this.nodeRow.label).then(res => {
         this.crudData =  res.data.data;
         this.tableLoading = false;
+        this.queryCondition=[];
+        this.queryTree={};
+        this.levelFlag=0;
       })
     },
     rowClick(row) {
       this.$refs.crud.toggleSelection();
       this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
       this.selectionRow = [row];
+
+      this.queryCondition=row.queryTemplate.condition;
+      this.queryTree=row.tree;
+      this.levelFlag=row.levelFlag;
     },
     selectionChange(list) {
       this.selectionRow = list;
@@ -250,40 +289,10 @@
   .el-scrollbar__wrap {
     overflow: auto !important;
   }
-  .headerCon{
-    .el-button{
-      width: 82px;
-    }
-  }
 }
-
-.headerCon {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 5px;
-
-  .el-button + .el-button {
-    margin-left: 5px;
-  }
-
-  .el-button {
-    margin-top: 5px;
-  }
+fieldset {
+  padding: 10px 6px;
+  margin: 10px 0 0 0;
+  border: 1px solid #EBEEF5;
 }
-
-.headerCon > .el-button:nth-child(4) {
-  margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
-  margin-left: 0;
-}
-
-
-.smallBtn {
-  width: 82px;
-  text-align: center;
-  padding-left: 4.5px;
-}
-
 </style>

--
Gitblit v1.9.3