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 | 17 +++++++++++++----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java | 10 ++++++++++
Source/UBCS-WEB/src/const/code/codebasic.js | 1 +
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/const/code/codebasic.js b/Source/UBCS-WEB/src/const/code/codebasic.js
index 511f52b..120556d 100644
--- a/Source/UBCS-WEB/src/const/code/codebasic.js
+++ b/Source/UBCS-WEB/src/const/code/codebasic.js
@@ -4,6 +4,7 @@
editBtn: false,
addBtn: false,
searchShow: false,
+ height:218,
searchMenuSpan: 5,
disablePage: false,
border: true,
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 8dd7514..28e19f9 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -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>
<!-- 灞傜骇鐮佹 -->
@@ -1760,7 +1759,9 @@
//鑷畾涔夋祦姘村け鐒�
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 || "";
@@ -3493,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();
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
index ac7e05b..979d2e6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
@@ -196,10 +196,12 @@
* 鑷畾涔夌殑娴佹按绠楁硶绫�
*/
private String customCodeSerialClassText;
+
/***
* 鑷畾涔夋祦姘寸被鍨�
*/
private String customCodeSerialType;
+
/**
* 鏄惁鑷姩鍖归厤鍒嗙被鍊�
*/
@@ -288,6 +290,14 @@
return isClearValue;
}
+ public void setCustomCodeSerialType(String customCodeSerialType) {
+ this.customCodeSerialType = customCodeSerialType;
+ }
+
+ public String getCustomCodeSerialType() {
+ return customCodeSerialType;
+ }
+
public void setIsClearValue(Boolean clearValue) {
isClearValue = clearValue;
}
--
Gitblit v1.9.3