From 5e080a3dd1bbc7a07bd8b42f8d5d86f0c15c71f0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 24 八月 2023 10:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
index 6db53ba..83740c1 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -161,7 +161,8 @@
             console.log(objcodekey)
             const filteredObj = objcodekey.reduce((acc, key) => {
                 const pattern = /[\u4e00-\u9fa5]/; // 鍖归厤涓枃瀛楃鐨勬鍒欒〃杈惧紡
-                if (!pattern.test(key)) {
+                const patterns = /\$/;
+                if (!pattern.test(key)&&!patterns.test(key)) {
                     acc[key] = this.codeApplyForm[key];
                 }
                 return acc;
@@ -230,6 +231,7 @@
             if (item.secType == "codeclassifysec") {
                 params = {
                     isMuti: false,
+                    valueField: 'id',
                     type: "grid",
                     tableConfig: {
                         limit: -1,

--
Gitblit v1.9.3