|
|
|
@ -81,7 +81,7 @@ |
|
|
|
<el-option label="已派工完" value="ROUND(ISNULL(SL.QtyScheduled,0),3) >=ROUND(so.LotSize,3)"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心编号：'"> |
|
|
|
<el-form-item :label="'加工中心编码：'"> |
|
|
|
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
@ -137,7 +137,7 @@ |
|
|
|
<el-form-item label="订单号:"> |
|
|
|
<el-input v-model="schedulingModalData.orderNo" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="工厂编号:"> |
|
|
|
<el-form-item label="工厂编码:"> |
|
|
|
<el-input v-model="schedulingModalData.site" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="要求完工日期:"> |
|
|
|
@ -350,6 +350,7 @@ |
|
|
|
<el-table |
|
|
|
height="200" |
|
|
|
:data="schedulesModalTableData" |
|
|
|
ref="tables" |
|
|
|
border |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column |
|
|
|
@ -735,6 +736,22 @@ |
|
|
|
shiftList:[], |
|
|
|
} |
|
|
|
}, |
|
|
|
watch: { |
|
|
|
searchData: { |
|
|
|
deep: true, |
|
|
|
handler: function (newV, oldV) { |
|
|
|
this.searchData.partNo = this.searchData.partNo.toUpperCase() |
|
|
|
this.searchData.partNo = this.searchData.partNo.toUpperCase() |
|
|
|
} |
|
|
|
}, |
|
|
|
modelData3: { |
|
|
|
deep: true, |
|
|
|
handler: function (newV, oldV) { |
|
|
|
this.modelData3.resourceID = this.modelData3.resourceID.toUpperCase() |
|
|
|
|
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
this.$nextTick(()=>{ |
|
|
|
this.height = window.innerHeight - 220; |
|
|
|
@ -824,7 +841,7 @@ |
|
|
|
scheduleQty: '', |
|
|
|
resourceId: this.schedulingModalData.resourceId, |
|
|
|
shiftNo: this.schedulingModalData.shiftNo, |
|
|
|
scheduleDate: null, |
|
|
|
scheduleDate: new Date(), |
|
|
|
operatorId:this.schedulingModalData.operatorId, |
|
|
|
}) |
|
|
|
this.sumQty += this.schedulingModalData.scheduleQty |
|
|
|
@ -913,7 +930,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
if(flag){ |
|
|
|
this.$confirm(`派工日期大于需求完成日期，是否继续`, '提示', { |
|
|
|
this.$confirm(`派工日期晚于需求完成日期，是否继续`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
@ -1009,12 +1026,16 @@ |
|
|
|
} |
|
|
|
this.schedulesModalTableData=JSON.parse(JSON.stringify(this.dataListSelections)) |
|
|
|
this.schedulesModalData = [] |
|
|
|
this.schedulesModalData.scheduleDate=new Date(); |
|
|
|
let inData={ |
|
|
|
site:this.dataListSelections[0].site, |
|
|
|
workCenterNo:this.dataListSelections[0].workCenterNo |
|
|
|
} |
|
|
|
this.getAvailableResourceList(inData) |
|
|
|
this.getWorkCenterOperatorList(inData); |
|
|
|
// this.$nextTick(()=>{ |
|
|
|
// this.$refs['tables'].doLayout(); |
|
|
|
// }); |
|
|
|
this.schedulesModalFlag=true; |
|
|
|
|
|
|
|
}, |
|
|
|
|
