From 1172444b5f2527c3e6bddce63b734fba35e5e57c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 10 十一月 2023 13:19:08 +0800
Subject: [PATCH] 自定义流水功能增加
---
Source/UBCS-WEB/src/views/code/code.vue | 108 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index da43e4a..c9e7ac1 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -576,16 +576,16 @@
:title="basicSecDialogTitle"
:visible.sync="addBasicCodeSettingBox"
append-to-body
- class="avue-dialog avue-dialog--top"
+ class="avue-dialog avue-dialog--top add-basicsec-dialog"
destroy-on-close
lock-scroll
- style="height: 100vh"
+ style="height: 105vh"
top="-3%"
width="900px"
@close="clearBasicAddForm"
>
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
- <div class="add-basicsec-total" style="overflow-y: auto; height: 58vh">
+ <div class="add-basicsec-total">
<el-form :model="form" class="add-basicsec-form">
<span class="left">
<el-form-item
@@ -614,7 +614,7 @@
<el-form-item
:label-width="leftFormLabelWidth"
- label="鐮佹绫诲瀷"
+ label="鐮佹绫诲瀷:"
required
>
<el-select
@@ -631,6 +631,24 @@
>
</el-option>
</el-select>
+ </el-form-item>
+
+ <el-form-item
+ :label-width="leftFormLabelWidth"
+ label="鍓嶇紑:">
+ <el-input
+ v-model="form.prefixCode"
+ :readonly="basicSecOnlyRead"
+ ></el-input>
+ </el-form-item>
+
+ <el-form-item
+ :label-width="leftFormLabelWidth"
+ label="鍚庣紑:">
+ <el-input
+ v-model="form.suffixCode"
+ :readonly="basicSecOnlyRead">
+ </el-input>
</el-form-item>
<el-form-item :label-width="leftFormLabelWidth" label="鎻忚堪:">
@@ -818,9 +836,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1113,9 +1131,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1125,7 +1143,7 @@
</el-form>
</div>
<!-- 绗竴灞傚璇濇鐨勬寜閽拰鍒嗛殧绾挎潯 -->
- <el-divider class="horizontal-line" direction="horizontal"></el-divider>
+ <!-- <el-divider class="horizontal-line" direction="horizontal"></el-divider> -->
<div slot="footer" class="dialog-footer">
<el-button
:disabled="!showbtn"
@@ -1293,6 +1311,7 @@
saveCodeClassifyValueOrder,
} from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
+import { getDictionaryBiz } from "@/api/system/dictbiz";
import optionBasic from "@/const/code/codebasic";
import optionRule from "@/const/code/mdmrule";
import attrOption from "@/const/code/selectAttrOptionDialog";
@@ -1533,6 +1552,8 @@
serialDependFlag: false, //鏄惁娴佹按渚濊禆
serialDependOrder: "", //娴佹按渚濊禆椤哄簭
nullableFlag: false, //鏄惁涓虹┖
+ prefixCode: "", //鍓嶇紑
+ suffixCode: "", //鍚庣紑
displayFlag: false, //
componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
pkCodeRule: "", //鎵�灞炵紪鐮佽鍒�
@@ -1612,6 +1633,16 @@
this.$refs.crud.doLayout();
this.$refs.crudBasic.doLayout();
});
+ },
+ // 鐢熷懡閽╁瓙鍑芥暟
+ beforeDestroy() {
+ // 娓呴櫎鎸囧畾缂撳瓨
+ localStorage.removeItem('codeSecType');
+ localStorage.removeItem('codeSecLength');
+ localStorage.removeItem('codeFillType');
+ localStorage.removeItem('codeLevelType');
+ localStorage.removeItem('codeCutType');
+ localStorage.removeItem('codeGetValueType');
},
methods: {
@@ -2422,11 +2453,11 @@
.catch((error) => {
this.releadDisabled = false;
});
+ this.releadDisabled = false;
} else {
this.updateStatus(oid, update);
}
},
-
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
@@ -2434,7 +2465,6 @@
}
this.cloneSettingBox = true;
},
-
/** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
@@ -3189,16 +3219,18 @@
}
this.form = {
oid: row !=null ? row.oid:this.form.oid,
- id: row !=null ? row.id:this.form.id, //缂栧彿,
- name: row !=null ? row.name:this.form.name, //鍚嶇О
- secType: row !=null ? row.secType:this.form.secType, //鐮佹绫诲瀷
- description: row !=null ? row.description:this.form.description, //鎻忚堪
+ id: row != null ? row.id:this.form.id, //缂栧彿,
+ name: row != null ? row.name:this.form.name, //鍚嶇О
+ 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, //娴佹按渚濊禆椤哄簭
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, //鎵�灞炵紪鐮佽鍒�
+ pkCodeRule: row != null ? row.pkCodeRule:this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
+ prefixCode: row != null ? row.prefixCode:this.form.prefixCode, //鍓嶇紑
+ suffixCode: row!= null ? row.suffixCode:this.form.suffixCode, //鍚庣紑
};
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3394,16 +3426,17 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") || [];
},
loadCodeFillSeparator() {
- let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
- if (enumCach == null) {
- getDictionary("codeFillSeparator").then((res) => {
- this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem(
- "codeFillSeparator",
- JSON.stringify(res.data.data)
- );
- });
- }
+ //let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ //if (enumCach == null) {
+ getDictionaryBiz({code:"codeFillSeparator"}).then((res) => {
+ this.enumParam.codeFillSeparator = res.data.data;
+ //console.log(this.enumParam.codeFillSeparator);
+ localStorage.setItem(
+ "codeFillSeparator",
+ JSON.stringify(res.data.data)
+ );
+ });
+ //}
},
loadCodeLevelType() {
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") || [];
@@ -3517,8 +3550,14 @@
}
/** 鏂板鐮佹 */
+.add-basicsec-dialog > .el-dialog > .el-dialog__body {
+ padding: 20px 20px 4px;
+ margin-bottom: 30px;
+}
+
.add-basicsec-total {
width: 100%;
+ height: 500px;
}
.add-basicsec-total .el-input__inner,
@@ -3537,9 +3576,11 @@
.add-basicsec-form > .el-divider--vertical {
width: 2px;
- height: 100%;
- margin: 0 auto;
- /* position: fixed; */
+ height: 78%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
}
.left {
@@ -3555,8 +3596,9 @@
width: auto;
}
-.right > .el-form > .el-form-item {
- margin-bottom: 8px;
+.add-basicsec-form > .left > .el-form-item,
+.add-basicsec-form > .right > div > .el-form-item{
+ margin-bottom: 12px;
}
/* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */
--
Gitblit v1.9.3