From 3d828ba07224d1935f47cb0c20dcb959281361d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d583d02..525f4f4 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -103,14 +103,14 @@
       type: String,
       default: "",
     },
-    selectRow:{
-      type:Array,
-      default:[]
+    selectRow: {
+      type: Array,
+      default: []
     }
   },
   data() {
     return {
-      selectValue:"",
+      selectValue: "",
       //骞翠唬鍙�
       dataYearCode: {
         type: "",
@@ -206,20 +206,20 @@
       }
     },
     dataYearCode: {
-      deep:true,
-      immediate:true,
+      deep: true,
+      immediate: true,
       handler(newV) {
         this.$emit("dataYearCode", newV)
       }
     },
-    selectRow:{
-      handler(newval){
+    selectRow: {
+      handler(newval) {
         console.log(newval);
         let ids = newval.map(item => item.id);
-        this.selectValue= ids.join(",");
+        this.selectValue = ids.join(",");
       },
-      deep:true,
-      immediate:true
+      deep: true,
+      immediate: true
     }
   },
   methods: {
@@ -240,6 +240,7 @@
       let slotColumnList = [];
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
+        console.log(formItem)
         //灞炴�х爜娈佃鍒�
         if (formItem.secType === "codeattrsec") {
           this.attrList.push(formItem);
@@ -247,6 +248,7 @@
         //绯诲垪鍙疯鍒�
         if (formItem.field === "codeStandardEditType") {
           if (this.status === "amend") {
+            console.log("formItem-amend", formItem)
             formItem.readOnly = true;
           }
         }
@@ -296,8 +298,8 @@
               this.codeattrsecValue = val.value;
               return;
             }
-            //鏄惁绯诲垪-绯诲垪鍙�
-            if (val.column.field === "isSeries") {
+            //淇涓�-绯诲垪鍙�
+            if (val.column.field === "reviseSeries") {
               if (val.value === "false") {
                 this.isShow = true;
               } else {
@@ -323,7 +325,8 @@
           field: formItem.field,
           type: this.columnType[formItem.type],
           dicData: this.getDataList(formItem.type, formItem.data),
-          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false),
+          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
+            (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
           prepend: this.preOrSufFixShow("text", formItem.prefix),
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -331,12 +334,12 @@
           valueFormat: formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
-          value:formItem.defaultValue || (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
+          value: formItem.defaultValue || (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
             (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
             (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
             (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null) ||
             //鐖剁粍浠跺鏋滄槸鍙傜収鏁版嵁浼氬皢selectRow缃┖,selectRow涓嶄负绌哄氨璇存槑涓嶆槸鍙傜収瑕佸洖濉簮鏍囧噯鍙锋暟鎹�
-          (this.status === "amend" ? (this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)) : null),
+            (this.status === "amend" ? (this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)) : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -444,7 +447,7 @@
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
             (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
-            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null)  ||
+            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
             (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
@@ -617,7 +620,7 @@
     // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
     getFormDetail() {
       if (this.type === "add") return;
-      if(this.templateOid){
+      if (this.templateOid) {
         getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
           (res) => {
             this.form = Object.assign(this.form, res.data.data[0]);

--
Gitblit v1.9.3