From e13278606d3facef443c5c65e07b42c52c7a38d5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 22 十一月 2023 17:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index af69b6f..5025b4b 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -62,7 +62,7 @@
</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'"
+ <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"
@@ -71,7 +71,14 @@
:width="item.width"
align="center">
</el-table-column>
-
+ <!-- 鍙傜収鏁版嵁-->
+ <el-table-column v-for="(item,index) in referArray" key="index" v-if="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">
+ <template slot-scope="scope">
+ <span>{{ scope.row.jiliangdwname }}</span>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-row>
@@ -100,7 +107,7 @@
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
- <FormBulkEdit :visible.sync="bulkeditvisible"></FormBulkEdit>
+<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
<!-- 鏁版嵁璇︽儏-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:rowOid="this.LinkObject.oid" :templateOid="templateOid"
@@ -133,6 +140,10 @@
:tableData="tableData"
:tableHeadData="tableHeadFindData" :templateOid="templateOid"
:visible.sync="dialogPush"></MasterTransfer>
+ <!-- 瀵煎叆-->
+ <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
+ :visible.sync="batchImportData.visible" :tableHeadData="tableHeadFindData" :selectRow="selectRow">
+ </BatchImport>
<!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
@@ -144,12 +155,6 @@
</el-pagination>
</div>
</div>
- </div>
- <div>
-<!-- 瀵煎叆-->
- <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
- :visible.sync="batchImportData.visible">
- </BatchImport>
</div>
<div class="bottom">
<el-collapse v-model="visibleNames" @change="handleCollapse">
@@ -179,6 +184,7 @@
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
+import MasterEditBulk from '@/components/Master/MasterEditBulk'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
@@ -191,6 +197,7 @@
ResembleQueryDialog,
BatchImport,
fileInHtml,
+ MasterEditBulk
},
name: "Crud.vue",
props: {
@@ -239,7 +246,10 @@
Treedata: {
type: Array
},
-
+ nodeClickList:{
+ type:Array,
+ default:[]
+ }
},
data() {
return {
@@ -250,8 +260,12 @@
LinkList: [],
isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
CodeArray: [],
+ //鐢熷懡鍛ㄦ湡鏁扮粍
lcstatusArray:[],
+ //鍙傜収鏁版嵁鏁扮粍
+ referArray:[],
islcstatusPushed:false,
+ isReferPushed:false,
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
@@ -426,7 +440,16 @@
// console.log('lcstatusArray', this.lcstatusArray);
this.islcstatusPushed = true;
}
- // console.log('new',newval)
+ 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 {
+ this.referArray.push([])
+ }
+ }
+ this.isReferPushed=true;
+ console.log('new',this.referArray)
+ console.log('ss',newval.find(item => Object.keys(item.referConfig).length > 0))
this.WupinFindValue = ''
},
},
@@ -521,7 +544,7 @@
// 鏍囧噯淇
if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
//鎵归噺缂栬緫
- if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler()
+ if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler("bulkEdit")
});
},
//鏍囧噯鐢宠
@@ -548,7 +571,12 @@
}
},
//鎵归噺缂栬緫
- bulkEditHandler(){
+ bulkEditHandler(type){
+ console.log(this.nodeClickList)
+ if(this.nodeClickList.children.length >= 1){
+ this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
+ return;
+ }
if(this.selectRow.length <= 0){
this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒')
return;
@@ -556,7 +584,9 @@
const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
if (Editing) {
- this.bulkeditvisible = true;
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
} else {
this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
}
@@ -574,6 +604,7 @@
// 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) {
--
Gitblit v1.9.3