From 3b74065ad9b4a90f5d64a1ff07cb082501c7ebd9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 十月 2023 11:27:38 +0800
Subject: [PATCH] 修改获取免密登录账号缓存问题

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

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index e7175d2..218543e 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -17,7 +17,7 @@
               </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" :label="item.label" :value="item.prop"></el-option>
+                <el-option v-for="item in tableHeadFindData" :label="item.label" :value="item.prop" :key="item.id"></el-option>
               </el-select>
               <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
                         size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
@@ -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: "",
@@ -177,7 +182,8 @@
     },
     Treedata: {
       type: Array
-    }
+    },
+
   },
   data() {
     return {
@@ -313,8 +319,9 @@
     },
     tableHeadFindData: {
       handler(newval, oldval) {
+        console.log('new',newval)
         newval.forEach((record, _index) => {
-          if (record.field == 'id' && validatenull(record.templet)) {
+          if (record.queryField == 'id' && validatenull(record.templet)) {
             //浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
             record.formatter = '';
           } else {
@@ -329,10 +336,11 @@
           }
 
           if (_index == 0) {
-            this.keyWordFind = record.field
+            this.keyWordFind = record.queryField
           }
         })
         this.tableHeadFindDatas = newval;
+        // console.log('new',newval)
         this.WupinFindValue = ''
       },
     },
@@ -671,7 +679,7 @@
           this.List.forEach((item) => {
             let columnItem = {
               label: item.title,
-              prop: item.field,
+              prop: item.queryField,
               type: this.columnType[item.type],
               sortable: item.sort,
               width: item.minWidth,
@@ -699,6 +707,7 @@
     },
     // 鎺掑簭
     sortChange(val) {
+      console.log(val)
       this.isLoading = true;
       let order = "";
       if (val.order == "ascending") {
@@ -800,32 +809,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 +876,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