From 4dbfef45b7a45a0ce00f3edd89e9e6948be79ae0 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 25 Nov 2024 09:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=90=88=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/repair/repair.js | 10 +++++
.../repair/repairManage/component/edit.vue | 44 +++++++++++--------
.../repair/repairManage/component/home.vue | 1 +
3 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js
index 6a773ab3..3782efe1 100644
--- a/src/api/repair/repair.js
+++ b/src/api/repair/repair.js
@@ -10,6 +10,16 @@ export function getRepairTaskList(query) {
params: query
})
}
+
+// // 查询维修任务一级列表
+// export function getRepaiDocumentInfo(query) {
+// return request({
+// url: '/material/repair/getRepaiDocumentInfo',
+// method: 'get',
+// params: query
+// })
+// }
+
// 查询维修任务机具列表二级列表
export function getAppRepairMaTypeList(query) {
return request({
diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 647314ba..d98389c4 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -94,13 +94,13 @@
+ >
+
@@ -1000,7 +1001,7 @@ export default {
// 遮罩层
loading: false,
// 选中数组
- ids: [],
+ idsTemp: [],
// 非单个禁用
single: true,
// 非多个禁用
@@ -1263,30 +1264,37 @@ export default {
const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data;
this.equipmentList.forEach((e) => {
- e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+ e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
});
// this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
},
// 多选框选中数据
handleSelectionChange(selection) {
this.queryParams.equipmentList = selection;
- this.idsList = [];
- this.ids = selection.map((item) => item.id);
- selection.forEach((item) => {
- this.idsList.push(item.id);
- });
+ // this.idsList = [];
+ selection.map((item) => {
+ if(item.ids.length>0){
+ item.ids.forEach((itemTwo =>{
+ this.idsTemp.push(itemTwo)
+ }))
+ }
+ })
+ // this.idsTemp = selection.map((item) => item.ids);
+ // selection.forEach((item) => {
+ // this.idsList.push(item.id);
+ // });
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 批量合格按钮操作 */
handleAdd() {
- if (this.ids.length == 0) {
+ if (this.idsTemp.length == 0) {
this.$alert("请至少勾选一条数据", "提示", {
type: "warning",
confirmButtonText: "确定",
});
}else{
- auditPass(this.idsList).then((response) => {
+ auditPass(this.idsTemp).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess("通过成功");
}
@@ -1295,8 +1303,8 @@ export default {
},
//单个合格按钮操作
handleAddSingle(row){
- const ids = [];
- ids.push(row.id);
+ let ids = [];
+ ids = row.ids;
this.$modal
.confirm("是否确认合格所选择的数据项?")
.then(function () {
@@ -1408,7 +1416,7 @@ export default {
const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data;
this.equipmentList.forEach((e) => {
- e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+ e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
});
this.openCode = false;
// console.log(this.equipmentList)
@@ -1424,7 +1432,7 @@ export default {
const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data;
this.equipmentList.forEach((e) => {
- e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+ e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
});
this.openCode = false;
},
@@ -1880,7 +1888,7 @@ export default {
const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data;
this.equipmentList.forEach((e) => {
- e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+ e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
});
this.openNum=false;
}
@@ -1931,7 +1939,7 @@ export default {
const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data;
this.equipmentList.forEach((e) => {
- e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+ e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
});
this.openNum=false;
}
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 2c77e371..03ac1667 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -425,6 +425,7 @@
import {
getRepairTaskList,
+ getRepaiDocumentInfo,
rejectRepair,
sendList,
getRepairInfo,