From 930766d03537d803cea4bf468ab2abc44ff42645 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 19 七月 2023 14:51:29 +0800
Subject: [PATCH] 1、主要解决 mybatis返回map时value值为null，属性和value都不显示问题
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 191 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 153 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index dda1009..1290ecb 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox">
+ <div class="testbox" style="">
<div>
<!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
</el-button>
@@ -27,9 +27,10 @@
style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
</div>
- <el-row style="height: 700px; width: 100%">
+ <el-row style="width: 100%;margin-bottom: 20px">
<div>
- <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
+ <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
+ v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
@click="handelBtnClick(item)">{{
item.name
}}
@@ -37,8 +38,8 @@
<el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
</div>
- <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
- @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" :height="tableHeight" ref="dataTable"
+ @cell-click="handleCellClick" @row-click="handleRowClick" @select="handleSelection" @select-all="handleSelectionAll" @selection-change="handleSelectionChange" @sort-change="sortChange">
<el-table-column fixed type="selection" width="55"></el-table-column>
<el-table-column fixed label="搴忓彿" type="index" width="55">
</el-table-column>
@@ -50,25 +51,36 @@
</el-table-column>
</el-table>
</el-row>
+<!-- 鏂板-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
@submit="AddSumbit">
</FormTemplateDialog>
+<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
+<!-- 宸插彂甯冩暟鎹慨鏀�-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'"
:type="edit"
:visible.sync="DataVisible"></FormTemplateDialog>
- <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
+<!-- 鍙戝竷-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow" :title="title"></set-personnel>
+<!-- 鍋滅敤-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleDeactivate" :title="title"></set-personnel>
+<!-- 鍚敤-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleEnable" :title="title"></set-personnel>
+<!-- 鍥炴敹-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleRecovery" :title="title"></set-personnel>
+<!-- 楂樼骇鏌ヨ-->
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
- <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
- @save="handelTransferSave"></integration-transfer>
+<!-- 瀵煎嚭-->
+ <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData" :codeClassifyOid="codeClassifyOid" :tableData="tableData"></MasterTransfer>
+<!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
- </div>
<div class="block" style="display: flex; justify-content: flex-end">
<el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
:total="page.total" layout="total, sizes, prev, pager, next, jumper"
@@ -76,11 +88,12 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
+ </div>
<BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
</BatchImport>
</div>
<div class="bottom">
- <el-collapse v-model="visibleNames">
+ <el-collapse v-model="visibleNames" @change="handleCollapse">
<el-collapse-item title="闄勪欢鍒楄〃" name="1">
<fileInHtml :options="fileOptions"></fileInHtml>
</el-collapse-item>
@@ -158,7 +171,8 @@
parameter: {
ids: [],
code: "",
- type: "PUBLIC",
+ type: '',
+ // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
template: "",
vars: {
codeClassifyOid: "",
@@ -166,7 +180,15 @@
}
},
visibleNames:[],
+ //鍙戝竷
visibleFlow: false,
+ //鍋滅敤
+ visibleDeactivate:false,
+ //鍚敤
+ visibleEnable:false,
+ //鍥炴敹
+ visibleRecovery:false,
+ title:'',
transferData: [],
transferProps: {
key: "oid",
@@ -196,6 +218,7 @@
datetime: "datetime",
},
tableData: [],
+ tableHeight:'calc(100vh - 330px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -210,12 +233,13 @@
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
fileOptions:{
- ownbizOid:"1",
- ownbizBtm:"1",
+ ownbizOid:"0",
+ ownbizBtm:"0",
fileDocClassify:'!=processAuditSuggest',
fileDocClassifyName:'',
hasDownload:true,
- hasUpload:true
+ hasUpload:true,
+ height:100
}
};
},
@@ -273,7 +297,7 @@
templateOid: {
handler(newval, oldval) {
this.parameter.code = newval;
- this.fileOptions.ownbizOid="1";
+ this.fileOptions.ownbizOid="0";
this.parameter.vars.templateOid = newval
},
deep: true,
@@ -288,14 +312,14 @@
}
},
methods: {
- // 鍙戝竷
- setHandler() {
- if (this.selectRow.length <= 0) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //灞曞紑闄勪欢
+ handleCollapse(activeNames) {
+ if (activeNames.length > 0) {
+ this.tableHeight = 'calc(100vh - 630px)';
+ this.$refs.dataTable.doLayout()
} else {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
- this.visibleFlow = true;
+ this.tableHeight = 'calc(100vh - 330px)';
+ this.$refs.dataTable.doLayout()
}
},
openVis(visible) {
@@ -314,9 +338,14 @@
// if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode')
if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler()
if (uniqueFlag === 'CODEUPREVISION') return this.DataChange()
- if (uniqueFlag === 'CODERECYCLE') return this.huishouHandler()
if (uniqueFlag === 'CODEEXPORT') return this.openD()
if (uniqueFlag === 'CODEQUERY') return this.findHandler()
+ //鍋滅敤
+ if (uniqueFlag === 'CODEDISABLE') return this.Deactivate()
+ //鍚敤
+ if (uniqueFlag === 'CODEENABLE') return this.Enable()
+ //鍥炴敹
+ if (uniqueFlag === 'CODERECYCLE') return this.Recovery()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
@@ -325,6 +354,7 @@
this.getListCodeByClassId();
},
async getListCodeByClassId() {
+ this.dialogPush=true;
this.transferData = [];
const response = await listCodeAttributeByClassId({
codeClassifyId: this.codeClassifyOid,
@@ -334,9 +364,80 @@
this.transferData = data;
}
},
+ handelTransferSave(val){
+ console.log('鍙戝竷',val)
+ },
rend() {
this.tableData = this.tableHeadData;
},
+ // 鍙戝竷
+ setHandler() {
+ // let EditFlag1=false
+ // let EditFlag2=false
+ // if(EditFlag1){
+ // this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ // }else if(EditFlag2){
+ // this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ // }
+ this.selectRow.forEach(item=>{
+ if(this.selectRow.length === 1 && item.lcstatus !== "Editing"){
+ this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ }else if(item.lcstatus !== 'Editing'){
+ this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ }else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='PUBLIC'
+ this.title='娴佺▼瀹℃壒'
+ this.visibleFlow = true;
+ }
+ })
+ // if (this.selectRow.length <= 0) {
+ // this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // } else {
+ // this.userName = localStorage.getItem("username");
+ // this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ // this.parameter.type='PUBLIC'
+ // this.title='娴佺▼瀹℃壒'
+ // this.visibleFlow = true;
+ // }
+ },
+ //鍋滅敤
+ Deactivate(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='DISABLE'
+ this.title='鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
+ this.visibleDeactivate=true;
+ }
+ },
+ //鍚敤
+ Enable(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='ENABLE'
+ this.title='鍚敤锛堣В鍐伙級缂栫爜鏁版嵁'
+ this.visibleEnable=true;
+ }
+ },
+ //鍥炴敹
+ Recovery(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='ROLLBACK'
+ this.title='鍥炴敹缂栫爜鏁版嵁'
+ this.visibleRecovery=true;
+ }
+ },
handleSizeChange(val) {
this.isLoading = true;
setTimeout(() => {
@@ -359,9 +460,10 @@
this.editShow = column.property;
this.rowOid = row.oid;
},
- handleRowClick(row,column){
- this.fileOptions.ownbizOid= row.oid;
- this.fileOptions.ownbizBtm=row.btmname;
+ handleRowClick(row, column) {
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+ this.$refs.dataTable.toggleRowSelection(row);
},
//鍒犻櫎
enumDeleteRow(row) {
@@ -442,10 +544,10 @@
await TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
- page: val.currentPage,
- limit: val.pageSize,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
}).then((res) => {
- this.data = res.data.data;
+ this.tableData = res.data.data;
});
},
//澶氶��
@@ -457,9 +559,15 @@
});
},
//閫夋嫨
- handleSelection(list,row) {
- this.fileOptions.ownbizOid= row.oid;
- this.fileOptions.ownbizBtm=row.btmname;
+ handleSelection(list, row) {
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+
+ },
+ //閫夋嫨鍏ㄩ儴
+ handleSelectionAll() {
+ this.fileOptions.ownbizOid = '0';
+ this.fileOptions.ownbizBtm = '0';
},
//缂栬緫
@@ -517,17 +625,21 @@
AddSumbit(val) {
this.addvisible = false;
console.log(val)
- addSaveCode(val).then(res=>{
+ addSaveCode(val).then(res => {
console.log(res)
- this.onLoad()
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
EditSumbit(val) {
this.editvisible = false;
console.log(val)
- editSaveCode(val).then(res=>{
+ editSaveCode(val).then(res => {
console.log(res)
- this.onLoad()
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
openBatchImport(type) {
@@ -535,7 +647,7 @@
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
}
- },
+ }
};
</script>
@@ -567,7 +679,10 @@
.bottom {
margin-top: 20px;
- max-height: 43%;
overflow-y: scroll;
}
+
+.el-collapse-item__content{
+ padding-bottom: 0;
+}
</style>
--
Gitblit v1.10.0