From e7a91ff8da87d76f25fabee1a872bcea174d3a87 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 九月 2023 09:16:38 +0800
Subject: [PATCH] 保养、维修实际用料 bug修改
---
src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue | 122 ++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
index c706453..9071fba 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -106,10 +106,8 @@
</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>
</a-card>
@@ -143,7 +141,7 @@
equipmentId: {
type: String,
required: false,
- default: ''
+ default: '-1'
},
},
data() {
@@ -275,26 +273,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.dailyMaintenanceOrderId
- this.queryParam['equipmentId'] = val
- this.loadData(1);
- }
- }
+ // equipmentId: {
+ // immediate: true,
+ // handler(val) {
+ // this.clearList();
+ // this.queryParam['maintenanceOrderId'] = this.dailyMaintenanceOrderId
+ // this.queryParam['equipmentId'] = val
+ // this.loadData(1);
+ // }
+ // }
},
- created() {
- this.queryParam['maintenanceOrderId'] = this.dailyMaintenanceOrderId;
- this.queryParam['equipmentId'] = this.equipmentId
- this.loadData(1);
- },
+ // created() {
+ // this.queryParam['maintenanceOrderId'] = this.dailyMaintenanceOrderId;
+ // this.queryParam['equipmentId'] = this.equipmentId
+ // this.loadData(1);
+ // },
methods: {
addMaterial() {
let ids = [];
@@ -379,31 +377,32 @@
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 == '') {
@@ -474,47 +473,46 @@
})
},
},
+
mounted() {
let newActualMaterials = [];
- this.$bus.$on('selectionRows', (data) => {
+ this.$bus.$on('selection2Rows', (data) => {
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.dailyMaintenanceOrderId,
equipmentId: this.equipmentId,
isLock: 'no'
- }
- newActualMaterials.push(actualMaterial);
+ })
}
+ debugger
let that = this
- let obj = obj = postAction(this.url.addInit, newActualMaterials)
- obj.then((res) => {
+ // newActualMaterials = this.dataSource
+ 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(1);
+
})
})
},
--
Gitblit v1.9.3