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/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
index decbac8..d765332 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -82,7 +82,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
@@ -150,7 +150,11 @@
},
loadData(arg) {
if(!this.url.list){
- this.$message.error("璇疯缃畊rl.list灞炴��!")
+ // this.$message.error("璇疯缃畊rl.list灞炴��!")
+ this.$notification.error({
+ message:'娑堟伅',
+ description:"璇疯缃畊rl.list灞炴��!"
+ });
return
}
//鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
@@ -177,7 +181,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
--
Gitblit v1.9.3