From a65124cad50e73f73733fc53e01c6d0e42c832c4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 23 十月 2024 17:49:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
index 320ee99..ef4e680 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
@@ -284,7 +284,8 @@
<el-col :span="24">
<el-form-item label="鏌ヨ妯℃澘">
<el-select v-model="form.itemQtName" placeholder="璇烽�夋嫨鏌ヨ妯℃澘" size="mini">
- <el-option v-for="(item,index) in searchQtNameList" :key="index" :label="item.qtName" :value="item.qtName"></el-option>
+ <el-option v-for="(item,index) in searchQtNameList" :key="index" :label="item.qtName"
+ :value="item.qtName"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -344,7 +345,7 @@
},
data() {
return {
- searchQtNameList:[],
+ searchQtNameList: [],
formLoading: false,
itemImgHeight: '',
itemImgWidth: '',
@@ -509,7 +510,7 @@
},
// 鏌ヨ妯℃澘涓嬫媺鎺ュ彛鏌ヨ
- getSearchSelectList(){
+ getSearchSelectList() {
getObjTypeQTs({btName: this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name}).then(res => {
this.searchQtNameList = res.data.data;
})
@@ -604,6 +605,18 @@
this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�');
return;
}
+
+
+ const onlyFlag = this.form.itemOutFieldList.some(item => item.id === this.showLabelLeftRow.id);
+
+ if (onlyFlag) {
+ this.$message.error('璇锋鏌ユ槸鍚︽湁閲嶅椤�');
+ this.form.itemSelectOutFieldList = this.form.itemSelectOutFieldList.filter(selectItem =>
+ !this.form.itemOutFieldList.some(outItem => outItem.id === selectItem.id)
+ )
+ return;
+ }
+
this.form.itemOutFieldList.push(this.showLabelLeftRow);
this.form.itemSearchFieldList = this.form.itemOutFieldList;
@@ -679,7 +692,7 @@
// 鏌ヨ妯℃澘娣诲姞
searchAddClickHandler() {
- if(!this.form.searchLabel){
+ if (!this.form.searchLabel) {
this.$message.error('鏌ヨ瀛楁涓嶈兘涓虹┖!');
return;
}
--
Gitblit v1.9.3