From cc3d9886a0b6e6f5e7f834045b10735e3197bb7b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 19:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 e12a0bb..e6e7b24 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -54,7 +54,7 @@
deep: true
},
},
- mounted() {
+ mounted() {
},
data() {
return {
@@ -76,8 +76,8 @@
{ required: true, message: '璇疯緭鍏ユ祦姘村彿', trigger: 'blur' },
{
validator: (rule, value, callback) => {
- if (value > this.maxNum) {
- callback(new Error('涓嶈兘澶т簬鏈�澶ф祦姘村彿'));
+ if (value < this.maxNum) {
+ callback(new Error('涓嶈兘灏忎簬褰撳墠鏈�澶ф祦姘村彿'));
} else {
callback();
}
@@ -172,12 +172,12 @@
return acc;
}, {});
- const arrCode = Object.entries(filteredObj).map(([key, value]) => {
+ /*const arrCode = Object.entries(filteredObj).map(([key, value]) => {
return {
secOid: key,
secValue: value
}
- })
+ })*/
this.ruleFormFlag = Object.values(codeApplyForm).every(value => {
return value !== null && value !== undefined && value !== '';
@@ -186,17 +186,14 @@
this.loading=true;
let params = {};
params['codeRuleOid'] = this.ruleOid;
-
- Object.keys(arrCode).forEach((key) => {
- params[key] = arrCode[key];
+ Object.keys(filteredObj).forEach((key) => {
+ params[key] = filteredObj[key];
});
-
getMaxSerialNumber(params).then(res => {
this.formModel.maxSecNum = res.data.data;
this.loading=false;
this.maxNum=res.data.data
});
-
}
},
@@ -220,7 +217,6 @@
}
return acc;
}, {});
-
const arrCode = Object.entries(filteredObj).map(([key, value]) => {
return {
secOid: key,
--
Gitblit v1.9.3