From 2171e52259e2b6e64178f77d14eda487f45ed8d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 16:50:16 +0800
Subject: [PATCH] 统计分析模块更改
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 92973d5..76fc6c0 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"
@@ -67,25 +67,15 @@
</template>
</el-table-column>
<el-table-column v-for="item in this.tableHeadFindData"
- v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus' && Object.keys(item.referConfig).length <= 0"
+ v-if="!item.hidden && item.prop !== 'id'"
:key="item.id"
:formatter="item.formatter"
- :label="item.label" :prop="item.prop"
+ :label="item.label"
+ :prop="item.prop"
:show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
align="center">
- </el-table-column>
- <!-- 鍙傜収鏁版嵁-->
- <el-table-column v-for="(item,index) in referArray"
- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
- :key="index"
- :label="item.title" :show-overflow-tooltip="true"
- :sortable="item.sortable" :width="item.width" align="center"
- prop="jiliangdw">
- <template slot-scope="scope">
- <span>{{ scope.row.jiliangdwname }}</span>
- </template>
</el-table-column>
</el-table>
</div>
@@ -355,15 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions:{},
result: '',
elapsedTime: '',
};
@@ -411,13 +393,24 @@
},
tableDataArray: {
handler(newval, oldval) {
+ // console.log('tableData',newval)
this.tableData = newval;
this.searchResults = newval
this.doLayout();
+ this.fileOptions= {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
handler(newval, oldval) {
+ // console.log(newval)
newval.forEach((record, _index) => {
if (record.queryField == 'id' && validatenull(record.templet)) {
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -1098,7 +1091,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px) !important;
+ height: calc(100vh - 365px) !important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
@@ -1136,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.9.3