From 1536703a1961567f9e32446467c09afa4e48559b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 23:05:02 +0800
Subject: [PATCH] 编码规则，流水算法修改
---
Source/UBCS-WEB/src/views/code/code.vue | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 8847b03..28e19f9 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: 50vh;overflow: auto;">
<p
style="
margin-top: -5px;
@@ -142,7 +142,6 @@
</template>
</avue-crud>
</div>
-
</basic-container>
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
@@ -220,7 +219,7 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
- <div style="height: 38.5vh;overflow: auto">
+ <div style="height: 35vh;overflow: auto">
<p
style="margin-top: -5px;
margin-bottom: 4px;
@@ -644,7 +643,7 @@
v-model="form.prefixCode"
:readonly="basicSecOnlyRead"
></el-input> -->
- <el-select v-model="form.prefixCode" :disabled="basicSecOnlyRead">
+ <el-select v-model="form.prefixCode" :disabled="basicSecOnlyRead" clearable>
<el-option
v-for="(option, index) in preFixOrSuffixChars"
:key="index"
@@ -661,7 +660,7 @@
v-model="form.suffixCode"
:readonly="basicSecOnlyRead">
</el-input> -->
- <el-select v-model="form.suffixCode" :disabled="basicSecOnlyRead">
+ <el-select v-model="form.suffixCode" :disabled="basicSecOnlyRead" clearable>
<el-option
v-for="(option, index) in preFixOrSuffixChars"
:key="index"
@@ -852,6 +851,7 @@
:disabled="basicSecOnlyRead"
filterable
placeholder="璇烽�夋嫨"
+ clearable
>
<el-option
v-for="item in enumParam.codeFillSeparator"
@@ -896,11 +896,12 @@
</el-form-item>
<el-form-item
:label-width="rightFormLabelWidth"
- label="鑷畾涔夌殑娴佹按绠楁硶:"
+ label="鑷畾涔夋祦姘寸畻娉�:"
>
<template>
<vciWebRefer
ref="refer"
+ :disabled="basicSecOnlyRead"
:display="true"
:referConfig="this.referConfig || {}"
:serialType="form.serialType"
@@ -909,8 +910,6 @@
@setReferValue="setReferValue"
></vciWebRefer>
</template>
-
-
</el-form-item>
</div>
<!-- 灞傜骇鐮佹 -->
@@ -1157,6 +1156,7 @@
:disabled="basicSecOnlyRead"
filterable
placeholder="璇烽�夋嫨"
+ clearable
>
<el-option
v-for="item in enumParam.codeFillSeparator"
@@ -1304,7 +1304,6 @@
</refer-config-dialog>
</el-dialog>
- <!--鑷畾涔夋祦姘村弬鐓х粍浠�-->
</basic-container>
</template>
@@ -1406,7 +1405,7 @@
showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
fieldMap: {
- serialType: "serialType"
+ serialType: "serialType",
},
placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
options: {
@@ -1760,10 +1759,12 @@
//鑷畾涔夋祦姘村け鐒�
setReferValue(data) {
if (data.field) {
- this.form[data.field] = data.value || "";
+ // this.form[data.field] = data.value || "";
+ this.form.customCodeSerialClass = data.rawData[0].id || "";
+ console.log(this.form.customCodeSerialClass);
this.form[data.showField] = data.text || "";
this.form.serialType = data.rawData[0].serialType || "";
-
+ this.form.customCodeSerialType = data.rawData[0].serialType || "";
}
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
@@ -2108,7 +2109,7 @@
if (!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)) {
return;
}
- if(!await this.regexCharacter(this.codeFixdForm.id)){
+ if(!await this.regexCharacter(this.codeClassifyForm.id)){
return;
}
this.codeClassifyForm.oid =
@@ -2139,7 +2140,7 @@
);
}
},
- /**
+ /**
* 鍙敤瀛楃闆嗙爜鍊兼鍒欐牎楠�
* @return true:婊¤冻闄愬埗锛宖alse锛氫笉婊¤冻闄愬埗
*/
@@ -2835,7 +2836,6 @@
},
/** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
openBasicDialog(condition, row) {
- //console.log(row);
if (condition == "add") {
this.basicSecDialogTitle = "娣诲姞鐮佹淇℃伅";
this.showbtn = true;
@@ -3494,6 +3494,14 @@
row != null && row.customCodeSerialClass != ""
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
+ customCodeSerialClassText:
+ row != null && row.customCodeSerialClassText != ""
+ ? row.customCodeSerialClassText
+ : "", //鑷畾涔夋祦姘寸畻娉曟樉绀哄��
+ customCodeSerialType:
+ row != null && row.customCodeSerialType != ""
+ ? row.customCodeSerialType
+ : "", //鑷畾涔夋祦姘寸畻娉曠被鍨�
});
this.loadCodeFillType();
this.loadCodeFillSeparator();
--
Gitblit v1.9.3