From 4208d7f9407ab7c9d6b756f5f8a7616b7686fc74 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 12:40:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index bdcca1e..af9a9af 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,15 +6,15 @@
           <div>
           </div>
           <el-row style="width: 100%;margin-bottom: 10px">
-            <div style="margin-bottom: 10px">
-              <el-button v-for="(item, index) in masterVrBtnList"
-                         v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
-                         :key="index" plain size="small"
-                         type="primary"
-                         @click="handleBtnClick(item)">{{
-                  item.name
-                }}
-              </el-button>
+            <div style="margin-bottom: 10px" >
+                <el-button v-for="(item, index) in masterVrBtnList"
+                           v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
+                           :key="index" plain size="small"
+                           type="primary"
+                           @click="handleBtnClick(item)">{{
+                    item.name
+                  }}
+                </el-button>
               <span v-if="tableHeadFindData.length > 0">
               <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
                 <el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
@@ -75,6 +75,18 @@
               </el-table>
             </div>
           </el-row>
+          <!--          鐢宠-->
+          <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
+                              :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
+                              :visible.sync="applyvisible"
+                              type="add"
+                              @submit="applySumbit">
+          </FormTemplateDialog>
+          <!--          淇-->
+          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
+                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+                              :visible.sync="amendvisible"
+                              type="edit" @submit="amendSumbit"></FormTemplateDialog>
           <!--          鏂板-->
           <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
                               :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -132,6 +144,7 @@
         </div>
       </div>
       <div>
+<!--        瀵煎叆-->
         <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
                      :visible.sync="batchImportData.visible">
         </BatchImport>
@@ -273,6 +286,8 @@
         label: "name",
       },
       tableHeadFindDatas: [],
+      applyvisible:false,
+      amendvisible:false,
       addvisible: false,
       editvisible: false,
       findvisible: false,
@@ -424,9 +439,7 @@
     },
     tableHeadBtnData: {
       handler(newval) {
-        if (newval.length !== 0) {
           this.masterVrBtnList = newval
-        }
       },
       deep: true
     },
@@ -499,10 +512,36 @@
         if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
         //  鐩镐技椤规煡璇�
         //  if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
+        //  鏍囧噯鐢宠
+        if (uniqueFlag === 'CODEAPPLY') return this.codeApplyHandler()
+        //  鏍囧噯淇
+        if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
       });
     },
-    addSaveHandler(){
+    //鏍囧噯鐢宠
+    codeApplyHandler(){
+      this.$nextTick(() => {
+        this.applyvisible = true;
+      });
+    },
+    applySumbit(){
 
+    },
+    amendSumbit(){
+
+    },
+    //鏍囧噯淇
+    codeAMENDHandler(){
+      if (this.selectRow.length !== 1) {
+        this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+      } else if (this.selectRow[0].lcstatus !== "Editing") {
+        this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
+      } else {
+        this.amendvisible = true;
+        this.rowOid = this.selectRow[0].oid;
+      }
+    },
+    addSaveHandler(){
       this.$nextTick(() => {
         this.addvisible = true;
       });
@@ -816,15 +855,13 @@
     },
     //缂栬緫
     editHandler() {
-      if (this.selectRow.length <= 0) {
+      if (this.selectRow.length !== 1) {
         this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
-      } else if (this.selectRow.length > 1) {
-        this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
-      } else if (this.selectRow[0].lcstatus != "Editing") {
-        this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫");
+      } else if (this.selectRow[0].lcstatus !== "Editing") {
+        this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
       } else {
         this.editvisible = true;
-        this.rowOid = this.selectRow[0]['oid']
+        this.rowOid = this.selectRow[0].oid;
       }
     },
     //楂樼骇鏌ヨ鎸夐挳
@@ -867,7 +904,7 @@
     },
     //澧炲姞淇濆瓨
     AddSumbit(val) {
-      //console.log(val)
+      // console.log('val',val)
       if(func.notEmpty(val.ts)) {
         val.ts = func.formattedDateTime(val.ts);
         //console.log(val.ts);

--
Gitblit v1.9.3