From 007e33dd8728b4557917a2ffa2e2449865602742 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 04 十二月 2023 16:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 396b601..df6a0b6 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -36,16 +36,18 @@
               </el-select></span>
             </div>
             <div class="custom-table">
-              <el-table ref="dataTable" v-loading="isLoading" :data="tableData" :height="tableHeight"
-                        border class="cus-table"
-                        @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
-                        @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
-                        @sort-change="sortChange">
+              <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
+                        :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
+                        :height="tableHeight" border
+                        class="cus-table" @select="handleSelection" @cell-click="handleCellClick"
+                        @row-click="handleRowClick" @select-all="handleSelectionAll"
+                        @selection-change="handleSelectionChange" @sort-change="sortChange">
                 <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
                 <el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
                 </el-table-column>
                 <!--              鐢熷懡鍛ㄦ湡-->
-                <el-table-column v-for="(item,index) in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden"
+                <el-table-column v-for="(item,index) in lcstatusArray"
+                                 v-if=" lcstatusArray.length !== 0 && !item.hidden"
                                  key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
                                  :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
                                  prop="lcstatus">
@@ -75,7 +77,8 @@
                                  align="center">
                 </el-table-column>
                 <!--               鍙傜収鏁版嵁-->
-                <el-table-column v-for="(item,index) in referArray" v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
+                <el-table-column v-for="(item,index) in referArray"
+                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
                                  :key="index"
                                  :label="item.title" :show-overflow-tooltip="true"
                                  :sortable="item.sortable" :width="item.width" align="center"
@@ -90,14 +93,14 @@
           <!--          鐢宠-->
           <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
                               :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
-                              :visible.sync="applyvisible"
+                              :visible.sync="applyvisible" status="apply"
                               type="add"
                               @submit="applySumbit">
           </FormTemplateDialog>
           <!--          淇-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                               :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
-                              :visible.sync="amendvisible"
+                              :visible.sync="amendvisible" status="amend"
                               type="edit" @submit="amendSumbit"></FormTemplateDialog>
           <!--          鏂板-->
           <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -108,8 +111,9 @@
           </FormTemplateDialog>
           <!--          淇敼-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
-                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
                               :visible.sync="editvisible"
+                              rowOid="rowOid"
                               type="edit" @submit="EditSumbit"></FormTemplateDialog>
           <!--          鎵归噺缂栬緫-->
           <!--          <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -455,8 +459,6 @@
           }
         }
         this.isReferPushed = true;
-        console.log('new', this.referArray)
-        console.log('ss', newval.find(item => Object.keys(item.referConfig).length > 0))
         this.WupinFindValue = ''
       },
     },
@@ -586,16 +588,29 @@
     },
     //鏍囧噯淇
     codeAMENDHandler() {
-      if (this.selectRow.length !== 1) {
-        this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
-      } else {
+      let foundItem = false;
+
+      this.tableHeadFindData.forEach(item => {
+        if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) {
+          foundItem = true;
+        }
+      });
+
+      if (foundItem) {
         this.amendvisible = true;
         this.rowOid = this.selectRow[0].oid;
+      } else {
+        if (this.selectRow.length !== 1) {
+          this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+        } else {
+          this.amendvisible = true;
+          this.rowOid = this.selectRow[0].oid;
+        }
       }
     },
     //鎵归噺缂栬緫
     bulkEditHandler(type) {
-      console.log(this.nodeClickList)
+      // console.log(this.nodeClickList)
       if (this.nodeClickList.children.length >= 1) {
         this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
         return;

--
Gitblit v1.9.3