From c4d687aacfb4e7b6ee5ce67df93cf2f8d8df80c1 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 26 十一月 2023 14:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 116 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 483d080..396b601 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,15 +6,15 @@
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
- <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="handleBtnClick(item)">{{
- item.name
- }}
- </el-button>
+ <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="handleBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
<span v-if="tableHeadFindData.length > 0">
<el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
@@ -36,8 +36,8 @@
</el-select></span>
</div>
<div class="custom-table">
- <el-table class="cus-table" ref="dataTable" v-loading="isLoading" :data="tableData"
- :height="tableHeight" border
+ <el-table ref="dataTable" v-loading="isLoading" :data="tableData" :height="tableHeight"
+ border class="cus-table"
@select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
@select-all="handleSelectionAll" @selection-change="handleSelectionChange"
@sort-change="sortChange">
@@ -45,24 +45,27 @@
<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">
+ <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" 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">
+ <el-table-column v-for="(item, index) in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden"
+ key="index" :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' && Object.keys(item.referConfig).length <= 0"
+ <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"
:key="item.id"
:formatter="item.formatter"
:label="item.label" :prop="item.prop"
@@ -72,9 +75,11 @@
align="center">
</el-table-column>
<!-- 鍙傜収鏁版嵁-->
- <el-table-column v-for="(item,index) in referArray" :key="index" v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden" :label="item.title" prop="jiliangdw"
- :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
- align="center">
+ <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>
@@ -107,10 +112,10 @@
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
-<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
+ <!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
<!-- 鏁版嵁璇︽儏-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :rowOid="this.LinkObject.oid" :templateOid="templateOid"
+ :rowOid="this.LinkObject.oid" :templateOid="templateOid"
:title="'鏁版嵁璇︽儏'"
:visible.sync="LinkVisible"
type="detail"></FormTemplateDialog>
@@ -142,7 +147,8 @@
:visible.sync="dialogPush"></MasterTransfer>
<!-- 瀵煎叆-->
<BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
- :visible.sync="batchImportData.visible" :tableHeadData="tableHeadFindData" :selectRow="selectRow">
+ :selectRow="selectRow" :tableHeadData="tableHeadFindData"
+ :visible.sync="batchImportData.visible">
</BatchImport>
<!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
@@ -247,26 +253,26 @@
Treedata: {
type: Array
},
- nodeClickList:{
- type:Array,
- default:[]
+ nodeClickList: {
+ type: Array,
+ default: []
}
},
data() {
return {
//鎵归噺缂栬緫瀵硅瘽妗�
- bulkeditvisible:false,
+ bulkeditvisible: false,
LinkVisible: false,
LinkObject: {}, // 缂栫爜鏁版嵁
LinkList: [],
isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
CodeArray: [],
//鐢熷懡鍛ㄦ湡鏁扮粍
- lcstatusArray:[],
+ lcstatusArray: [],
//鍙傜収鏁版嵁鏁扮粍
- referArray:[],
- islcstatusPushed:false,
- isReferPushed:false,
+ referArray: [],
+ islcstatusPushed: false,
+ isReferPushed: false,
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
@@ -305,8 +311,8 @@
label: "name",
},
tableHeadFindDatas: [],
- applyvisible:false,
- amendvisible:false,
+ applyvisible: false,
+ amendvisible: false,
addvisible: false,
editvisible: false,
findvisible: false,
@@ -354,7 +360,7 @@
height: 110
},
result: '',
- elapsedTime:'',
+ elapsedTime: '',
};
},
computed: {
@@ -441,16 +447,16 @@
// console.log('lcstatusArray', this.lcstatusArray);
this.islcstatusPushed = true;
}
- if(!this.isReferPushed){
+ if (!this.isReferPushed) {
if (newval.find(item => Object.keys(item.referConfig).length > 0)) {
this.referArray.push(newval.find(item => Object.keys(item.referConfig).length > 0));
- }else {
+ } else {
this.referArray.push([])
}
}
- this.isReferPushed=true;
- console.log('new',this.referArray)
- console.log('ss',newval.find(item => Object.keys(item.referConfig).length > 0))
+ this.isReferPushed = true;
+ console.log('new', this.referArray)
+ console.log('ss', newval.find(item => Object.keys(item.referConfig).length > 0))
this.WupinFindValue = ''
},
},
@@ -467,7 +473,7 @@
},
tableHeadBtnData: {
handler(newval) {
- this.masterVrBtnList = newval
+ this.masterVrBtnList = newval
},
deep: true
},
@@ -549,14 +555,14 @@
});
},
//鏍囧噯鐢宠
- codeApplyHandler(){
+ codeApplyHandler() {
this.$nextTick(() => {
this.applyvisible = true;
});
},
- applySumbit(val){
+ applySumbit(val) {
// console.log('val',val)
- if(func.notEmpty(val.ts)) {
+ if (func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
}
@@ -568,7 +574,7 @@
})
})
},
- amendSumbit(val){
+ amendSumbit(val) {
applySaveCode(val).then(res => {
this.$nextTick(() => {
this.amendvisible = false;
@@ -579,24 +585,22 @@
},
//鏍囧噯淇
- codeAMENDHandler(){
+ codeAMENDHandler() {
if (this.selectRow.length !== 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus !== "Editing") {
- this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
} else {
this.amendvisible = true;
this.rowOid = this.selectRow[0].oid;
}
},
//鎵归噺缂栬緫
- bulkEditHandler(type){
+ bulkEditHandler(type) {
console.log(this.nodeClickList)
- if(this.nodeClickList.children.length >= 1){
+ if (this.nodeClickList.children.length >= 1) {
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- if(this.selectRow.length <= 0){
+ if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒')
return;
}
@@ -610,7 +614,7 @@
this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
}
},
- addSaveHandler(){
+ addSaveHandler() {
this.$nextTick(() => {
this.addvisible = true;
});
@@ -975,7 +979,7 @@
//澧炲姞淇濆瓨
AddSumbit(val) {
// console.log('val',val)
- if(func.notEmpty(val.ts)) {
+ if (func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
}
@@ -1039,8 +1043,9 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px)!important;
+ height: calc(100vh - 370px) !important;
}
+
// 婊氬姩鏉℃牱寮忎慨鏀�
// 婊氬姩鏉＄殑瀹藉害
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
@@ -1050,6 +1055,7 @@
width: 10px;
}
+
// 婊氬姩鏉＄殑婊戝潡
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #ececec;
@@ -1082,7 +1088,7 @@
margin-top: 10px;
}
- .el-table__body-wrapper{
+.el-table__body-wrapper {
height: calc(100% - 44px) !important;
}
</style>
--
Gitblit v1.9.3