From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/spare/modules/sparePart/SparePartModel.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/spare/modules/sparePart/SparePartModel.vue b/src/views/spare/modules/sparePart/SparePartModel.vue
index 223f820..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>
@@ -378,13 +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 });
- // }
- // })
- // });
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
}
},
@@ -396,19 +397,19 @@
handleOk() {
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
- this.form.validateFields(async (err, values) => {
+ this.form.validateFields((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;
- }
- });
- }
+ // 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