From 0ff8244ef43a22ba839beb985431cd043b56b403 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 22 十一月 2024 11:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index 23931d1..abc4359 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -60,6 +60,7 @@
                                :queryCondition="queryCondition"
                                :queryTree="queryTree"
                                :levelFlag.sync="form.levelFlag"
+                               :searchColumn="searchColumn"
                                @queryHandler="queryHandler"
             ></form-query-dialog>
           </fieldset>
@@ -95,6 +96,20 @@
   components:{formQueryDialog},
   data(){
     return {
+      searchColumn: [
+        {
+          label: 'OID',
+          prop: 'OID',
+        },
+        {
+          label: 'CREATOR',
+          prop: 'CREATOR'
+        },
+        {
+          label: 'CREATETIME',
+          prop: 'CREATETIME'
+        },
+      ],
       dialog: {
         showDialog: false,
         title: "鍒涘缓",
@@ -108,7 +123,8 @@
         label: '鏌ヨ妯℃澘鍚嶇О',
         prop: 'qtName',
         type: 'input',
-        span:5,
+        span:4.5,
+        labelWidth: 100,
         rules: [{
           required: true,
           message: "璇疯緭鍏ユ煡璇㈡ā鏉垮悕绉�",
@@ -119,8 +135,8 @@
         prop: 'direction',
         type: 'radio',
         value:'positive',
-        labelWidth:70,
-        span: 3,
+        labelWidth:80,
+        span: 3.5,
         dicData: [{
           label: '姝ｅ悜',
           value: 'positive'
@@ -138,7 +154,8 @@
         label: '鐗堟湰鐗堟',
         prop: 'version',
         type: 'select',
-        span:5,
+        span:4,
+        labelWidth:110,
         dicData: [{
           label: '褰撳墠鐗堟湰褰撳墠鐗堟',
           value: 1
@@ -157,7 +174,7 @@
         label: '鏌ヨ鏄惁鏈変笅绾�',
         prop: 'queryISLeaf',
         type: 'switch',
-        labelWidth:140,
+        labelWidth:150,
         dicData: [ {
           label: '鍚�',
           value: false
@@ -170,7 +187,7 @@
         label: '瀛愯妭鐐瑰眰娆℃暟',
         prop: 'level',
         type: 'number',
-        span:3,
+        labelWidth:130,
         value:1
       }],
       form:{
@@ -180,7 +197,7 @@
         queryTemplate:{}
       },
       //宸叉湁鎺掑簭鍒楄〃閰嶇疆
-      crudOption: {
+        crudOption: {
         ...basicOption,
         addBtn: false,
         editBtn: false,
@@ -577,9 +594,23 @@
           const formData=this.initFormData();
           getCriteria(formData).then(res => {
             if (res.data.success) {
-              this.resultData=res.data.data;
-              this.$refs.formQuery.queryResultDialog.showDialog=true;
-              this.$refs.formQuery.queryResultDialog.loading=false;
+              const data = res.data.data;
+              const result = data.map(item => {
+                const filteredAttrs = item.hisAttrValList.filter(attr =>
+                  attr.attrName === "OID" || attr.attrName === "CREATOR" || attr.attrName === "CREATETIME"
+                );
+
+                const newObj = filteredAttrs.reduce((acc, attr) => {
+                  acc[attr.attrName] = attr.attrVal;
+                  return acc;
+                }, {});
+
+                return newObj;
+              });
+
+              this.$refs.formQuery.resultData = result;
+              this.$refs.formQuery.queryResultDialog.showDialog = true;
+              this.$refs.formQuery.queryResultDialog.loading = false;
             }
           });
         } else {

--
Gitblit v1.9.3