From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/spare/modules/sparePart/SparePartModel.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/spare/modules/sparePart/SparePartModel.vue b/src/views/spare/modules/sparePart/SparePartModel.vue
index 50ce2b1..223f820 100644
--- a/src/views/spare/modules/sparePart/SparePartModel.vue
+++ b/src/views/spare/modules/sparePart/SparePartModel.vue
@@ -311,7 +311,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囧垎绫荤紪鍙�!' },
+ // { required: true, message: '璇疯緭鍏ヨ澶囧垎绫荤紪鍙�!' },
{ min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
// { validator: this.validateNum },
]
@@ -333,6 +333,7 @@
edit: "/spare/sparePart/edit",
getAuxiliaryUnits: "/spare/sparePart/getAuxiliaryUnits",
getConversionRatio: "/spare/sparePart/getConversionRatio",
+ getNum: '/eam/sysIdentity/getNumNew',
},
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: "",
@@ -377,6 +378,13 @@
this.codeDisable = true;
} else {
this.codeDisable = false;
+ // this.$nextTick(() => {
+ // getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
+ // if (res.success) {
+ // this.form.setFieldsValue({ num: res.message });
+ // }
+ // })
+ // });
}
},
@@ -388,12 +396,19 @@
handleOk() {
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
- this.form.validateFields((err, values) => {
+ this.form.validateFields(async (err, values) => {
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
let obj;
if (!this.model.id) {
+ if(!formData.num){
+ await getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
+ if (res.success) {
+ formData.num = res.message;
+ }
+ });
+ }
formData.sparePartCategoryId = this.sparePartCategoryId
obj = postAction(this.url.add, formData);
} else {
--
Gitblit v1.9.3