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/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
index e862851..b0e4ef2 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
@@ -13,6 +13,23 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
+ <a-col
+ hidden
+ :span="24"
+ >
+ <a-form-item
+ label="淇濆吇宸ュ崟缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鍙�'"
+ v-decorator="['technologyStatusVerificationBill', validatorRules.technologyStatusVerificationBill ]"
+ />
+ </a-form-item>
+ </a-col>
<a-col :span="24">
<a-form-item
label="缁熶竴缂栧彿"
@@ -157,7 +174,7 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus'))
+ this.form.setFieldsValue(pick(this.model, 'technologyStatusVerificationBill', 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus'))
});
if (record.id) {
this.codeDisable = true;
@@ -182,7 +199,7 @@
if (!this.model.id) {
obj = postAction(this.url.add, formData);
} else {
- obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id });
+ obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id, technologyStatusVerificationBill: this.model.technologyStatusVerificationBill });
}
obj.then((res) => {
if (res.success) {
--
Gitblit v1.9.3