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/malfunctionRepair/MalfunctionRepaireForm.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
index 9cf49d5..48dcb34 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
@@ -42,14 +42,14 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-model-item
- label="璁惧缂栫爜/鍚嶇О/鍨嬪彿"
+ label="缁熶竴缂栫爜/鍚嶇О/鍨嬪彿"
:labelCol="{span:6}"
:wrapperCol="{span:15}"
prop="equipmentId"
>
<a-select
v-model="equipmentId"
- :placeholder="disableSubmit ? '' : '璇烽�夋嫨璁惧缂栫爜 / 鍚嶇О / 鍨嬪彿'"
+ :placeholder="disableSubmit ? '' : '璇烽�夋嫨缁熶竴缂栫爜 / 鍚嶇О / 鍨嬪彿'"
:options="equipmentList"
@change="(e) => handleChange(e, 2)"
:disabled="disableSubmit"
@@ -176,7 +176,8 @@
add: "/eam/equipmentReportRepair/add",
edit: "/eam/equipmentReportRepair/edit",
queryById: "/eam/equipmentReportRepair/queryById",
- equipmentList: '/eam/equipment/list'
+ equipmentList: '/eam/equipment/list',
+ getNum:'/eam/sysIdentity/getNumNew'
},
isMaintenance: [
{ label: '鏄�', value: true },
@@ -272,13 +273,22 @@
add() {
this.modelDefault.status = 1
this.modelDefault.isStop = false
- this.edit(this.modelDefault);
+ let that = this;
+ let param = {
+ type: 'EquipmentReportRepair',
+ length: 4
+ };
+ getAction(this.url.getNum,param).then(res=>{
+ if(res.success){
+ that.modelDefault.num = res.result;
+ that.edit(that.modelDefault);
+ }
+ })
},
async edit(record) {
await this.fetchList()
this.model = Object.assign({}, record);
if (this.model.id) {
-
this.selectStatus = Number(record.status)
record.isStop == 'true' ? this.isStop = true : this.isStop = false
this.equipmentId = String(record.equipmentId)
--
Gitblit v1.9.3