From 336eb77c1a07ca3e3ead4482b51f848fa16ab3b7 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 12 十一月 2023 20:15:38 +0800
Subject: [PATCH] 自定义流水相关开发

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

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f98ce0f..0d72866 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"
@@ -319,7 +319,8 @@
         hasUpload: true,
         height: 110
       },
-      result: ''
+      result: '',
+      elapsedTime:'',
     };
   },
   computed: {
@@ -423,9 +424,7 @@
     },
     tableHeadBtnData: {
       handler(newval) {
-        if (newval.length !== 0) {
           this.masterVrBtnList = newval
-        }
       },
       deep: true
     },
@@ -681,21 +680,36 @@
         });
       }
     },
-    handleSizeChange(val) {
-      this.isLoading = true;
-      setTimeout(() => {
-        this.page.pageSize = val;
-        this.$emit("pageSize", val);
-        this.CrudRend();
-      }, 3000);
+    async CrudRend() {
+      this.elapsedTime = 0;
+      const startTime = performance.now();
+      const res = await TableData({
+        templateOid: this.templateOid,
+        codeClassifyOid: this.codeClassifyOid,
+        page: this.page.currentPage,
+        limit: this.page.pageSize,
+      });
+      const endTime = performance.now();
+      this.elapsedTime = Math.floor(endTime - startTime) * 1;
+      this.page.total = res.data.total;
+      this.data = res.data.data;
+      this.tableData = res.data.data;
     },
-    handleCurrentChange(val) {
+
+    async handleSizeChange(val) {
+      this.page.pageSize = val;
+      this.$emit("pageSize", val);
       this.isLoading = true;
-      setTimeout(() => {
-        this.page.currentPage = val;
-        this.$emit("currentPage", val);
-        this.CrudRend();
-      }, 3000);
+      await this.CrudRend();
+      this.isLoading = false;
+    },
+
+    async handleCurrentChange(val) {
+      this.page.currentPage = val;
+      this.$emit("currentPage", val);
+      this.isLoading = true;
+      await this.CrudRend();
+      this.isLoading = false;
     },
     // 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝e湪缂栬緫鐨勮
     handleCellClick(row, column) {
@@ -746,43 +760,6 @@
           this.$refs.dataTable.doLayout();
         }
       })
-    },
-    //琛ㄦ牸澶存覆鏌�
-    CrudHeaderRend() {
-      if (this.codeClassifyOid != "") {
-        MasterTable({
-          codeClassifyOid: this.codeClassifyOid
-        }).then((res) => {
-          this.options = res.data.tableDefineVO.seniorQueryColumns;
-          this.List = res.data.tableDefineVO.cols[0];
-          this.List.forEach((item) => {
-            let columnItem = {
-              label: item.title,
-              prop: item.queryField,
-              type: this.columnType[item.type],
-              sortable: item.sort,
-              width: item.minWidth,
-            };
-            this.option.column.push(columnItem);
-            this.option.column = this.tableHeadData;
-            this.templateOid = res.data.tableDefineVO.oid;
-            this.$emit("templateOid", this.templateOid);
-          });
-        });
-      }
-    },
-    //琛ㄦ牸鏁版嵁
-    CrudRend() {
-      TableData({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-        page: this.page.currentPage,
-        limit: this.page.pageSize,
-      }).then((res) => {
-        this.page.total = res.data.total;
-        this.data = res.data.data;
-        this.tableData = res.data.data;
-      });
     },
     // 鎺掑簭
     sortChange(val) {
@@ -941,7 +918,8 @@
         limit: this.page.pageSize,
         ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
       }).then(res => {
-        this.tableData = res.data.data
+        this.tableData = res.data.data;
+        // this.page.total = res.data.data.total;
       })
     }
 

--
Gitblit v1.9.3