From cb5e4fb0d120c7334fb25c93c4ac4d293a3cde3a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 十二月 2023 15:26:40 +0800
Subject: [PATCH] 主数据排序bug
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 47 ++++++++++++++++++++++++-----------------------
Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue | 2 +-
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index b9364bc..82d1ebe 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -46,15 +46,15 @@
<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"-->
-<!-- key="index" :show-overflow-tooltip="true" :sortable="item.sortable"-->
-<!-- :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"-->
-<!-- prop="lcstatus">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ scope.row.lcstatus_text }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <!-- <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">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <span>{{ scope.row.lcstatus_text }}</span>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<!-- 缂栧彿-->
<el-table-column v-for="(item, index) in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden"
key="index" :label="item.label" :prop="item.prop"
@@ -345,7 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions:{},
+ fileOptions: {},
result: '',
elapsedTime: '',
};
@@ -397,7 +397,7 @@
this.tableData = newval;
this.searchResults = newval
this.doLayout();
- this.fileOptions= {
+ this.fileOptions = {
ownbizOid: "0",
ownbizBtm: "0",
fileDocClassify: '!=processAuditSuggest',
@@ -591,7 +591,7 @@
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
this.isLoading = false;
- }).catch(error=>{
+ }).catch(error => {
this.$message.error(error);
});
},
@@ -954,7 +954,6 @@
if (this.statusSelect !== 'all') {
conditionMap.lcstatus = this.statusSelect;
}
-
const res = await TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -962,11 +961,10 @@
limit: this.page.pageSize,
conditionMap
});
-
this.tableData = res.data.data;
this.doLayout();
} catch (error) {
- // 澶勭悊閿欒
+ this.$message.error(error)
} finally {
this.isLoading = false;
}
@@ -1002,15 +1000,18 @@
this.findvisible = true;
},
// 楂樼骇鏌ヨ
- echoContion(val) {
- FindData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- ...val,
- }).then((res) => {
+ async echoContion(val) {
+ try {
+ const res = await FindData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ ...val,
+ });
this.tableData = res.data.data;
this.page.total = res.data.total
- });
+ } catch (error) {
+
+ }
},
//鐩镐技椤规煡璇�
similarHandler() {
@@ -1091,7 +1092,7 @@
this.tableData = res.data.data;
this.page.total = res.data.total;
})
- } finally {
+ } finally {
this.isLoading = false;
}
}
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
index 0e5a2de..3824b23 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
@@ -92,7 +92,7 @@
data() {
return {
chartOptions: {
- color:["#91CC75", "#5470C6"],
+ color:['#84C9E5', '#F68686'],
title: {
text: "",
},
--
Gitblit v1.9.3