From 69c44007184b0c496affd99ae785c747bba3dd48 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 15:47:41 +0800
Subject: [PATCH] 主题库保存校验

---
 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue      |   64 ++++++++++++++++++++++++++++---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |    4 +-
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5c1747a..66a96d4 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -332,6 +332,7 @@
 <script>
 import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
 import {getList} from "@/api/refer/table";
+import func from "@/util/func";
 
 export default {
   name: "attrCrud .vue",
@@ -1686,14 +1687,63 @@
     },
     //淇濆瓨
     addsHandler(event) {
-      batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
-        this.$message.success('淇濆瓨鎴愬姛')
-        this.editOpenFlag=false;
-        // 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
-        this.$emit('editCloseChildren')
-      }).catch(()=>{
-        this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
+      this.$refs.referAttrCrud.sort("orderNum");
+      var ischeck = true;
+      console.log(this.ProData)
+      this.ProData.forEach((item,index)=>{
+        if((item.requireFlag && item.requireFlag.toString()=='true') && (item.readOnlyFlag && item.readOnlyFlag.toString()=='true')){
+          this.$message.warning(item.name+"("+item.id+")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
+          console.log(item)
+          ischeck=false;
+          return;
+        }
+        var num=0;
+        if(item.componentRule){
+          //缁勫悎瑙勫垯
+          num++
+        }
+        if(item.enumString || item.enumId){
+          //鏋氫妇
+          num++
+        }
+        if(item.referConfig || item.referBtmId){
+          //鍙傜収
+          num++
+        }
+        if(item.codeDateFormat){
+          //鏃堕棿鏍煎紡
+          num++
+        }
+        if(item.classifyInvokeLevel){
+          //鍒嗙被娉ㄥ叆
+          num++
+        }
+        if(num>1 && ischeck){
+          this.$message({
+            showClose: true,
+            message: item.name+"("+item.id+") 灞炴�у彧鑳芥槸缁勫悎瑙勫垯锛屾灇涓撅紝鍙傜収锛屾椂闂存牸寮忥紝鍒嗙被娉ㄥ叆涓殑涓�绉�",
+            type: 'warning'
+          });
+          ischeck=false;
+          return;
+        }
       })
+      if(!ischeck){
+        return ;
+      }
+      // 鏂板嚱鏁扮敤浜庢墽琛宐atchAddSave鏂规硶
+      const executeBatchAddSave = () => {
+        batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
+          this.$message.success('淇濆瓨鎴愬姛')
+          this.editOpenFlag=false;
+          // 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
+          this.$emit('editCloseChildren')
+        }).catch(()=>{
+          this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
+        });
+      }
+      // 鎵�鏈塱f鏉′欢鍜岄�昏緫閫氳繃鍚庤皟鐢╡xecuteBatchAddSave鍑芥暟
+      executeBatchAddSave();
     },
     //琛ㄦ牸琛岀紪杈�
     handleCellClicks(row, column) {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d43a421..41d1068 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -354,10 +354,10 @@
   inject: ["crudTreeData"],
   data() {
     return {
-      masterRow:0,
+      masterRow:null,
       AddLoading:false,
       // 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
-      requestCount:0,
+      requestCount:null,
       //瀵煎叆鐘舵�佹
       ThemeImportVisible:false,
       selectRow:'',

--
Gitblit v1.9.3