|
|
|
@ -281,7 +281,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="终止数量" prop="cancelOrderForm-endCount"> |
|
|
|
<el-form-item label="终止数量"> |
|
|
|
<el-input v-model="cancelOrderForm.qty" type="number" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
@ -412,9 +412,6 @@ export default { |
|
|
|
'OM_WorkOrder-ArtId': [ |
|
|
|
{ required: true, message: '此项不能为空', trigger: 'blur' } |
|
|
|
], |
|
|
|
'cancelOrderForm-endCount': [ |
|
|
|
{ required: true, message: '此项不能为空', trigger: 'blur' } |
|
|
|
] |
|
|
|
}, |
|
|
|
terminateOrderForm:{}, |
|
|
|
cancelOrderForm: {}, |
|
|
|
@ -555,8 +552,6 @@ export default { |
|
|
|
'OM_WorkOrder-ParentOrderId': undefined, |
|
|
|
'OM_WorkOrder-UsedResourceId': undefined, |
|
|
|
'OM_WorkOrder-PlanQty': undefined, |
|
|
|
// 'OM_WorkOrder-PlanStartTime': undefined, |
|
|
|
// 'OM_WorkOrder-PlanEndTime': undefined, |
|
|
|
'OM_WorkOrder-ActStartTime': undefined, |
|
|
|
'OM_WorkOrder-ActEndTime': undefined, |
|
|
|
'OM_WorkOrderStatus-Status': undefined, |
|
|
|
@ -609,7 +604,6 @@ export default { |
|
|
|
this.detailsTimeHeaders = [ |
|
|
|
'OM_SerialOrder-PlanStartTime', |
|
|
|
'OM_SerialOrder-PlanEndTime', |
|
|
|
// 'OM_SerialOrder-ActStartTime', |
|
|
|
'OM_SerialOrder-ActEndTime', |
|
|
|
] |
|
|
|
this.detailsLoading = false |
|
|
|
@ -623,8 +617,6 @@ export default { |
|
|
|
let formData = response.data |
|
|
|
formData['OM_WorkOrder-PlanStartDate'] = this.dateTransCommon(formData['OM_WorkOrder-PlanStartDate']) |
|
|
|
formData['OM_WorkOrder-PlanEndDate'] = this.dateTransCommon(formData['OM_WorkOrder-PlanEndDate']) |
|
|
|
// formData['OM_WorkOrder-PlanStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanStartTime']) |
|
|
|
// formData['OM_WorkOrder-PlanEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanEndTime']) |
|
|
|
formData['OM_WorkOrder-ActStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActStartTime']) |
|
|
|
formData['OM_WorkOrder-ActEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActEndTime']) |
|
|
|
this.form = formData |
|
|
|
@ -651,12 +643,6 @@ export default { |
|
|
|
if (params['OM_WorkOrder-PlanEndDate']) { |
|
|
|
params['OM_WorkOrder-PlanEndDate'] = moment(params['OM_WorkOrder-PlanEndDate']).format('YYYYMMDD') |
|
|
|
} |
|
|
|
// if (params['OM_WorkOrder-PlanStartTime']) { |
|
|
|
// params['OM_WorkOrder-PlanStartTime'] = this.trimTrans(params['OM_WorkOrder-PlanStartTime']) |
|
|
|
// } |
|
|
|
// if (params['OM_WorkOrder-PlanEndTime']) { |
|
|
|
// params['OM_WorkOrder-PlanEndTime'] = this.trimTrans(params['OM_WorkOrder-PlanEndTime']) |
|
|
|
// } |
|
|
|
if (params['OM_WorkOrder-ActStartTime']) { |
|
|
|
params['OM_WorkOrder-ActStartTime'] = this.trimTrans(params['OM_WorkOrder-ActStartTime']) |
|
|
|
} |
|
|
|
@ -731,7 +717,7 @@ export default { |
|
|
|
// 确认终止已派工工单 |
|
|
|
submitCancelOrderForm() { |
|
|
|
this.$refs['cancelOrderForm'].validate(valid => { |
|
|
|
if (valid) { |
|
|
|
// if (valid) { |
|
|
|
setSancelrelease({ |
|
|
|
...this.cancelOrderForm, |
|
|
|
qty: Number(this.cancelOrderForm.qty) || 0 |
|
|
|
@ -740,7 +726,7 @@ export default { |
|
|
|
this.isSancelrelease = false |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
// } |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 当前要终止的订单 |
|
|
|
|
