From 617b1344c9788eea6b4260d2251501b1e3e86f7c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 26 十月 2023 17:17:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 123 ++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 39 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 791d4d1..f7a0b3d 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,7 +6,7 @@
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
- <div>
+ <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"
@@ -35,33 +35,45 @@
<el-option label="瀹℃牳涓�" value="Auditing"></el-option>
</el-select></span>
</div>
- <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
- :height="tableHeight"
- @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
- @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
- @sort-change="sortChange">
- <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
- <el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
- </el-table-column>
- <el-table-column v-for="item in CodeArray" v-if="!item.hidden" :label="item.label" :prop="item.prop"
- :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
- align="center">
- <template slot-scope="scope">
- <el-link type="primary" @click="CodeLinkHandler(scope.row)">
- {{ scope.row[item.prop] }}
- </el-link>
- </template>
- </el-table-column>
- <el-table-column v-for="item in this.tableHeadFindData" v-if="!item.hidden && item.prop !== 'id'"
- :key="item.id"
- :formatter="item.formatter"
- :label="item.label" :prop="item.prop"
- :show-overflow-tooltip="true"
- :sortable="item.sortable"
- :width="item.width"
- align="center">
- </el-table-column>
- </el-table>
+ <div class="custom-table">
+ <el-table class="cus-table" ref="dataTable" v-loading="isLoading" :data="tableData"
+ :height="tableHeight" border
+ @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
+ @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
+ @sort-change="sortChange">
+ <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
+ <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" key="index" v-if=" lcstatusArray.length !== 0 && !item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
+ :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
+ align="center">
+ <template slot-scope="scope">
+ <span>{{ scope.row.lcstatus_text }}</span>
+ </template>
+ </el-table-column>
+ <!-- 缂栧彿-->
+ <el-table-column v-for="(item, index) in CodeArray" key="index" v-if="CodeArray.length !== 0 && !item.hidden" :label="item.label" :prop="item.prop"
+ :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
+ align="center">
+ <template slot-scope="scope">
+ <el-link type="primary" @click="CodeLinkHandler(scope.row)">
+ {{ scope.row[item.prop] }}
+ </el-link>
+ </template>
+ </el-table-column>
+ <el-table-column v-for="item in this.tableHeadFindData" v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus'"
+ :key="item.id"
+ :formatter="item.formatter"
+ :label="item.label" :prop="item.prop"
+ :show-overflow-tooltip="true"
+ :sortable="item.sortable"
+ :width="item.width"
+ align="center">
+ </el-table-column>
+
+ </el-table>
+ </div>
</el-row>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -220,6 +232,8 @@
LinkList: [],
isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
CodeArray: [],
+ lcstatusArray:[],
+ islcstatusPushed:false,
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
@@ -372,9 +386,24 @@
}
})
this.tableHeadFindDatas = newval;
+ // console.log('new',newval)
if (!this.isCodeArrayPushed) {
- this.CodeArray.push(newval.find(item => item.prop === 'id'))
- this.isCodeArrayPushed = true
+ if (newval.find(item => item.prop === 'id')) {
+ this.CodeArray.push(newval.find(item => item.prop === 'id'));
+ } else {
+ this.CodeArray.push([]);
+ }
+ // console.log('CodeArray', this.CodeArray);
+ this.isCodeArrayPushed = true;
+ }
+ if (!this.islcstatusPushed) {
+ if (newval.find(item => item.prop === 'lcstatus')) {
+ this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
+ } else {
+ this.lcstatusArray.push([]);
+ }
+ // console.log('lcstatusArray', this.lcstatusArray);
+ this.islcstatusPushed = true;
}
// console.log('new',newval)
this.WupinFindValue = ''
@@ -750,7 +779,7 @@
},
// 鎺掑簭
sortChange(val) {
- console.log(val)
+ // console.log(val)
this.isLoading = true;
let order = "";
if (val.order == "ascending") {
@@ -852,6 +881,8 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
+ console.log(val)
+ val.ts = val.ts.toISOString().replace("Z", "");
addSaveCode(val).then(res => {
this.$nextTick(() => {
this.addvisible = false;
@@ -909,15 +940,26 @@
</script>
<style lang="scss" scoped>
-.testbox {
- .el-table--scrollable-x .el-table__body-wrapper {
- overflow: auto !important;
- }
-
- .el-table__fixed-right-patch {
- background-color: #f5f7fa !important;
- }
+//鍥哄畾鍒楅珮搴�
+/deep/ .el-table__fixed {
+ height: calc(100vh - 370px)!important;
}
+// 婊氬姩鏉℃牱寮忎慨鏀�
+// 婊氬姩鏉＄殑瀹藉害
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+
+}
+// 婊氬姩鏉＄殑婊戝潡
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+}
+
.el-button {
margin: 0 10px 10px 0;
@@ -943,4 +985,7 @@
margin-top: 10px;
}
+ .el-table__body-wrapper{
+ height: calc(100% - 44px) !important;
+}
</style>
--
Gitblit v1.9.3