From 20ace44c6d012839687a59058b6000079bdae55d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 20 十一月 2023 18:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index ad16980..4b0e705 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -886,14 +886,10 @@
:referConfig="this.referConfig || {}"
:display="true"
:value="form.customCodeSerialClass"
- :text="form.customCodeSerialClass"
+ :text="form.customCodeSerialClassText"
+ :serialType="form.serialType"
@setReferValue="setReferValue"
></vciWebRefer>
-<!-- <el-input-->
-<!-- v-model="form.customCodeSerialClass"-->
-<!-- :readonly="basicSecOnlyRead"-->
-<!-- @focus="streamFocusHandler"-->
-<!-- ></el-input>-->
</template>
@@ -1369,13 +1365,15 @@
title: '鑷畾涔夋祦姘村弬鐓�',
showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
- fieldMap: {},
+ fieldMap: {
+ serialType:"serialType"
+ },
placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
options: {
// 璁剧疆榛樿鐨勫睘鎬�
url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm',
+ textField:'name',
valueField:'classFullName',
- textField:'classFullName',
isMuti: false,
type: "grid",
method: 'get',
@@ -1388,6 +1386,7 @@
{title: '绠楁硶缂栧彿', field: 'id', width: 200},
{title: '绠楁硶鍚嶇О', field: 'name', width: 150},
{title: '绫诲叏璺緞', field: 'classFullName', width: 300},
+ {title: '绫诲瀷', field: 'serialType', width: 300},
{title: '鎻忚堪', field: 'description'}
],
queryColumns: [
@@ -1717,10 +1716,11 @@
methods: {
//鑷畾涔夋祦姘村け鐒�
setReferValue(data){
- console.log(data)
if(data.field){
this.form[data.field] = data.value || "";
- // this.form[data.showField] = data.text || "";
+ this.form[data.showField] = data.text || "";
+ this.form.serialType = data.rawData[0].serialType || "";
+
}
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
--
Gitblit v1.9.3