From e2b40bd2613d86f543492bb0c4828a3205295cb7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 28 八月 2023 15:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 4 ++--
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 2 ++
2 files changed, 4 insertions(+), 2 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 dc5182c..b29e4d0 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -182,6 +182,8 @@
this.confirmLoadding = false
this.cancel()
}
+ }).catch(error=>{
+ this.confirmLoadding = false
})
} else {
this.confirmLoadding = false
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 6c67d5b..301befd 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -455,7 +455,7 @@
<!-- 鍩虹鐮佹鏂板鐩稿叧瀵硅瘽妗� -->
<el-dialog :title="basicSecDialogTitle"
:visible.sync="addBasicCodeSettingBox"
- width="60vw"
+ width="900px"
append-to-body
class="avue-dialog avue-dialog--top"
style="height: 100vh;" top="-3%"
@@ -492,7 +492,7 @@
</el-form-item>
<el-form-item label="鏄惁娴佹按渚濊禆:" :label-width="leftFormLabelWidth">
- <el-switch v-model="form.serialDependFlag" :disabled="basicSecOnlyRead"></el-switch>
+ <el-switch v-model="form.serialDependFlag" :disabled="basicSecOnlyRead" style="margin-right: 20px"></el-switch>
<el-input-number v-show="form.serialDependFlag" v-model="form.serialDependOrder" controls-position="right" :readonly="basicSecOnlyRead"></el-input-number>
</el-form-item>
--
Gitblit v1.9.3