From 641e21dbd93a0b4608ccac8acbc6724dd148f569 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 25 八月 2023 09:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index fe8eea6..8bcb7ef 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,7 +3,8 @@
     :visible.sync="dialogVisible"
     v-if="dialogVisible"
     v-dialogDrag
-    top="5vh"
+    top="-5vh"
+    class="avue-dialog avue-dialog--top"
     :title="title"
     :width="width"
     append-to-body
@@ -133,10 +134,13 @@
       showCodeApply: false,
       showResembleQuery: false,
       selfColumnType: {
-        codefixedsec: "combox",
-        codeclassifysec: "refer",
-        codevariablesec: "text",
-        coderefersec: "refer",
+        codefixedsec: "combox",//鍥哄畾鐮佹
+        codeclassifysec: "refer",//鍒嗙被鐮佹
+        codevariablesec: "text",//鍙彉鐮佹
+        coderefersec: "refer",//寮曠敤鐮佹
+        codeattrsec: "text",
+        codelevelsec: "text",
+        codedatesec: "date"
       },
       selfColumnConfig: {
         function: {
@@ -155,6 +159,7 @@
           label: "name",
           maxlength: "codeSecLength",
           data: "fixedValueVOList",
+          dateFormate: "codeDateFormatStr"
         },
         directVoluation: {
           search: true,
@@ -264,6 +269,9 @@
             "codeclassifysec",
             "codevariablesec",
             "coderefersec",
+            "codeattrsec",
+            "codelevelsec",
+            "codedatesec"
           ];
           this.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
@@ -293,6 +301,8 @@
         if (item.parentClassifySecOid === field) {
           this.$refs.CodeApply.form[item.oid] = undefined;
           this.$refs.CodeApply.form[item.name] = undefined;
+          item.readOnly=false;
+          item.referConfig.extraParams.parentClassifyValueOid=data.value;
         }
         return item;
       });
@@ -313,13 +323,13 @@
       if (!formValidate) return;
       let codeValidate = true;
       // 杩涜鐮佸�肩敵璇锋牎楠�
-      if (this.showCodeApply) {
-        codeValidate = await this.$refs.CodeApply.validate();
-        if (!codeValidate) {
-          this.activeName = "codeApply";
-          return false;
-        }
-      }
+      // if (this.showCodeApply) {
+      //   codeValidate = await this.$refs.CodeApply.validate();
+      //   if (!codeValidate) {
+      //     this.activeName = "codeApply";
+      //     return false;
+      //   }
+      // }
       let resembleQueryList = [];
       if (this.$refs.resembleQueryRef) {
         // 杩涜鐩镐技椤规煡璇�
@@ -349,6 +359,8 @@
         "lcstatus_text",
         "hesuanfenleiname",
         "$kucunwl",
+        "oldcode",
+        "lastmodifier"
       ];
       let resForm = {};
       const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
@@ -404,6 +416,7 @@
     getReferConfig(item) {
       let params = {};
       if (item.secType == "codeclassifysec") {
+        //鍒嗙被鐮佹
         params = {
           isMuti: false,
           type: "grid",
@@ -448,6 +461,7 @@
           },
         };
       } else if (item.secType == "coderefersec") {
+        //寮曠敤鐮佹
         params = JSON.parse(item.referValueInfo);
       }
       return params;

--
Gitblit v1.9.3