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/specialtyMaintenanceOrder/ActualMaterialEditTable.vue | 139 ++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 71 deletions(-)
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
index 4fdca0a..301703c 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -105,12 +106,10 @@
</a-row>
<!-- :disabled="false" -->
</div>
- <actual-material-select
- ref="actualMaterialSelect"
- @sendMaterialRecord="sendMaterialRecord"
- >
+ <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' @getSelectRows="getSelectRows"></j-select-spare-part-modal>
</a-card>
</template>
<script>
@@ -266,7 +265,8 @@
lock: "/eam/maintenanceOrderActualMaterial/lock",
unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false,
}
},
watch: {
@@ -274,26 +274,26 @@
immediate: true,
handler(val) {
this.clearList();
- this.queryParam['maintenanceOrderId'] = val
- this.queryParam['equipmentId'] = this.equipmentId
+ // this.queryParam['maintenanceOrderId'] = val
+ // this.queryParam['equipmentId'] = this.equipmentId
this.loadData(1);
}
},
- equipmentId: {
- immediate: true,
- handler(val) {
- this.clearList();
- this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderIdmaintenanceOrderId
- this.queryParam['equipmentId'] = val
- this.loadData(1);
- }
- }
+ // equipmentId: {
+ // immediate: true,
+ // handler(val) {
+ // this.clearList();
+ // this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderIdmaintenanceOrderId
+ // this.queryParam['equipmentId'] = val
+ // this.loadData(1);
+ // }
+ // }
},
- created() {
- this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderId;
- this.queryParam['equipmentId'] = this.equipmentId
- this.loadData(1);
- },
+ // created() {
+ // this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderId;
+ // this.queryParam['equipmentId'] = this.equipmentId
+ // this.loadData(1);
+ // },
methods: {
addMaterial() {
let ids = [];
@@ -378,31 +378,31 @@
this.$refs.actualMaterialSelect.list()
this.$refs.actualMaterialSelect.title = '鐗╂枡閫夋嫨'
},
- sendMaterialRecord(data, val) {
- let record = data.record
- const temp = [...this.dataSource]
- const target = temp[this.recordIndex]
- if (target) {
- target.materialId = record.id;
- target.materialName = record.name;
- target.materialNum = record.num;
- target.materialModel = record.model;
- target.materialSpecification = record.specification;
- target.unitId_dictText = record.unitId_dictText;
- this.dataSource = temp
- }
- },
+ // sendMaterialRecord(data, val) {
+ // let record = data.record
+ // const temp = [...this.dataSource]
+ // const target = temp[this.recordIndex]
+ // if (target) {
+ // target.materialId = record.id;
+ // target.materialName = record.name;
+ // target.materialNum = record.num;
+ // target.materialModel = record.model;
+ // target.materialSpecification = record.specification;
+ // target.unitId_dictText = record.unitId_dictText;
+ // this.dataSource = temp
+ // }
+ // },
clearList() {
this.dataSource = [];
this.ipagination.current = 1
},
- getUuiD(randomLength) {
- return Number(
- Math.random()
- .toString()
- .substr(2, randomLength) + Date.now()
- ).toString(36)
- },
+ // getUuiD(randomLength) {
+ // return Number(
+ // Math.random()
+ // .toString()
+ // .substr(2, randomLength) + Date.now()
+ // ).toString(36)
+ // },
handleLock(record) {
let that = this;
if (record.quantity == null || record.quantity == undefined || record.quantity == '') {
@@ -413,7 +413,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 +421,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 +436,7 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
@@ -472,50 +472,47 @@
this.loading = false
})
},
- },
- mounted() {
- let newActualMaterials = [];
- this.$bus.$on('selectionRows', (data) => {
+ getSelectRows(data){
+ let newActualMaterials = [];
for (let i = 0; i < data.length; i++) {
- var actualMaterial
- =
- {
- id: this.getUuiD(16),
- num: data[i].num,
+ newActualMaterials.push({
+ // id: this.getUuiD(16),
+ // num: data[i].num,
outboundOrderDetailId: data[i].id,
sparePartId: data[i].sparePartId,
- sparePartNum: data[i].spareNum,
- sparePartName: data[i].spareName,
- specification: data[i].specification,
- model: data[i].model,
- constructorName: data[i].constructorName,
- constructorId: data[i].constructorId,
- mainUnitName: data[i].mainUnitName,
- mainUnitId: data[i].mainUnitId,
+ // sparePartNum: data[i].spareNum,
+ // sparePartName: data[i].spareName,
+ // specification: data[i].specification,
+ // model: data[i].model,
+ // constructorName: data[i].constructorName,
+ // constructorId: data[i].constructorId,
+ // mainUnitName: data[i].mainUnitName,
+ // mainUnitId: data[i].mainUnitId,
mainQuantity: data[i].mainQuantity,
useQuantity: data[i].useQuantity,
availableQuantity: data[i].availableQuantity,
maintenanceOrderId: this.specialyMaintenanceOrderId,
equipmentId: this.equipmentId,
isLock: 'no'
- }
- newActualMaterials.push(actualMaterial);
+ })
}
let that = this
- let obj = obj = postAction(this.url.addInit, newActualMaterials)
- obj.then((res) => {
+ postAction(this.url.addInit, newActualMaterials).then((res) => {
if (res.success) {
that.$message.success(res.message)
-
that.$emit('ok')
} else {
that.$message.warning(res.message)
}
}).finally(res => {
- that.loadData();
newActualMaterials = []
+ that.loadData();
+
})
- })
+
+ }
+ },
+ mounted() {
},
}
--
Gitblit v1.9.3