From 4508f5eb86b063a0f3ec01e6ad68c6ce8ccd1392 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 14:34:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 3043cc7..fad06a0 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2,7 +2,7 @@
<basic-container class="code-total" style=" height: 100%">
<!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
<basic-container class="code-rule-container">
- <div style="height: 40vh;overflow: auto;">
+ <div style="height: 55vh;overflow: auto;">
<p
style="
margin-top: -5px;
@@ -220,7 +220,7 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
- <div style="height: 38.5vh;overflow: auto">
+ <div style="height: 23.5vh;overflow: auto">
<p
style="margin-top: -5px;
margin-bottom: 4px;
@@ -1306,7 +1306,6 @@
</refer-config-dialog>
</el-dialog>
- <!--鑷畾涔夋祦姘村弬鐓х粍浠�-->
</basic-container>
</template>
@@ -1408,7 +1407,7 @@
showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
fieldMap: {
- serialType: "serialType"
+ serialType: "serialType",
},
placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
options: {
@@ -1765,7 +1764,7 @@
this.form[data.field] = data.value || "";
this.form[data.showField] = data.text || "";
this.form.serialType = data.rawData[0].serialType || "";
-
+ this.form.customCodeSerialType = data.rawData[0].serialType || "";
}
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
@@ -2141,7 +2140,7 @@
);
}
},
- /**
+ /**
* 鍙敤瀛楃闆嗙爜鍊兼鍒欐牎楠�
* @return true:婊¤冻闄愬埗锛宖alse锛氫笉婊¤冻闄愬埗
*/
@@ -2837,7 +2836,6 @@
},
/** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
openBasicDialog(condition, row) {
- //console.log(row);
if (condition == "add") {
this.basicSecDialogTitle = "娣诲姞鐮佹淇℃伅";
this.showbtn = true;
--
Gitblit v1.9.3