From 2f1d2636adbd763d729c5836aa720fe8844ba9f3 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期五, 14 七月 2023 18:01:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 526a329..c04a197 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -625,19 +625,21 @@
// 鍚堝苟涓や釜琛ㄥ崟
this.form = Object.assign(addFrom,this.form);
// console.log("endFilter",this.form.type);
- //console.log(this.form);
+ // console.log(this.form);
},
},{
- label: '鏄惁寮�鍚寔涔呭寲',
+ label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
prop: 'isPersistence',
+ labelWidth: '142',
tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
tipPlacement: 'bottom',
span: 6,
type: 'switch',
},{
display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '缂栧彿',
+ label: '鍙傜収閰嶇疆缂栧彿',
prop: 'id',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
rules: [{
required: true,
message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
@@ -646,8 +648,9 @@
span: 6,
},{
display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '鍚嶇О',
+ label: '鍙傜収閰嶇疆鍚嶇О',
prop: 'name',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
rules: [{
required: true,
message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
@@ -892,7 +895,7 @@
},
},
mounted() {
- // 楹荤殑杩欎釜鍦版柟璋冩鎴戜簡
+ // 浜嬩欢鐩戝惉锛屽疄鐜拌〃鏍艰缂栬緫鐐瑰嚮琛ㄦ牸鍖哄煙澶栧唴瀹规椂閫�鍑虹紪杈戠姸鎬�
this.element = document.getElementById('refer-config-form');
this.element.addEventListener("click", (e) => {
//<table cellspacing="0" cellpadding="0" border="0" class="el-table__body" style="width: 911px;">
@@ -1186,7 +1189,7 @@
},
/** 鎺掑簭瀛楁銆佹樉绀虹殑灞炴�с�佹煡璇㈡潯浠剁殑琛ㄦ牸琛岄�夋嫨涔嬪悗鍥炴樉 */
echoSelectedAttr(data){
- console.log(data);
+ // console.log(data);
// 涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�
if(data.condition === 'sortField'){
this.form.sortField = data.selectedArrary[0].id;
@@ -1205,15 +1208,18 @@
}else{
// 閫夋嫨鏄剧ず瀛楁
data.selectedArrary.forEach(item => {
+ console.log(item);
this.codeShowFieldConfigVOS.push(
{
field: item.id,
- title: item.id,
- fieldType: item.attrType,
- fieldTypeText: item.attrTypeText,
+ title: item.name,
+ // fieldType: item.attrType,
+ // fieldTypeText: item.attrTypeText,
+ fieldType: 'text',
+ fieldTypeText: '鏂囨湰妗�',
sort: false,
attrSortField: item.id,
- width: item.attrLength,
+ width: item.attributeLength,
isquery: false,
$cellEdit: false
}
--
Gitblit v1.9.3