From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 562cc1c..1f91490 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="height: 720px">
<div>
<!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
</el-button>
@@ -27,7 +27,7 @@
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)"
@click="handelBtnClick(item)">{{
@@ -37,8 +37,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" style=""
+ @cell-click="handleCellClick" @row-click="handleRowClick" @selection="handleSelection" @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>
@@ -68,7 +68,7 @@
@save="handelTransferSave"></integration-transfer>
<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 +76,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>
@@ -210,12 +211,13 @@
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
fileOptions:{
- ownbizOid:"1",
- ownbizBtm:"1",
+ ownbizOid:"0",
+ ownbizBtm:"0",
fileDocClassify:'!=processAuditSuggest',
fileDocClassifyName:'',
hasDownload:true,
- hasUpload:true
+ hasUpload:true,
+ height:100
}
};
},
@@ -273,7 +275,7 @@
templateOid: {
handler(newval, oldval) {
this.parameter.code = newval;
- this.fileOptions.ownbizOid="1";
+ this.fileOptions.ownbizOid="0";
this.parameter.vars.templateOid = newval
},
deep: true,
@@ -309,6 +311,7 @@
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
+ if (uniqueFlag === 'batchApplyCode') return this.openBatchImport('batchApplyCode')
// 鎵归噺鐢宠缂栫爜
// if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode')
if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler()
@@ -361,6 +364,7 @@
handleRowClick(row,column){
this.fileOptions.ownbizOid= row.oid;
this.fileOptions.ownbizBtm=row.btmname;
+ this.$refs.crud.toggleRowSelection(row);
},
//鍒犻櫎
enumDeleteRow(row) {
@@ -441,10 +445,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;
});
},
//澶氶��
@@ -518,21 +522,32 @@
console.log(val)
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=>{
- console.log(res)
- this.onLoad()
+ editSaveCode(val).then(res=>{
+ console.log(res)
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
openBatchImport(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ },
+ handleCollapse(activeNames){
+ if(activeNames.length>0){
+
+ }else{
+
+ }
}
},
};
--
Gitblit v1.9.3