From ea2e0a63ef8a43ee554cd940c08172fe9522bc87 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index e7175d2..8813035 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,13 +47,14 @@
                                :prop="item.prop" :show-overflow-tooltip="true"
                                :sortable="item.sortable"
                                :width="item.width"
+                               v-if="!item.hidden"
                                align="center">
               </el-table-column>
             </el-table>
           </el-row>
           <!--          鏂板-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
-                              :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible"
+                              :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" :TreeValue="TreeValue"
                               type="add"
                               @submit="AddSumbit">
           </FormTemplateDialog>
@@ -92,7 +93,7 @@
           <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
                                :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
           <div class="block" style="display: flex; justify-content: flex-end">
-            <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
+            <el-pagination :current-page="page.currentPage" :page-size="page.pageSize" :page-sizes="page.pageSizes"
                            :total="page.total" layout="total, sizes, prev, pager, next, jumper"
                            @size-change="handleSizeChange"
                            @current-change="handleCurrentChange">
@@ -154,6 +155,10 @@
     tableDataArray: {
       type: Array,
     },
+    TreeValue:{
+      type: String,
+      default: "",
+    },
     total: {
       type: String,
       default: "",
@@ -800,32 +805,32 @@
     },
     //澧炲姞淇濆瓨
     AddSumbit(val) {
-      this.addvisible = false;
       addSaveCode(val).then(res => {
         this.$nextTick(() => {
-          this.$message.warning("淇濆瓨鎴愬姛");
+          this.addvisible = false;
+          this.$message.success("淇濆瓨鎴愬姛");
           this.onLoad()
         })
       })
     },
     //淇敼鍥炶皟
     EditSumbit(val) {
-      this.editvisible = false;
       editSaveCode(val).then(res => {
         this.$nextTick(() => {
-          this.$message.warning("淇濆瓨鎴愬姛");
+          this.editvisible = false;
+          this.$message.success("淇濆瓨鎴愬姛");
           this.onLoad()
         })
       })
     },
     //鏁版嵁鏇存敼鍥炶皟
     updataSumbit(val) {
-      this.DataVisible = false;
       val.copyFromVersion = this.rowOid;
       val.oid = '';
       upSaveCode(val).then(res => {
         this.$nextTick(() => {
-          this.$message.warning("淇濆瓨鎴愬姛");
+          this.DataVisible = false;
+          this.$message.success("淇濆瓨鎴愬姛");
           this.onLoad()
         })
       })
@@ -867,10 +872,14 @@
   }
 }
 
-/deep/ .el-button {
+.el-button {
   margin: 0 10px 10px 0;
 }
 
+/deep/ .dialog-footer .el-button {
+  margin: 0 10px 0 0;
+}
+
 .main {
   display: flex;
   flex-direction: column;

--
Gitblit v1.10.0