From dc9f1a633caa2031873d9a1ed7d924c8a675d098 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 20 十一月 2023 16:11:08 +0800
Subject: [PATCH] 自定义流水算法serialType类型
---
Source/UBCS-WEB/src/views/code/code.vue | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 5487e28..1202340 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -587,7 +587,7 @@
>
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
<div class="add-basicsec-total">
- <el-form :model="form" class="add-basicsec-form">
+ <el-form :model="form" class="add-basicsec-form" :rules="rules" >
<span class="left">
<el-form-item
:label-width="leftFormLabelWidth"
@@ -669,12 +669,12 @@
:disabled="basicSecOnlyRead"
style="margin-right: 20px"
></el-switch>
- <el-input-number
+ <!-- <el-input-number
v-show="form.serialDependFlag"
v-model="form.serialDependOrder"
:readonly="basicSecOnlyRead"
controls-position="right"
- ></el-input-number>
+ ></el-input-number> -->
</el-form-item>
<el-form-item :label-width="leftFormLabelWidth" label="鏄惁涓虹┖:">
@@ -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>
@@ -1027,9 +1023,9 @@
<!-- 鏃ユ湡鐮佹 -->
<div v-show="form.secType === 'codedatesec' ? true : false">
<el-form-item
+ prop="Dateformat"
:label-width="rightFormLabelWidth"
label="鏃ユ湡鏍煎紡:"
- required
>
<el-input
ref="codeDateFormatStr"
@@ -1350,17 +1346,34 @@
components: { vciWebRefer },
data() {
return {
+ rules: {
+ Dateformat: [
+ {
+ required: true,
+ trigger: 'blur',
+ validator: (rule, value, callback) => {
+ const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yy-MM', 'yyyy-MM-dd','yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
+ if (!Formats.includes(this.form.codeDateFormatStr)) {
+ return callback(new Error('璇疯緭鍏ユ纭棩鏈熸牸寮忥紝渚嬪yyyy-MM-dd锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
+ }
+ callback();
+ }
+ }
+ ]
+ },
referConfig:{
title: '鑷畾涔夋祦姘村弬鐓�',
- showField: 'customCodeSerialClass',
+ 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',
@@ -1373,11 +1386,12 @@
{title: '绠楁硶缂栧彿', field: 'id', width: 200},
{title: '绠楁硶鍚嶇О', field: 'name', width: 150},
{title: '绫诲叏璺緞', field: 'classFullName', width: 300},
+ {title: '绫诲瀷', field: 'serialType', width: 300},
{title: '鎻忚堪', field: 'description'}
],
queryColumns: [
- {field: 'id', title: '绠楁硶缂栧彿'},
- {field: 'name', title: '绠楁硶鍚嶇О'}
+ // {field: 'id', title: '绠楁硶缂栧彿'},
+ // {field: 'name', title: '绠楁硶鍚嶇О'}
]
}
}
@@ -1605,7 +1619,7 @@
secType: "codefixedsec", //鐮佹绫诲瀷
description: "", //鎻忚堪
serialDependFlag: false, //鏄惁娴佹按渚濊禆
- serialDependOrder: "", //娴佹按渚濊禆椤哄簭
+ //serialDependOrder: "", //娴佹按渚濊禆椤哄簭
nullableFlag: false, //鏄惁涓虹┖
prefixCode: "", //鍓嶇紑
suffixCode: "", //鍚庣紑
@@ -1702,7 +1716,12 @@
methods: {
//鑷畾涔夋祦姘村け鐒�
setReferValue(data){
- console.log(data)
+ if(data.field){
+ this.form[data.field] = data.value || "";
+ this.form[data.showField] = data.text || "";
+ this.form.serialType = data.rawData[0].serialType || "";
+
+ }
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
escapeOwner() {
@@ -1762,7 +1781,7 @@
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
this.form.referConfig = submitFormJson || "";
- debugger;
+ // debugger;
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content) {
@@ -2507,8 +2526,7 @@
this.releadDisabled = false;
});
}
- })
- .catch((error) => {
+ }).catch((error) => {
this.releadDisabled = false;
});
this.releadDisabled = false;
@@ -2783,6 +2801,7 @@
type: "success",
message: "鎿嶄綔鎴愬姛!",
});
+ console.log(this.form)
// 鍏抽棴瀵硅瘽妗�
this.addBasicCodeSettingBox = false;
// 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
@@ -3269,6 +3288,7 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
+ console.log(row)
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3282,13 +3302,14 @@
secType: row != null ? row.secType : this.form.secType, //鐮佹绫诲瀷
description: row != null ? row.description : this.form.description, //鎻忚堪
serialDependFlag: this.isNullJsonBoolean(row, this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆
- serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
+ //serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //鏄惁涓虹┖
displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'),
componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //鏄惁鍙備笌缂栫爜
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