From d02571d59633367ac76b7f58ab38584698b1aa1b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:55:37 +0800
Subject: [PATCH] 高级查询中增加范围查询功能

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 561cb91..d8ea149 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -17,6 +17,7 @@
       :TreeValue="TreeValue"
       :eventList="eventList"
       :rowOid="rowOid"
+      :selectRow="selectRow"
       :status="status"
       :templateOid="templateOid"
       :type="type"
@@ -38,8 +39,10 @@
         <el-tab-pane v-if="showCodeApply" label="鐮佸�肩敵璇�" name="codeApply">
           <FormTemplate
             key="codeApplyForm" ref="CodeApply"
+            :selectRow="selectRow"
             :selfColumnConfig="selfColumnConfig"
             :selfColumnType="selfColumnType"
+            :status="status"
             :type="type"
             data-key="codeApplyForm"
             secDTOListv-bind="$attrs"
@@ -139,6 +142,10 @@
       type: Object,
       default: () => ({}),
     },
+    selectRow: {
+      type: Array,
+      default: []
+    }
   },
   data() {
     return {
@@ -241,18 +248,12 @@
       },
     },
   },
-  watch: {
-    codeApplyForm: {
-      handler(newval, oldval) {
-        // console.log('newval',newval)
-      }
-    }
-  },
+  watch: {},
   methods: {
     openDialog() {
-      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
+      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
       this.getFormTemplate();
-      if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
+      if (this.type === "add") {
         this.getCodeRule();
         return;
       }
@@ -323,7 +324,7 @@
           that.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
           );
-          if (that.secVOList.length > 0 && that.type === "add" ||(that.type !== "add" &&  that.status === "amend")) {
+          if (that.secVOList.length > 0 && that.type === "add" || (that.type !== "add" && that.status === "amend")) {
             that.showCodeApply = true;
             that.activeName = "codeApply";
 
@@ -358,7 +359,7 @@
         }
       })
       if (this.$refs.CodeApply) { // 娣诲姞涓�涓垽鏂鍙ワ紝妫�鏌ュ璞℃槸鍚︿负undefined
-        this.$refs.CodeApply.changeChildItem(this.secVOList, this.TreeValue, this.type);
+        this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
       }
     },
     //骞翠唬鍙�
@@ -374,7 +375,7 @@
       });
 
       if (this.$refs.CodeApply) {
-        this.$refs.CodeApply.changeChildItem(this.secVOList, this.TreeValue, this.type);
+        this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
       }
     },
     //灞炴�х爜娈佃祴鍊�
@@ -413,7 +414,7 @@
       }
     },
     async submit() {
-      if(this.status){
+      if (this.status) {
         // 杩涜琛ㄥ崟鏍￠獙
         const formValidate = await this.$refs.FormTemplate.validate();
         if (!formValidate) return;
@@ -473,7 +474,7 @@
             secValue: this.codeApplyForm[item.oid],
           };
         });
-        //鏍囧噯鐗瑰畾
+        //鏍囧噯鐗瑰畾瀛楁鏄犲皠
         const mappings = {
           codeStandardEditType: 'operationType',
           reviseSeries: 'series',
@@ -492,7 +493,7 @@
         resForm.codeRuleOid = this.codeRuleOid;
         resForm.templateOid = this.templateOid;
         this.$emit("submit", resForm);
-      }else {
+      } else {
         // 杩涜琛ㄥ崟鏍￠獙
         const formValidate = await this.$refs.FormTemplate.validate();
         if (!formValidate) return;
@@ -638,7 +639,7 @@
         };
       } else if (item.secType == "coderefersec") {
         //寮曠敤鐮佹
-        params = JSON.parse(item.referValueInfo);
+        params = JSON.parse(item.referValueInfo || item.referConfig);
       }
       return params;
     },

--
Gitblit v1.9.3