|
|
|
@ -288,7 +288,8 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'计划班次:'"> |
|
|
|
<!-- <el-input v-model="scheduledingData.shiftId" :disabled="scheduledingDataFlag1" style="width: 130px"></el-input>--> |
|
|
|
<el-select v-model="scheduledingData.shiftId" :disabled="scheduledingDataFlag1" style="width: 130px" placeholder="请选择"> |
|
|
|
<el-select v-model="scheduledingData.shiftId" :disabled="scheduledingDataFlag1" style="width: 130px" |
|
|
|
placeholder="请选择"> |
|
|
|
<el-option |
|
|
|
v-for="(item,index) in selectList" |
|
|
|
:key="index" |
|
|
|
@ -321,8 +322,8 @@ |
|
|
|
savePlan, |
|
|
|
getWorkPlanData, |
|
|
|
delPlan, |
|
|
|
getShiftData, |
|
|
|
} from "@/api/prd.js" |
|
|
|
getShiftData |
|
|
|
} from '@/api/prd.js' |
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'productionDispatch', |
|
|
|
@ -338,7 +339,7 @@ |
|
|
|
planStartDate: '', |
|
|
|
needDate: '', |
|
|
|
schedulingSize: '', |
|
|
|
unSchedulingSize:'', |
|
|
|
unSchedulingSize: '' |
|
|
|
}, |
|
|
|
dataListSelections: [], |
|
|
|
scheduledingData: { |
|
|
|
@ -353,7 +354,7 @@ |
|
|
|
site: this.$store.state.user.site, |
|
|
|
productionType: '生产订单', |
|
|
|
planAdd: 0, |
|
|
|
partNo:'', |
|
|
|
partNo: '' |
|
|
|
}, |
|
|
|
scheduledingDataFlag1: false, |
|
|
|
scheduledingDataFlag3: true, |
|
|
|
@ -365,80 +366,78 @@ |
|
|
|
endDate1: '', |
|
|
|
startDate2: '', |
|
|
|
endDate2: '', |
|
|
|
status: "('已下达','已发料','已入库','已开工')", |
|
|
|
status: '(\'已下达\',\'已发料\',\'已入库\',\'已开工\')', |
|
|
|
partNo: '', |
|
|
|
startDate3: '', |
|
|
|
endDate3: '', |
|
|
|
site:this.$store.state.user.site , |
|
|
|
site: this.$store.state.user.site |
|
|
|
}, |
|
|
|
// table高度 |
|
|
|
height:200, |
|
|
|
height: 200 |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
this.$nextTick(() => { |
|
|
|
|
|
|
|
this.height = window.innerHeight - 270; |
|
|
|
this.height = window.innerHeight - 270 |
|
|
|
}) |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
search () { |
|
|
|
this.getData(); |
|
|
|
this.getData() |
|
|
|
}, |
|
|
|
// 维护日计划界面 |
|
|
|
schedulingModal () { |
|
|
|
if (this.scheduledModelData.unSchedulingSize == 0) { |
|
|
|
this.$alert("该日计划已排产完毕无需新增!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
this.$alert('该日计划已排产完毕无需新增!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
this.scheduledingDataFlag1 = false; |
|
|
|
this.scheduledingDataFlag3 = true; |
|
|
|
this.scheduledingData.userName = this.$store.state.user.name; |
|
|
|
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate; |
|
|
|
this.scheduledingData.needDate = this.scheduledModelData.needDate; |
|
|
|
this.scheduledingData.orderNo = this.scheduledModelData.orderNo; |
|
|
|
this.scheduledingData.orderDate = this.scheduledModelData.planStartDate; |
|
|
|
this.scheduledingData.planAdd = 0; |
|
|
|
this.scheduledingData.orderQty = ""; |
|
|
|
this.scheduledingData.shiftId = ""; |
|
|
|
this.schedulingModalFlag = true; |
|
|
|
this.scheduledingDataFlag1 = false |
|
|
|
this.scheduledingDataFlag3 = true |
|
|
|
this.scheduledingData.userName = this.$store.state.user.name |
|
|
|
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate |
|
|
|
this.scheduledingData.needDate = this.scheduledModelData.needDate |
|
|
|
this.scheduledingData.orderNo = this.scheduledModelData.orderNo |
|
|
|
this.scheduledingData.orderDate = this.scheduledModelData.planStartDate |
|
|
|
this.scheduledingData.planAdd = 0 |
|
|
|
this.scheduledingData.orderQty = '' |
|
|
|
this.scheduledingData.shiftId = '' |
|
|
|
this.schedulingModalFlag = true |
|
|
|
}, |
|
|
|
// 多选数据 |
|
|
|
selectionChangeHandle (val) { |
|
|
|
this.dataListSelections = val; |
|
|
|
this.dataListSelections = val |
|
|
|
}, |
|
|
|
// 多选框选中触发判断 |
|
|
|
checkSelections (row) { |
|
|
|
if(row.status=="已计划"||row.status=="已取消"||row.status=="已关闭"){ |
|
|
|
return false; |
|
|
|
if (row.status == '已计划' || row.status == '已取消' || row.status == '已关闭') { |
|
|
|
return false |
|
|
|
} |
|
|
|
if (row.schedulingSize >= row.orderQty) { |
|
|
|
return false; |
|
|
|
return false |
|
|
|
} |
|
|
|
return true; |
|
|
|
return true |
|
|
|
}, |
|
|
|
// 排产信息界面 |
|
|
|
openScheduleModel (row) { |
|
|
|
|
|
|
|
if(row.status=="已计划"||row.status=="已取消"||row.status=="已关闭"){ |
|
|
|
this.$alert("该订单状态为"+row.status+"无法排产", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (row.status == '已计划' || row.status == '已取消' || row.status == '已关闭') { |
|
|
|
this.$alert('该订单状态为' + row.status + '无法排产', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
let list = {orderNo: row.orderNo} |
|
|
|
getSchedulingSize(list).then(({data}) => { |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize; |
|
|
|
this.scheduledModelData.unSchedulingSize = row.lotSize - data.schedulingSize; |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize |
|
|
|
this.scheduledModelData.unSchedulingSize = row.lotSize - data.schedulingSize |
|
|
|
}) |
|
|
|
this.scheduledingData.lotSize = row.lotSize; |
|
|
|
this.scheduledingData.partNo = row.partNo; |
|
|
|
this.scheduledModelData.needDate = row.needDate; |
|
|
|
this.scheduledModelData.planStartDate = row.planStartDate; |
|
|
|
this.scheduledModelData.orderNo = row.orderNo; |
|
|
|
this.schedulingFlag = true; |
|
|
|
this.scheduledingData.lotSize = row.lotSize |
|
|
|
this.scheduledingData.partNo = row.partNo |
|
|
|
this.scheduledModelData.needDate = row.needDate |
|
|
|
this.scheduledModelData.planStartDate = row.planStartDate |
|
|
|
this.scheduledModelData.orderNo = row.orderNo |
|
|
|
this.schedulingFlag = true |
|
|
|
let data1 = {orderNo: row.orderNo} |
|
|
|
getWorkPlanData(data1).then(({data}) => { |
|
|
|
this.scheduleTableData = data.rows |
|
|
|
@ -447,47 +446,43 @@ |
|
|
|
|
|
|
|
// 查询 |
|
|
|
getData () { |
|
|
|
|
|
|
|
|
|
|
|
getShopOrderData(JSON.parse(JSON.stringify(this.searchData))).then(({data}) => { |
|
|
|
this.tableData = data.rows; |
|
|
|
this.tableData = data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
planSave () { |
|
|
|
|
|
|
|
if (this.scheduledingData.orderDate == "" || null == this.scheduledingData.orderDate) { |
|
|
|
this.$alert("请选择计划日期!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.orderDate == '' || this.scheduledingData.orderDate == null) { |
|
|
|
this.$alert('请选择计划日期!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.orderQty == "" || null == this.scheduledingData.orderQty) { |
|
|
|
this.$alert("请输入排产数量!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.orderQty == '' || this.scheduledingData.orderQty == null) { |
|
|
|
this.$alert('请输入排产数量!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.orderQty <= 0) { |
|
|
|
this.$alert("排产数量必须大于0!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
this.$alert('排产数量必须大于0!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.shiftId == "") { |
|
|
|
this.$alert("请输入排产班次!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.shiftId == '') { |
|
|
|
this.$alert('请输入排产班次!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
// this.scheduledingData.orderDate = this.format(this.scheduledingData.orderDate,'yyyy-MM-dd') |
|
|
|
|
|
|
|
|
|
|
|
savePlan(this.scheduledingData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize; |
|
|
|
this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize; |
|
|
|
this.schedulingModalFlag = false; |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize |
|
|
|
this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize |
|
|
|
this.schedulingModalFlag = false |
|
|
|
let data1 = {orderNo: this.scheduledModelData.orderNo} |
|
|
|
getWorkPlanData(data1).then(({data}) => { |
|
|
|
this.scheduleTableData = data.rows |
|
|
|
@ -503,41 +498,41 @@ |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
planSaveOn () { |
|
|
|
if (this.scheduledingData.orderDate == "" || null == this.scheduledingData.orderDate) { |
|
|
|
this.$alert("请选择计划日期!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.orderDate == '' || this.scheduledingData.orderDate == null) { |
|
|
|
this.$alert('请选择计划日期!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.orderQty == "" || null == this.scheduledingData.orderQty) { |
|
|
|
this.$alert("请输入排产数量!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.orderQty == '' || this.scheduledingData.orderQty == null) { |
|
|
|
this.$alert('请输入排产数量!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.shiftId == "") { |
|
|
|
this.$alert("请输入排产班次!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
if (this.scheduledingData.shiftId == '') { |
|
|
|
this.$alert('请输入排产班次!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.scheduledingData.orderQty <= 0) { |
|
|
|
this.$alert("排产数量必须大于0!", '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
return false; |
|
|
|
this.$alert('排产数量必须大于0!', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
savePlan(this.scheduledingData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
getShiftData().then(({data}) => { |
|
|
|
this.shiftData = data.rows; |
|
|
|
this.shiftData = data.rows |
|
|
|
}) |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
@ -549,31 +544,31 @@ |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 修改日计划 |
|
|
|
editSchedule (row) { |
|
|
|
this.scheduledingDataFlag1 = true; |
|
|
|
this.scheduledingDataFlag3 = false; |
|
|
|
this.scheduledingData.userName = this.$store.state.user.name; |
|
|
|
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate; |
|
|
|
this.scheduledingData.needDate = this.scheduledModelData.needDate; |
|
|
|
this.scheduledingData.orderNo = this.scheduledModelData.orderNo; |
|
|
|
this.scheduledingData.orderDate = row.orderDate; |
|
|
|
this.scheduledingData.planAdd = 1; |
|
|
|
this.scheduledingData.orderQty = row.orderQty; |
|
|
|
this.scheduledingData.shiftId = row.shiftId; |
|
|
|
this.schedulingModalFlag = true; |
|
|
|
this.scheduledingDataFlag1 = true |
|
|
|
this.scheduledingDataFlag3 = false |
|
|
|
this.scheduledingData.userName = this.$store.state.user.name |
|
|
|
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate |
|
|
|
this.scheduledingData.needDate = this.scheduledModelData.needDate |
|
|
|
this.scheduledingData.orderNo = this.scheduledModelData.orderNo |
|
|
|
this.scheduledingData.orderDate = row.orderDate |
|
|
|
this.scheduledingData.planAdd = 1 |
|
|
|
this.scheduledingData.orderQty = row.orderQty |
|
|
|
this.scheduledingData.shiftId = row.shiftId |
|
|
|
this.schedulingModalFlag = true |
|
|
|
}, |
|
|
|
// 刪除 |
|
|
|
deleteSchedule (row) { |
|
|
|
let delData = { |
|
|
|
orderNo: row.orderNo, |
|
|
|
orderQty: row.orderQty, |
|
|
|
orderRef1: row.orderRef1, |
|
|
|
orderRef1: row.orderRef1 |
|
|
|
} |
|
|
|
this.$confirm(`是否删除此条记录?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
@ -582,9 +577,9 @@ |
|
|
|
}).then(() => { |
|
|
|
delPlan(delData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize; |
|
|
|
this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize; |
|
|
|
this.getData(); |
|
|
|
this.scheduledModelData.schedulingSize = data.schedulingSize |
|
|
|
this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize |
|
|
|
this.getData() |
|
|
|
let data1 = {orderNo: this.scheduledModelData.orderNo} |
|
|
|
getWorkPlanData(data1).then(({data}) => { |
|
|
|
this.scheduleTableData = data.rows |
|
|
|
@ -598,41 +593,39 @@ |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
}); |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getTime (date) { |
|
|
|
if (date == '') { |
|
|
|
return "" |
|
|
|
return '' |
|
|
|
} else { |
|
|
|
let json_date = new Date(date).toJSON(); |
|
|
|
let json_date = new Date(date).toJSON() |
|
|
|
return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '') |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
getSelectData () { |
|
|
|
this.selectList=[]; |
|
|
|
this.selectList = [] |
|
|
|
getShiftData().then(({data}) => { |
|
|
|
let list=data.rows; |
|
|
|
let list = data.rows |
|
|
|
for (let i = 0; i < list.length; i++) { |
|
|
|
let resultData = { |
|
|
|
value: list[i].id, |
|
|
|
label: list[i].shiftdesc |
|
|
|
} |
|
|
|
this.selectList.push(resultData); |
|
|
|
this.selectList.push(resultData) |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
created () { |
|
|
|
this.getSelectData(); |
|
|
|
this.getSelectData() |
|
|
|
} |
|
|
|
} |
|
|
|
</script> |
|
|
|
|