From 2f88385ea22a783661dc537551c204c00d309f63 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 16:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 11 +++++++++--
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 1 +
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 16 +++++++++-------
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index f21526d..5e5bcce 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -399,6 +399,7 @@
activeColor: "#13ce66",
inactiveColor: "#ff4949",
labelWidth:160,
+ value:1,
dicData: [{
label: '鍚�',
value: 0
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 88d4b0b..2aa34be 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -63,7 +63,7 @@
<el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
@focus="Keyfouce"></el-input>
</el-form-item>
- <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="150px">
+ <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px">
<el-switch
v-model="TreeAddform.codeKeyAttrValue"
active-text="鏄�"
@@ -597,8 +597,8 @@
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
btmTypeName: "",
- codeKeyAttrValue:false,
- isParticipateCheck:0
+ codeKeyAttrValue:true,
+ isParticipateCheck:1
},
rules: {
id: [
@@ -868,7 +868,7 @@
// switch
switchChange(){
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
- console.log(this.TreeAddform.isParticipateCheck)
+ // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1156,6 +1156,8 @@
TreeEscHandler() {
this.TreeAddform = {};
this.TreeAddFormVisible = false;
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
// 鍏抽棴寮圭獥娓呯┖鏍￠獙
this.$refs.myForm.clearValidate();
},
@@ -1174,8 +1176,8 @@
});
Object.keys(this.TreeAddform).forEach(key => {
this.TreeAddform[key] = "";
- this.TreeAddform.codeKeyAttrValue = false;
- this.TreeAddform.isParticipateCheck = 0;
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
});
this.getAttr();
this.TreeAddFormVisible = false;
@@ -1370,7 +1372,7 @@
}
this.TreeList = res3.data.data;
if(!this.TreeList.isParticipateCheck){
- this.$set(this.TreeList,"isParticipateCheck",0)
+ this.$set(this.TreeList,"isParticipateCheck",1)
return
}
} catch (error) {
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 29d0c62..023dbcb 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -886,7 +886,7 @@
:referConfig="this.referConfig || {}"
:display="true"
:value="form.customCodeSerialClass"
- :text="form.customCodeSerialClassText"
+ :text="form.customCodeSerialClass"
@setReferValue="setReferValue"
></vciWebRefer>
<!-- <el-input-->
@@ -1718,6 +1718,10 @@
//鑷畾涔夋祦姘村け鐒�
setReferValue(data){
console.log(data)
+ if(data.field){
+ this.form[data.field] = data.value || "";
+ // this.form[data.showField] = data.text || "";
+ }
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
escapeOwner() {
@@ -1777,7 +1781,7 @@
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
this.form.referConfig = submitFormJson || "";
- debugger;
+ // debugger;
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content) {
@@ -2797,6 +2801,7 @@
type: "success",
message: "鎿嶄綔鎴愬姛!",
});
+ console.log(this.form)
// 鍏抽棴瀵硅瘽妗�
this.addBasicCodeSettingBox = false;
// 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
@@ -3283,6 +3288,7 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
+ console.log(row)
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3303,6 +3309,7 @@
pkCodeRule: row != null ? row.pkCodeRule : this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
prefixCode: row != null ? row.prefixCode : this.form.prefixCode, //鍓嶇紑
suffixCode: row != null ? row.suffixCode : this.form.suffixCode, //鍚庣紑
+ // customCodeSerialClass: row != null ? row.customCodeSerialClass : this.form.customCodeSerialClass
};
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
--
Gitblit v1.9.3