From 2cffeb30840020af3654f74ea700ec94dc82024c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 28 六月 2023 13:19:46 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 6a91563..526a329 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -264,7 +264,7 @@
isPersistence: true, // 鏄惁鎸佷箙鍖�
id: '',
name: '',
- // 鏌ヨ鏉′欢鍒楄〃
+ // 鏌ヨ鏉′欢鍒楄〃
// limit: '15',
// sortField: '',
// sortType: 'asc',
@@ -413,21 +413,21 @@
type: "select",
cell: true,
clearable: false,
- dicData: [{
- value: 'like', label: '鍖呭惈'
- }, {
- value: '=', label: '绛変簬'
- }, {
- value: '>', label: '澶т簬'
- }, {
- value: '<', label: '灏忎簬'
- }, {
- value: '!=', label: '涓嶇瓑浜�'
- }, {
- value: '>=', label: '澶т簬绛変簬'
- }, {
- value: '<=', label: '灏忎簬绛変簬'
- }]
+ dicData: [
+ {
+ value: '_like', label: '鍖呭惈'
+ },{
+ value: "_notlike", label: "涓嶅寘鍚�",
+ }, {
+ value: 'equal', label: '绛変簬'
+ }, {
+ value: '_notequal', label: '涓嶇瓑浜�'
+ }, {
+ value: '_ge', label: '澶т簬'
+ }, {
+ value: '_le', label: '灏忎簬'
+ }
+ ]
},{
label: "绛涢�夊��",
prop: "filterValue",
@@ -594,7 +594,7 @@
this.isDisabledTabs = false;
} else if(value == 'default' || value == 'grid'){
addFrom = {
- limit: '15',
+ limit: 15,
sortField: '',
sortType: 'asc',
};
@@ -640,7 +640,7 @@
prop: 'id',
rules: [{
required: true,
- message: "(寮�濮嬫寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
+ message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
trigger: "blur",
}],
span: 6,
@@ -650,7 +650,7 @@
prop: 'name',
rules: [{
required: true,
- message: "(寮�濮嬫寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
+ message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
trigger: "blur",
}],
span: 6,
@@ -769,7 +769,7 @@
prop: 'limit',
span: 8,
tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
- //value: 15,
+ value: 15,
tipPlacement: 'right',
},{
label: '鎺掑簭瀛楁',
@@ -955,6 +955,8 @@
this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
}
return;
+ }else {
+ this.onloadAttrData()
}
if(func.notEmpty(val.referType)){
this.form.referTypeName = val.referTypeName;
@@ -1179,8 +1181,8 @@
/** 涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content){
// 瀹炵幇鍥炴樉
- this.form.referTypeName = content.name;
- this.form.referType = content.id;
+ this.form.referTypeName = content.name || content.id;
+ this.form.referType = content.id || '';
},
/** 鎺掑簭瀛楁銆佹樉绀虹殑灞炴�с�佹煡璇㈡潯浠剁殑琛ㄦ牸琛岄�夋嫨涔嬪悗鍥炴樉 */
echoSelectedAttr(data){
@@ -1193,7 +1195,7 @@
this.form.codeSrchCondConfigVOS.push(
{
filterField: item.id,
- filterType: '=',
+ filterType: 'equal',
filterTypeText: item.name,
filterValue: '',
$cellEdit: false
--
Gitblit v1.9.3