From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/spare/modules/sparePart/SparePartModel.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/views/spare/modules/sparePart/SparePartModel.vue b/src/views/spare/modules/sparePart/SparePartModel.vue
index 50ce2b1..2ee21f6 100644
--- a/src/views/spare/modules/sparePart/SparePartModel.vue
+++ b/src/views/spare/modules/sparePart/SparePartModel.vue
@@ -25,6 +25,7 @@
<a-input
placeholder="灏嗙敱绯荤粺鐢熸垚"
v-decorator="['num', validatorRules.num]"
+ disabled
/>
</a-form-item>
</a-col>
@@ -311,7 +312,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囧垎绫荤紪鍙�!' },
+ // { required: true, message: '璇疯緭鍏ヨ澶囧垎绫荤紪鍙�!' },
{ min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
// { validator: this.validateNum },
]
@@ -333,6 +334,7 @@
edit: "/spare/sparePart/edit",
getAuxiliaryUnits: "/spare/sparePart/getAuxiliaryUnits",
getConversionRatio: "/spare/sparePart/getConversionRatio",
+ getNum: '/eam/sysIdentity/getNumNew',
},
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: "",
@@ -377,6 +379,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 });
+ }
+ })
+ });
}
},
@@ -394,6 +403,13 @@
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