From 262ba3da78fae09dcba3a26aa7b9ee49b293c2a9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 30 十月 2023 17:20:20 +0800
Subject: [PATCH] 主数据刷新
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 131 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 3f29c75..f98ce0f 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,12 +6,12 @@
<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"
type="primary"
- @click="handelBtnClick(item)">{{
+ @click="handleBtnClick(item)">{{
item.name
}}
</el-button>
@@ -35,40 +35,45 @@
<el-option label="瀹℃牳涓�" value="Auditing"></el-option>
</el-select></span>
</div>
- <el-table class="custom-scrollbar" 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 in CodeArray" 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-column v-for="item in lcstatusArray" 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>
+ <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"
@@ -162,6 +167,7 @@
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
+import func from "@/util/func";
export default {
components: {
@@ -323,7 +329,7 @@
oids.push(ele.oid);
});
return oids;
- }
+ },
},
created() {
// const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
@@ -381,14 +387,14 @@
}
})
this.tableHeadFindDatas = newval;
- console.log('new',newval)
+ // console.log('new',newval)
if (!this.isCodeArrayPushed) {
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);
+ // console.log('CodeArray', this.CodeArray);
this.isCodeArrayPushed = true;
}
if (!this.islcstatusPushed) {
@@ -397,7 +403,7 @@
} else {
this.lcstatusArray.push([]);
}
- console.log('lcstatusArray', this.lcstatusArray);
+ // console.log('lcstatusArray', this.lcstatusArray);
this.islcstatusPushed = true;
}
// console.log('new',newval)
@@ -464,10 +470,10 @@
openVis(visible) {
this[visible] = true
},
- handelBtnClick(event) {
+ handleBtnClick(event) {
const {uniqueFlag} = event
this.$nextTick(() => {
- if (uniqueFlag === 'CODEADD') return this.addvisible = true
+ if (uniqueFlag === 'CODEADD') return this.addSaveHandler()
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
@@ -492,6 +498,12 @@
if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
+ });
+ },
+ addSaveHandler(){
+
+ this.$nextTick(() => {
+ this.addvisible = true;
});
},
//鐢宠闆嗗洟鐮佹暟鎹�
@@ -876,6 +888,11 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
+ //console.log(val)
+ if(func.notEmpty(val.ts)) {
+ val.ts = func.formattedDateTime(val.ts);
+ //console.log(val.ts);
+ }
addSaveCode(val).then(res => {
this.$nextTick(() => {
this.addvisible = false;
@@ -933,15 +950,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;
@@ -967,4 +995,7 @@
margin-top: 10px;
}
+ .el-table__body-wrapper{
+ height: calc(100% - 44px) !important;
+}
</style>
--
Gitblit v1.9.3