From 221bb1704bb74b38655c2cd2413242885b5cc614 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期日, 28 四月 2024 09:50:55 +0800
Subject: [PATCH] 1、调整路由模式为hash模式以试图解决项目上线后刷新页面后无法正常跳转页面而出现JSON页面问题 2、首页设备级看板点击报修按钮跳转至故障报修页面并根据设备编号筛选页面对应数据
---
src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
index 9071fba..fea537c 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -109,7 +110,7 @@
<actual-material-select ref="actualMaterialSelect">
<!-- @sendMaterialRecord="sendMaterialRecord" -->
</actual-material-select>
- <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal>
+ <j-select-spare-part-modal ref='JSelectSparePartModal' @selection2Rows="getSelectRows"></j-select-spare-part-modal>
</a-card>
</template>
<script>
@@ -265,7 +266,8 @@
lock: "/eam/maintenanceOrderActualMaterial/lock",
unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false,
}
},
watch: {
@@ -413,7 +415,7 @@
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!');
return false;
}
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.lock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
@@ -421,14 +423,14 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
handleUnLock(record) {
let that = this;
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.unLock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
@@ -436,7 +438,7 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
@@ -472,11 +474,8 @@
this.loading = false
})
},
- },
-
- mounted() {
- let newActualMaterials = [];
- this.$bus.$on('selection2Rows', (data) => {
+ getSelectRows(data){
+ let newActualMaterials = [];
for (let i = 0; i < data.length; i++) {
newActualMaterials.push({
// id: this.getUuiD(16),
@@ -499,9 +498,7 @@
isLock: 'no'
})
}
- debugger
let that = this
- // newActualMaterials = this.dataSource
postAction(this.url.addInit, newActualMaterials).then((res) => {
if (res.success) {
that.$message.success(res.message)
@@ -511,10 +508,14 @@
}
}).finally(res => {
newActualMaterials = []
- that.loadData(1);
+ that.loadData();
})
- })
+
+ }
+ },
+
+ mounted() {
},
}
--
Gitblit v1.9.3