diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue index ae2dae38..33b9b60b 100644 --- a/src/views/order/base/orderGroup/orderGroupDetailData.vue +++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue @@ -70,7 +70,7 @@ 废片数量 - 该字段未绑定 + {{orderGroupMsg.nokQuantity}} @@ -144,7 +144,7 @@ 废片数量 - 该字段未绑定 + {{item.nokQuantity}} diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index 4b46ebd9..b3c722ed 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -401,9 +401,9 @@ export default { }, // 完成,终止,作废 handleEditStatus(val, tip, status) { - console.log(val) + let _this = this if (val.workOrderNum > 0) {//有下级工单 - this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { + _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { type: 'warning', distinguishCancelAndClose: true, confirmButtonText: '同步', @@ -411,26 +411,26 @@ export default { }).then(function() { console.log('同步') orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }).catch(action => { if (action === 'cancel') { console.log('不同步') orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }else { return console.log('关闭') } }) }else{// 无下级工单 - this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { + _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { return orderStatusSet({ id: val.id, status: status}) }).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }).catch(() => {}); } }, diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue index 93ec49cd..13616609 100644 --- a/src/views/order/base/orderManage/orderDetailData.vue +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -74,7 +74,7 @@ 废片数量 - 该字段未绑定 + {{orderMsg.nokQuantity}}