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/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
index 35295a1..6b9272a 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
@@ -101,7 +101,7 @@
data() {
return {
description: '妫�瀹氭姤鍛�',
- disableMixinCreated:true,
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -135,11 +135,11 @@
dataIndex: 'size',
scopedSlots: { customRender: 'size' },
},
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'judgmentResultName'
- },
+ // {
+ // title: '鍒ゅ畾缁撴灉',
+ // align: 'center',
+ // dataIndex: 'judgmentResultName'
+ // },
{
title: '鎿嶄綔',
align: 'center',
@@ -156,27 +156,27 @@
},
}
},
- props:{
- calibrationOrderId:{
- type:String,
- default:'',
- required:false
+ props: {
+ calibrationOrderId: {
+ type: String,
+ default: '',
+ required: false
}
},
- watch:{
- calibrationOrderId:{
- immediate: true,
- handler(val) {
- if(!this.calibrationOrderId){
- this.clearList()
- }else{
- this.queryParam['calibrationOrderId'] = val;
- this.queryParam['delFlag'] = 0;
- this.loadData(1);
- }
+ watch: {
+ calibrationOrderId: {
+ immediate: true,
+ handler(val) {
+ if (!this.calibrationOrderId) {
+ // this.clearList()
+ } else {
+ this.queryParam['calibrationOrderId'] = val;
+ this.queryParam['delFlag'] = 0;
+ this.loadData(1);
}
}
- },
+ }
+ },
// mounted() {
// this.$bus.$on('equipmentSelectionRows', (data) => {
// this.equipmentSelectionRows = data
--
Gitblit v1.9.3