From 875779f6e1ef1416cf5d62134489d546ab59de2a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 24 十一月 2023 13:43:02 +0800
Subject: [PATCH] 集成校验关键属性重复，并记录编号关键属性
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index cb2027c..483d080 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="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">
+ <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>
<!-- 鎵归噺缂栬緫-->
- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>
+<!-- <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>
@@ -145,12 +156,6 @@
</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">
<el-collapse-item name="1" title="闄勪欢鍒楄〃">
@@ -171,7 +176,8 @@
deleteCode,
upSaveCode,
applyGroupCode,
- receiveEditApply
+ receiveEditApply,
+ applySaveCode
} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
@@ -241,7 +247,10 @@
Treedata: {
type: Array
},
-
+ nodeClickList:{
+ type:Array,
+ default:[]
+ }
},
data() {
return {
@@ -252,8 +261,12 @@
LinkList: [],
isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
CodeArray: [],
+ //鐢熷懡鍛ㄦ湡鏁扮粍
lcstatusArray:[],
+ //鍙傜収鏁版嵁鏁扮粍
+ referArray:[],
islcstatusPushed:false,
+ isReferPushed:false,
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
@@ -428,7 +441,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 = ''
},
},
@@ -523,7 +545,7 @@
// 鏍囧噯淇
if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
//鎵归噺缂栬緫
- if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler()
+ if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler("bulkEdit")
});
},
//鏍囧噯鐢宠
@@ -532,10 +554,28 @@
this.applyvisible = true;
});
},
- applySumbit(){
-
+ applySumbit(val){
+ // console.log('val',val)
+ if(func.notEmpty(val.ts)) {
+ val.ts = func.formattedDateTime(val.ts);
+ //console.log(val.ts);
+ }
+ applySaveCode(val).then(res => {
+ this.$nextTick(() => {
+ this.applyvisible = false;
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.onLoad()
+ })
+ })
},
- amendSumbit(){
+ amendSumbit(val){
+ applySaveCode(val).then(res => {
+ this.$nextTick(() => {
+ this.amendvisible = false;
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.onLoad()
+ })
+ })
},
//鏍囧噯淇
@@ -550,7 +590,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;
@@ -558,7 +603,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('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
}
@@ -576,6 +623,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.10.0