From c14fedd8903487457ad0911e8afab47670be754e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 22:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index ed137cd..33b81c4 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -5,7 +5,7 @@
<div class="testbox" style="">
<div>
</div>
- <el-row style="width: 100%;margin-bottom: 20px">
+ <el-row style="width: 100%;margin-bottom: 10px">
<div>
<el-button v-for="(item, index) in masterVrBtnList"
v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
@@ -116,7 +116,7 @@
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode} from "@/api/GetItem";
+import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode,receiveEditApply} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
@@ -373,7 +373,6 @@
limit: this.page.pageSize,
'conditionMap[lcstatus]': lcstatus
}).then(res => {
- console.log(res)
this.tableData = res.data.data
})
},
@@ -412,9 +411,47 @@
if (uniqueFlag === 'CODERECYCLE') return this.Recovery()
//鍒犻櫎
if (uniqueFlag === 'CODEDELETE') return this.enumDeleteRow()
+ //鐢宠闆嗗洟鐮佹暟鎹�
+ if (uniqueFlag === 'applyGroupCode') return this.applyGroupCode()
+ //鏇存柊闆嗗洟鐮佹暟鎹�
+ if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
+ },
+ //鐢宠闆嗗洟鐮佹暟鎹�
+ applyGroupCode(){
+ if(this.selectRow.length <= 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
+ }else {
+ // const requestData = this.selectRow.forEach(item => {
+ // return { oids: item.oid, btmName: item.btmname };
+ // });
+ const oids = this.selectRow.map(item => item.oid).join(',');
+ applyGroupCode({ oids, btmName: this.selectRow[0].btmname }).then(res=>{
+ if(res.data.code==200){
+ this.$message.success('鐢宠鎴愬姛')
+ }
+ this.onLoad()
+ })
+ }
+ },
+ //鏇存柊闆嗗洟鐮佹暟鎹�
+ receiveEditApply(){
+ if(this.selectRow.length <= 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
+ }else {
+ // const requestData = this.selectRow.forEach(item => {
+ // return { oids: item.oid, btmName: item.btmname };
+ // });
+ const oids = this.selectRow.map(item => item.oid).join(',');
+ receiveEditApply({ oids, btmName: this.selectRow[0].btmname }).then(res => {
+ if(res.data.code==200){
+ this.$message.success('鏇存柊鎴愬姛')
+ this.onLoad()
+ }
+ });
+ }
},
openD() {
this.getListCodeByClassId();
@@ -429,9 +466,6 @@
const data = response.data.data;
this.transferData = data;
}
- },
- handelTransferSave(val) {
- console.log('鍙戝竷', val)
},
rend() {
this.tableData = this.tableHeadData;
@@ -599,7 +633,6 @@
list.push(item.oid)
})
deleteCode({codeClassifyOid: this.codeClassifyOid, oidList: list}).then(res => {
- console.log(res)
if (res.data.code === 200) {
this.$message({
type: 'success',
@@ -790,9 +823,7 @@
this.DataVisible = false;
val.copyFromVersion = this.rowOid;
val.oid = '';
- console.log(val)
upSaveCode(val).then(res => {
- console.log(res)
this.$nextTick(() => {
this.$message.warning("淇濆瓨鎴愬姛");
this.onLoad()
--
Gitblit v1.9.3