From 67f7c054ae639bdf425c48309a62890b8c40809f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 十二月 2023 14:30:04 +0800
Subject: [PATCH] 优化主数据代码

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   96 +++++++++++++++++++++++++++---------------------
 1 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index a30dac6..b9364bc 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -331,7 +331,7 @@
         datetime: "datetime",
       },
       tableData: [],
-      tableHeight: 'calc(100vh - 300px)',
+      tableHeight: 'calc(100vh - 350px)',
       DataVisible: false,
       tableHeadData: [],
       items: {},
@@ -467,6 +467,7 @@
     templateOid: {
       handler(newval, oldval) {
         this.fileOptions.ownbizOid = "0";
+        this.statusSelect = 'all'
       },
       deep: true,
     },
@@ -513,7 +514,7 @@
         this.tableHeight = 'calc(100vh - 630px)';
         this.$refs.dataTable.doLayout()
       } else {
-        this.tableHeight = 'calc(100vh - 310px)';
+        this.tableHeight = 'calc(100vh - 350px)';
         this.$refs.dataTable.doLayout()
       }
     },
@@ -927,40 +928,48 @@
       })
     },
     // 鎺掑簭
-    sortChange(val) {
-      // console.log(val)
-      this.isLoading = true;
-      let order = "";
-      if (val.order == "ascending") {
-        order = "asc";
-      } else {
-        order = "desc";
+    async sortChange(val) {
+      try {
+        this.isLoading = true;
+        const order = val.order == 'ascending' ? 'asc' : 'desc';
+        const {data} = await TableData({
+          templateOid: this.templateOid,
+          codeClassifyOid: this.codeClassifyOid,
+          order: order,
+          sort: val.prop,
+          page: this.page.currentPage,
+          limit: this.page.pageSize,
+        });
+        this.data = data.data;
+      } finally {
+        this.isLoading = false;
       }
-      TableData({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-        order: order,
-        sort: val.prop,
-        page: this.page.currentPage,
-        limit: this.page.pageSize,
-      }).then((res) => {
-        setTimeout(() => {
-          this.data = res.data.data;
-          this.isLoading = false;
-        }, 100);
-      });
     },
     //鍒嗛〉鍒锋柊
     async onLoad(val) {
-      await TableData({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-        page: this.page.currentPage,
-        limit: this.page.pageSize,
-      }).then((res) => {
+      this.isLoading = true;
+
+      try {
+        let conditionMap = {};
+        if (this.statusSelect !== 'all') {
+          conditionMap.lcstatus = this.statusSelect;
+        }
+
+        const res = await TableData({
+          templateOid: this.templateOid,
+          codeClassifyOid: this.codeClassifyOid,
+          page: this.page.currentPage,
+          limit: this.page.pageSize,
+          conditionMap
+        });
+
         this.tableData = res.data.data;
-        this.doLayout()
-      });
+        this.doLayout();
+      } catch (error) {
+        // 澶勭悊閿欒
+      } finally {
+        this.isLoading = false;
+      }
     },
     //澶氶��
     handleSelectionChange(list) {
@@ -1071,17 +1080,20 @@
     //杈撳叆鍥炶溅鎼滅储
     tableFindInp() {
       this.isLoading = true;
-      TableData({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-        page: this.page.currentPage,
-        limit: this.page.pageSize,
-        ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
-      }).then(res => {
-        this.tableData = res.data.data;
-        this.page.total = res.data.total;
+      try {
+        TableData({
+          templateOid: this.templateOid,
+          codeClassifyOid: this.codeClassifyOid,
+          page: this.page.currentPage,
+          limit: this.page.pageSize,
+          ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
+        }).then(res => {
+          this.tableData = res.data.data;
+          this.page.total = res.data.total;
+        })
+      }  finally {
         this.isLoading = false;
-      })
+      }
     }
 
   }
@@ -1091,7 +1103,7 @@
 <style lang="scss" scoped>
 //鍥哄畾鍒楅珮搴�
 /deep/ .el-table__fixed {
-  height: calc(100vh - 370px) !important;
+  height: calc(100vh - 365px) !important;
 }
 
 // 婊氬姩鏉℃牱寮忎慨鏀�

--
Gitblit v1.9.3