diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index 420e212..58e99fd 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -92,3 +92,12 @@ export function downWorkorder(workorderId) { method: 'post' }); } + +// 提交修改工单接口 +export function subChangeWorkOrderM(data){ + return request({ + url:'/plan/pro/workorder/subChangeWorkOrderM', + method:'post', + data:data + }) + } \ No newline at end of file diff --git a/src/views/device/equTeam/selectSinglePerson.vue b/src/views/device/equTeam/selectSinglePerson.vue index 34ade19..258bcfa 100644 --- a/src/views/device/equTeam/selectSinglePerson.vue +++ b/src/views/device/equTeam/selectSinglePerson.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index b43eada..a19ba46 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -659,7 +659,12 @@ form.orderDesc }} - + - + - - - - - + + + + +
确 定 @@ -387,107 +392,103 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 确 定 - 取 消 -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ @@ -555,17 +556,17 @@ export default { label: "维修委外", }, ], - //选择是否停机 - workStatusOption: [ - { - workStatus: "1", - label: "完成", - }, - { - workStatus: "0", - label: "未完成", - }, - ], + //选择是否停机 + workStatusOption: [ + { + workStatus: "1", + label: "完成", + }, + { + workStatus: "0", + label: "未完成", + }, + ], // 表单参数 form: {}, // 表单校验 @@ -624,7 +625,7 @@ export default { updateBy: null, updateTime: null, factoryCode: null, - workStatus:null, + workStatus: null, }; this.resetForm("form"); }, diff --git a/src/views/device/outsourceWorkOrder/selectSingleEquipment.vue b/src/views/device/outsourceWorkOrder/selectSingleEquipment.vue index bb8b226..898f78a 100644 --- a/src/views/device/outsourceWorkOrder/selectSingleEquipment.vue +++ b/src/views/device/outsourceWorkOrder/selectSingleEquipment.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 7e41bc9..2c15fc2 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1444,27 +1444,27 @@ export default { this.detailList = null; this.detailList = response.data.detailList; if (this.detailList != null) { - //检查项遍历 - var standards = []; - this.detailList.forEach((item1) => { - //检查项名字 - item1.standardList.forEach((item) => { - var standard = {}; - standard.id = item.id; - standard.itemName = item1.itemName; - standard.itemMethod = item1.itemMethod; - standard.standardName = item.standardName; - standard.detailUpLimit = item.detailUpLimit; - standard.detailDownLimit = item.detailDownLimit; - standard.detailUnit = item.detailUnit; - standard.detailReach = item.detailReach; - standard.actualValue = item.actualValue; - standard.standardType = item.standardType; - standards.push(standard); + //检查项遍历 + var standards = []; + this.detailList.forEach((item1) => { + //检查项名字 + item1.standardList.forEach((item) => { + var standard = {}; + standard.id = item.id; + standard.itemName = item1.itemName; + standard.itemMethod = item1.itemMethod; + standard.standardName = item.standardName; + standard.detailUpLimit = item.detailUpLimit; + standard.detailDownLimit = item.detailDownLimit; + standard.detailUnit = item.detailUnit; + standard.detailReach = item.detailReach; + standard.actualValue = item.actualValue; + standard.standardType = item.standardType; + standards.push(standard); + }); }); - }); - this.detailList = standards; - console.log("111111111111",this.detailList); + this.detailList = standards; + console.log("111111111111", this.detailList); } this.openWrite = true; this.title = "填写维修记录"; diff --git a/src/views/device/repairOrder/selectSingleEquipment.vue b/src/views/device/repairOrder/selectSingleEquipment.vue index 97c6145..e06246a 100644 --- a/src/views/device/repairOrder/selectSingleEquipment.vue +++ b/src/views/device/repairOrder/selectSingleEquipment.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/repairOrder/selectSinglePerson.vue b/src/views/device/repairOrder/selectSinglePerson.vue index e5c25d5..d1a95be 100644 --- a/src/views/device/repairOrder/selectSinglePerson.vue +++ b/src/views/device/repairOrder/selectSinglePerson.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue index 6bdfebe..74d2a4b 100644 --- a/src/views/device/repairOrder/selectSpareParts.vue +++ b/src/views/device/repairOrder/selectSpareParts.vue @@ -1,280 +1,358 @@ diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue index 9e366a2..22712d0 100644 --- a/src/views/device/repairOrder/selectSparePartsLedger.vue +++ b/src/views/device/repairOrder/selectSparePartsLedger.vue @@ -1,275 +1,358 @@ - diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue index 8f8c029..fd55506 100644 --- a/src/views/device/repairOrderReport/index.vue +++ b/src/views/device/repairOrderReport/index.vue @@ -203,11 +203,9 @@ fixed > - -
- - +
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - - + + - + - - - + + + - + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - + - - - - - - - + + + + + + - - - -
- 确 定 - 取 消 -
- -
+ +
+ 确 定 + 取 消 +
+ +
diff --git a/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue index 11fe0a9..111400c 100644 --- a/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue +++ b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index cd14813..1844df3 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -1,37 +1,64 @@ diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 0b89dec..e1f79d7 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -161,6 +161,18 @@ >工单详情 + + 设备修改 + + @@ -538,6 +550,75 @@ 确定 + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ @@ -549,7 +630,7 @@ import { downWorkorder, getOrderAndWork,getProSortNo, getWorkBatchList, - subChangeWorkOrder, + subChangeWorkOrder,subChangeWorkOrderM, checkWorkOrder } from '@/api/plan/workorder' import moment from 'moment'; @@ -625,6 +706,9 @@ export default { materialCode:null, materialName:null }, + splitFormM: { + prodLineCodeArray: [] + }, // 遮罩层 loading: true, // 选中数组 @@ -646,6 +730,7 @@ export default { title: "", // 是否显示弹出层 open: false, + openM:false, // 查询参数 queryParams: { productDateArray: [new Date(), new Date()], @@ -703,6 +788,7 @@ export default { /**********************************/ eRouteProps: {multiple: true}, eRouteOptions: [], + eRouteOptionsM: [], // 班次 workShift: [], //组成白坯物料弹窗 @@ -940,7 +1026,7 @@ export default { } setAtrr1(this.productData[0], this.splitData[0]); - + } }) @@ -1434,7 +1520,7 @@ export default { } setAtrr1(this.productData[0], this.splitData[0]); - + } }) @@ -1443,10 +1529,72 @@ export default { this.title = "生产工单详情"; this.showDetail = false; }, + //工单设备修改开始-----》》》 + editMachine(row) { + // 数据初始化 + this.reset(); + this.splitData = []; + this.productData = []; + this.splitFormM = { + prodLineCodeArray: [], + } + + // 获取工艺设备信息 + getProEquipment(this.selectWork.routeCode).then(response2 => { + this.eRouteOptionsM = response2.data + }) + + getOrderAndWork(this.selectWork).then(response => { + // 设置选择机型 + this.splitFormM.prodLineCodeArray = response.data.workOrder.prodLineCodeArray + this.splitData.push(response.data.workOrder) + this.productData.push(response.data.order) + this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格 + this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格 + this.$nextTick(() => { + // 使用$nextTick来等待DOM更新完成 + this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格 + this.proLoading = false // 设置加载状态为false，表示加载完成 + }) + this.$nextTick(() => { + // 使用$nextTick来等待DOM更新完成 + this.refreshWorkerTable = true // 立即将refreshProTable设置为true，显示表格 + this.workerLoading = false // 设置加载状态为false，表示加载完成 + }) + }) + + this.openM = true; + this.titleM = "生产工单设备修改"; + + }, + //工单设备修改结束-----《《《《《《 + + // 工单设备变更-变更提交按钮 + submitFormM() { + //下面是请求处理 + const data = { + proOrderWorkorder: this.selectWork, + prodLineCodeArray: this.splitFormM.prodLineCodeArray + } + subChangeWorkOrderM(data).then(response => { + if (response.code == 500) { + this.$modal.msgError(response.msg) + return + } + this.getList() + this.$modal.msgSuccess('提交成功') + }) + // 清除缓存 + this.splitFormM = { + prodLineCodeArray: [] + } + this.openM = false + }, // 取消按钮 cancel() { this.open = false; + this.openM = false; this.showDetail = true; this.reset(); },