From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 15 六月 2023 18:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/code/code.vue | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9016174..ddbcfbf 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1173,7 +1173,6 @@
refreshParentClassifyDataChange() {
this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage, this.parentClsfyParams.parentClassifyQuery);
},
- // TODO:寰呬慨鏀�
parentClassifyOnLoad(page, params = {}) {
let parentClsParam = this.parentClsfyParams;
parentClsParam.classifyDialogLoading = true;
@@ -1204,22 +1203,25 @@
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
//console.log(this.currentSelectTreeData);
- attrParam.selectAttrOptionLoading = true;
+ this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if(attrParam.selectAttrQeury){
Object.keys(attrParam.selectAttrQeury).forEach(key=>{
- conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key];
+ conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key].trim();
});
}
conditionMaps['conditionMap[codeClassifyOid]'] = this.currentSelectTreeData.oid;
conditionMaps['conditionMap[btmTypeOid]'] = this.currentSelectTreeData.btmTypeOid;
listClassifyLinkAttr(conditionMaps).then(res=>{
- //console.log(res.data.data);
- attrParam.selectAttrData = res.data.data;
- attrParam.selectAttrOptionLoading = false;
+ const data = res.data;
this.$nextTick(() => {
- this.$refs[attrParam.ref].doLayout()
+ this.$refs[attrParam.ref].doLayout()
});
+ //console.log(data.data);
+ this.selectAttrParams.selectAttrData = data.data;
+ this.selectAttrParams.selectAttrOptionLoading = false;
+ // 灏嗘悳绱㈡鍐呭缃┖
+ this.selectAttrParams.selectAttrQeury = {};
})
},
// 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
@@ -1727,7 +1729,7 @@
return false;
}
}else if(this.form.secType==='codeserialsec'){
- console.log(form.codeFillType);
+ //console.log(form.codeFillType);
//娴佹按鐮佹
if(form.codeSecLength == ''){
this.$message.warning('(鐮佹鐨勯暱搴�)'+tipsMsg);
@@ -1899,7 +1901,7 @@
//瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
this.currentCodeRuleOid = row.oid;
this.currentRuleLcStatus = row.lcStatus;
- this.sendGridCodeBasicSec({"pkCodeRule_equal":row.oid},false);
+ this.sendGridCodeBasicSec({"pkCodeRule":row.oid},false);
},
// 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
@@ -1910,11 +1912,11 @@
let conditionMaps = {};
if(condition && !isAdancedQuery){
Object.keys(condition).forEach(key=>{
- conditionMaps['conditionMap[t.'+key+']'] = condition[key];
+ conditionMaps['conditionMap[pl_code_basicsec.'+key+']'] = condition[key].trim();
});
}
if(isAdancedQuery){
- condition['conditionMap[t.pkCodeRule_equal]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
+ condition['conditionMap[pl_code_basicsec.pkCodeRule]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
? this.selectionList[0].oid:this.currentCodeRuleOid;
}
gridCodeBasicSec(1, -1,isAdancedQuery ? condition:conditionMaps).then(res => {
@@ -1945,11 +1947,11 @@
},
basicSearchChange(params, done){
//console.log(this.$refs.crudBasic);
- this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid}),false);
+ this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}),false);
done();
},
basicSearchReset(){
- this.sendGridCodeBasicSec({"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid},false);
+ this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
},
// 涓婄Щ涓嬬Щ鍩虹鐮佹
upOrderNum(row){
@@ -2055,7 +2057,7 @@
fieldType: 'combox',
queryField: 'lcStatus',
comboxKey: 'codeSearchLCStatus',
- }
+ },
]
}else {
this.advancedQueryParam.options = [
@@ -2063,22 +2065,22 @@
data: [],
title: '鐮佹缂栧彿',
fieldType: 'text',
- queryField: 't.id',
+ queryField: 'pl_code_basicsec.id',
},{
data: [],
title: '鐮佹鍚嶇О',
fieldType: 'text',
- queryField: 't.name',
+ queryField: 'pl_code_basicsec.name',
},{
data: [],
title: '鎻忚堪',
fieldType: 'text',
- queryField: 't.description',
+ queryField: 'pl_code_basicsec.description',
},{
data: [],
title: '鐮佹绫诲瀷',
fieldType: 'combox',
- queryField: 't.secType',
+ queryField: 'pl_code_basicsec.secType',
comboxKey: 'codeSecType',
}
]
@@ -2355,11 +2357,13 @@
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+ let requestData = {};
if(params){
Object.keys(params).forEach(key=>{
- this.query['conditionMap['+key+'_like]'] = params[key];
+ requestData["conditionMap"+'['+key+']'] = params[key].trim();
});
}
+ this.query = requestData;
this.onLoad(this.page);
done();
},
@@ -2612,7 +2616,7 @@
//鍙彉鐮佹
this.form = Object.assign({}, this.form,{
codeSecLength: row!=null&&row.codeSecLength != '' ? row.codeSecLength:'', //鐮佹鐨勯暱搴�
- codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_right', //缂栫爜閮ㄤ綅鏂瑰紡锛屾灇涓炬煡璇�
+ codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_left', //缂栫爜閮ㄤ綅鏂瑰紡锛屾灇涓炬煡璇�
codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //閫変腑鐨勮ˉ浣嶆椂鐨勫瓧绗︾殑涓嬫爣
codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:'', //琛ヤ綅鏃剁殑瀛楃锛屽彲杈撳彲閫夋煡璇�
});
--
Gitblit v1.9.3