From f6b61a485501f326debe52d77ea65d87fb34b37f Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 17:57:09 +0800
Subject: [PATCH] 完善集成日志查询
---
Source/UBCS-WEB/src/views/code/code.vue | 228 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 144 insertions(+), 84 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 652c87d..60297f3 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: 49vh;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: 29.3vh;overflow: auto">
<p
style="margin-top: -5px;
margin-bottom: 4px;
@@ -384,18 +383,12 @@
<el-col :span="13">
<basic-container>
<div class="box" style="height: 60vh; margin-bottom: -40px">
- <el-form>
- <el-form-item :label-width="50" label="鐮佸��:" required>
- <el-input
- v-model="codeClassifyForm.id"
- style="width: 18vw"
- ></el-input>
+ <el-form label-width="55px">
+ <el-form-item label="鍚嶇О:" required>
+ <el-input v-model="codeClassifyForm.name"></el-input>
</el-form-item>
- <el-form-item :label-width="50" label="鍚嶇О:" required>
- <el-input
- v-model="codeClassifyForm.name"
- style="width: 18vw"
- ></el-input>
+ <el-form-item label="鐮佸��:">
+ <el-input v-model="codeClassifyForm.id"></el-input>
</el-form-item>
</el-form>
</div>
@@ -404,9 +397,7 @@
margin-top: 20px;
display: flex;
align-items: center;
- justify-content: center;
- "
- >
+ justify-content: center;">
<el-button
class="button"
icon="el-icon-circle-plus"
@@ -642,19 +633,35 @@
<el-form-item
:label-width="leftFormLabelWidth"
label="鍓嶇紑:">
- <el-input
+ <!-- <el-input
v-model="form.prefixCode"
:readonly="basicSecOnlyRead"
- ></el-input>
+ ></el-input> -->
+ <el-select v-model="form.prefixCode" :disabled="basicSecOnlyRead" clearable>
+ <el-option
+ v-for="(option, index) in preFixOrSuffixChars"
+ :key="index"
+ :label="option.label"
+ :value="option.value">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item
:label-width="leftFormLabelWidth"
label="鍚庣紑:">
- <el-input
+ <!-- <el-input
v-model="form.suffixCode"
:readonly="basicSecOnlyRead">
- </el-input>
+ </el-input> -->
+ <el-select v-model="form.suffixCode" :disabled="basicSecOnlyRead" clearable>
+ <el-option
+ v-for="(option, index) in preFixOrSuffixChars"
+ :key="index"
+ :label="option.label"
+ :value="option.value">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item :label-width="leftFormLabelWidth" label="鎻忚堪:">
@@ -838,13 +845,13 @@
:disabled="basicSecOnlyRead"
filterable
placeholder="璇烽�夋嫨"
- @blur="inputSelectBlur"
+ clearable
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictValue"
+ :key="item.lable"
+ :label="item.lable"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -883,11 +890,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"
@@ -896,8 +904,6 @@
@setReferValue="setReferValue"
></vciWebRefer>
</template>
-
-
</el-form-item>
</div>
<!-- 灞傜骇鐮佹 -->
@@ -1144,13 +1150,13 @@
:disabled="basicSecOnlyRead"
filterable
placeholder="璇烽�夋嫨"
- @blur="inputSelectBlur"
+ clearable
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictValue"
+ :key="item.lable"
+ :label="item.lable"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -1292,7 +1298,6 @@
</refer-config-dialog>
</el-dialog>
- <!--鑷畾涔夋祦姘村弬鐓х粍浠�-->
</basic-container>
</template>
@@ -1333,8 +1338,9 @@
deleteCodeClassifyValue,
saveCodeClassifyValueOrder,
} from "@/api/code/codeClassifyValue";
+import { getSelectList, getRegexStr } from "@/api/code/codeCharcter"
import {getDictionary} from "@/api/omd/enum";
-import {getDictionaryBiz} from "@/api/system/dictbiz";
+// import {getDictionaryBiz} from "@/api/system/dictbiz";
import optionBasic from "@/const/code/codebasic";
import optionRule from "@/const/code/mdmrule";
import attrOption from "@/const/code/selectAttrOptionDialog";
@@ -1393,7 +1399,7 @@
showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
fieldMap: {
- serialType: "serialType"
+ serialType: "serialType",
},
placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
options: {
@@ -1682,6 +1688,9 @@
//寮曠敤鐮佹涓弬鐓ч厤缃粍浠剁浉鍏冲弬鏁�
referConfigOption: {},
referConfigVisble: false,
+
+ preFixOrSuffixChars: [], //鍓嶅悗缂�瀛楃鍒楄〃
+
};
},
computed: {
@@ -1744,10 +1753,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 || "";
}
},
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
@@ -2001,9 +2012,12 @@
this.codeFixdForm.codeFixedSecOid = row.codefixedsecoid;
},
/** 鏂板鐮佸��*/
- addCodeSecValue(condition) {
+ async addCodeSecValue(condition) {
if (condition === "codefixedsec") {
if (!this.tipsCodeSecValueMessage(this.codeFixdForm.id)) {
+ return;
+ }
+ if(!await this.regexCharacter(this.codeFixdForm.id)){
return;
}
this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
@@ -2025,7 +2039,14 @@
}
);
} else {
- if (!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)) {
+ // if (!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)) {
+ // return;
+ // }
+ if(!this.codeClassifyForm.name){
+ this.$message.error('璇疯緭鍏ュ悕绉�');
+ return;
+ }
+ if(!await this.regexCharacter(this.codeClassifyForm.id)){
return;
}
this.codeClassifyForm.codeClassifySecOid =
@@ -2050,39 +2071,13 @@
);
}
},
- /** 娓呯┖鐮佸�艰〃鍗� */
- clearFixedOrClassifyForm(condition) {
- //鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
- this.selectedFixedOrCodeclassifyValue = "";
- if (condition === "close") {
- this.codeFixdForm = this.$options.data().codeFixdForm;
- this.codeClassifyForm = this.$options.data().codeClassifyForm;
- }
- if (condition === "codefixedsec") {
- this.codeFixdForm.description = "";
- this.codeFixdForm.codeFixedSecOid = "";
- } else {
- this.codeClassifyForm = this.$options.data().codeClassifyForm;
- }
- },
- /** 娣诲姞鎴栦慨鏀圭爜鍊间箣鍓嶅鐮佸�奸暱搴︽牴鎹鍒欒繘琛屾牎楠� */
- tipsCodeSecValueMessage(id) {
- if (id.trim() == "") {
- this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
- return false;
- }
- if (id.trim().length > this.codefixedsecOrCodeclassifysec.codeSecLength) {
- this.$message.warning(
- "鐮佸�奸暱搴︿笉鑳藉ぇ浜�" + this.codefixedsecOrCodeclassifysec.codeSecLength
- );
- return false;
- }
- return true;
- },
/** 淇敼鐮佸�� */
- editCodeSecValue(condition) {
+ async editCodeSecValue(condition) {
if (condition == "codefixedsec") {
if (!this.tipsCodeSecValueMessage(this.codeFixdForm.id)) {
+ return;
+ }
+ if(!await this.regexCharacter(this.codeFixdForm.id)){
return;
}
//浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涘繀瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佷紶鍏朵粬鍙傛暟鐨勮鑷娣诲姞
@@ -2112,6 +2107,9 @@
if (!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)) {
return;
}
+ if(!await this.regexCharacter(this.codeClassifyForm.id)){
+ return;
+ }
this.codeClassifyForm.oid =
this.selectedFixedOrCodeclassifyValue.attributes.oid;
// 鍒嗙被鐮佹锛屽瓙鍒嗙被鍜岀埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰鏇存敼
@@ -2139,6 +2137,54 @@
}
);
}
+ },
+ /**
+ * 鍙敤瀛楃闆嗙爜鍊兼鍒欐牎楠�
+ * @return true:婊¤冻闄愬埗锛宖alse锛氫笉婊¤冻闄愬埗
+ */
+ async regexCharacter(str){
+ var regex = null;
+ // 鑾峰彇鍒伴厤缃ソ鐨勫彲鐢ㄥ瓧绗︽鍒�
+ await getRegexStr({codeRuleId: this.selectionList[0].oid,chartType: "charset"}).then(res=>{
+ // console.log(res.data.data);
+ regex = new RegExp(res.data.data);
+ });
+ // console.log(regex);
+ // console.log(regex.test(str));
+ if(regex != "" && !regex.test(str)){
+ this.$message.warning("娣诲姞鐨勭爜鍊兼湭鍦ㄥ彲鐢ㄥ瓧绗﹂泦涓厤缃紒");
+ return false;
+ }
+ return true;
+ },
+ /** 娓呯┖鐮佸�艰〃鍗� */
+ clearFixedOrClassifyForm(condition) {
+ //鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
+ this.selectedFixedOrCodeclassifyValue = "";
+ if (condition === "close") {
+ this.codeFixdForm = this.$options.data().codeFixdForm;
+ this.codeClassifyForm = this.$options.data().codeClassifyForm;
+ }
+ if (condition === "codefixedsec") {
+ this.codeFixdForm.description = "";
+ this.codeFixdForm.codeFixedSecOid = "";
+ } else {
+ this.codeClassifyForm = this.$options.data().codeClassifyForm;
+ }
+ },
+ /** 娣诲姞鎴栦慨鏀圭爜鍊间箣鍓嶅鐮佸�奸暱搴︽牴鎹鍒欒繘琛屾牎楠� */
+ tipsCodeSecValueMessage(id) {
+ if (id.trim() == "") {
+ this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ return false;
+ }
+ if (id.trim().length > this.codefixedsecOrCodeclassifysec.codeSecLength) {
+ this.$message.warning(
+ "鐮佸�奸暱搴︿笉鑳藉ぇ浜�" + this.codefixedsecOrCodeclassifysec.codeSecLength
+ );
+ return false;
+ }
+ return true;
},
/** 鍒犻櫎鐮佸�� */
delCodeSecValue(condition) {
@@ -2335,7 +2381,6 @@
},
/** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
async saveCodeFixedOrClassifyValueOption(condition, editOrderNumdata) {
-
//淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
if (condition == "fixedValue") {
let data = {
@@ -2471,8 +2516,6 @@
},
{
data: [],
-
-
title: "鎻忚堪",
fieldType: "text",
queryField: "description",
@@ -2789,7 +2832,6 @@
},
/** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
openBasicDialog(condition, row) {
- //console.log(row);
if (condition == "add") {
this.basicSecDialogTitle = "娣诲姞鐮佹淇℃伅";
this.showbtn = true;
@@ -2810,7 +2852,18 @@
//console.log(this.form);
//涓篺orm缁戝畾鍊�
this.changeSectypeFormItems(condition == "add" ? null : row);
+ // 鑾峰彇鍓嶅悗缂�鍙敤瀛楃
+ this.loadPreOrSuffixChars();
+ // 琛ヤ綅鏃跺瓧绗�
+ // this.loadCodeFillSeparator();
this.addBasicCodeSettingBox = true;
+ },
+ /** 鑾峰彇鍓嶅悗缂�瀛楃 */
+ loadPreOrSuffixChars(){
+ getSelectList({codeRuleId: this.selectionList[0].oid,chartType: "prefix"}).then(res=>{
+ this.preFixOrSuffixChars = res.data.data;
+ // console.log(this.preFixOrSuffixChars);
+ })
},
/** 鏂板鍩虹鐮佹*/
async saveOrEditBasicCode() {
@@ -3343,12 +3396,12 @@
this.form.referConfig = "";
}
},
- /** 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�*/
- inputSelectBlur(e) {
+ /** 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫� TODO:鍥犱负澧炲姞浜嗗彲鐢ㄥ瓧绗﹂泦鎺у埗锛屾墍浠ヨ繖鍎垮純鐢ㄤ簡鍙敤瀛楃闆嗙殑鏁堟灉*/
+ /*inputSelectBlur(e) {
if (e.target.value) {
this.form.codeFillSeparator = e.target.value;
}
- },
+ },*/
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
//console.log(row)
@@ -3437,6 +3490,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();
@@ -3541,7 +3602,7 @@
if (enumCach == null) {
getDictionary({code: enumKey}).then((res) => {
enumCach = res.data.data;
- localStorage.setItem(enumKey, JSON.stringify(res.data.data));
+ localStorage.setItem(enumKey, JSON.stringify(enumCach));
});
}
return enumCach;
@@ -3551,7 +3612,7 @@
this.loadCodeSecType();
this.loadCodeSecLength();
this.loadCodeFillType();
- this.loadCodeFillSeparator();
+ // this.loadCodeFillSeparator();
this.loadCodeLevelType();
this.loadCodeCutType();
this.loadCodeGetValueType();
@@ -3570,15 +3631,14 @@
loadCodeFillSeparator() {
//let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
//if (enumCach == null) {
- getDictionaryBiz({code: "codeFillSeparator"}).then((res) => {
+ getSelectList({codeRuleId: this.selectionList[0].oid,chartType: "fillerChar"}).then((res) => {
this.enumParam.codeFillSeparator = res.data.data;
//console.log(this.enumParam.codeFillSeparator);
- localStorage.setItem(
- "codeFillSeparator",
- JSON.stringify(res.data.data)
- );
+ // localStorage.setItem(
+ // "codeFillSeparator",
+ // JSON.stringify(res.data.data)
+ // );
});
- //}
},
loadCodeLevelType() {
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") || [];
--
Gitblit v1.9.3