|
|
|
@ -51,11 +51,12 @@ |
|
|
|
<fieldset class="customer-field" style="margin-left: 680px; margin-top: 0px; width: 135px;height: 108px" > |
|
|
|
<legend>排序</legend><br> |
|
|
|
<el-form :inline="true" style="margin-top: -10px; margin-bottom: 15px;" label-position="top" label-width="100px" > |
|
|
|
<el-form-item :label="''" style="margin-bottom: 5px;margin-top: 8px"> |
|
|
|
<el-form-item :label="''" style="margin-bottom: 5px;margin-top: 0px"> |
|
|
|
<el-radio-group v-model="searchData.sortField"> |
|
|
|
<el-radio label="order by needDate">要求完工日期</el-radio> |
|
|
|
<el-radio label="order by orderNo">订单号</el-radio> |
|
|
|
<el-radio label="order by partNo">产品编码</el-radio> |
|
|
|
<el-radio label="order by PartDesc">产品名称</el-radio> |
|
|
|
</el-radio-group> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
@ -124,15 +125,15 @@ |
|
|
|
<el-table-column |
|
|
|
prop="scheduleDate" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="50" |
|
|
|
align="center" |
|
|
|
min-width="60" |
|
|
|
label="日期"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="info" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="200" |
|
|
|
min-width="180" |
|
|
|
label="休息时间览表"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -172,7 +173,7 @@ |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="right" |
|
|
|
min-width="60" |
|
|
|
label="工序号"> |
|
|
|
</el-table-column> |
|
|
|
@ -341,7 +342,7 @@ |
|
|
|
<el-table-column |
|
|
|
prop="timeRequired" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="right" |
|
|
|
min-width="100" |
|
|
|
label="计划时间"> |
|
|
|
</el-table-column> |
|
|
|
@ -575,7 +576,7 @@ |
|
|
|
<el-button type="primary" @click="scheduledModalFlag = false">关闭</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<div class="inputTable"> |
|
|
|
<div class="inputTable "> |
|
|
|
<el-table |
|
|
|
height="200" |
|
|
|
:data="schedulingModalTableData" |
|
|
|
@ -606,7 +607,7 @@ |
|
|
|
min-width="80" |
|
|
|
label="排产数量"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-model="scope.row.scheduleQty" type="number" @change="changeSum" style="width:98%"></el-input> |
|
|
|
<el-input v-model="scope.row.scheduleQty" type="number" @change="changeSum" placeholder="请输入数量" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -655,9 +656,9 @@ |
|
|
|
<!-- <el-button type="primary" :disabled="bannersBut" @click="saveBanners()">确定</el-button>--> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog title="查看负荷" :close-on-click-modal="false" v-drag :visible.sync="hasScheduledModalFlag" width="400px"> |
|
|
|
<el-dialog title="查看负荷" :close-on-click-modal="false" v-drag :visible.sync="hasScheduledModalFlag" width="650px"> |
|
|
|
<el-table |
|
|
|
height="300" |
|
|
|
height="260" |
|
|
|
:data="hasScheduledData" |
|
|
|
border |
|
|
|
style="width: 100%"> |
|
|
|
@ -671,10 +672,24 @@ |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="right" |
|
|
|
min-width="80" |
|
|
|
label="工序号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="operationDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="100" |
|
|
|
label="工序名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="timeRequired" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="100" |
|
|
|
label="计划时间"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="qtyRequired" |
|
|
|
header-align="center" |
|
|
|
@ -690,6 +705,10 @@ |
|
|
|
label="班次编码"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px" class="inputTable"> |
|
|
|
<label style="font-size: 11px">合计-计划时间:</label> |
|
|
|
<el-input v-model="sumTime" readonly style="width: 100px;text-align: right;border: 0px"></el-input> |
|
|
|
</el-form> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog title="修改顺序" :close-on-click-modal="false" v-drag :visible.sync="changeModalFlag" width="700px"> |
|
|
|
<div class="inputTable"> |
|
|
|
@ -718,7 +737,7 @@ |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="right" |
|
|
|
min-width="80" |
|
|
|
label="工序号"> |
|
|
|
</el-table-column> |
|
|
|
@ -775,6 +794,7 @@ |
|
|
|
}, |
|
|
|
data () { |
|
|
|
return { |
|
|
|
sumTime:'', |
|
|
|
shiftNoList: [], |
|
|
|
tagNo:'', |
|
|
|
tagNo2:'', |
|
|
|
@ -786,7 +806,7 @@ |
|
|
|
partNo:'', |
|
|
|
date3:'', |
|
|
|
date4:'', |
|
|
|
sortField:'', |
|
|
|
sortField:'order by needDate', |
|
|
|
scheduleDate:new Date(), |
|
|
|
site:this.$store.state.user.site, |
|
|
|
workCenterNo:'', |
|
|
|
@ -836,6 +856,7 @@ |
|
|
|
getShiftData().then(({data}) => { |
|
|
|
let list = data.rows |
|
|
|
for (let i = 0; i < list.length; i++) { |
|
|
|
this.allShiftNoList=[]; |
|
|
|
let resultData = { |
|
|
|
value: list[i].shiftno, |
|
|
|
label: list[i].shiftno+'('+list[i].shiftdesc+')' |
|
|
|
@ -975,7 +996,7 @@ |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
this.schedulingModalTableData.push({ scheduleQty:0, |
|
|
|
this.schedulingModalTableData.push({ scheduleQty:'', |
|
|
|
resourceId:this.schedulingModalData.resourceId, |
|
|
|
shiftNo:this.schedulingModalData.shiftNo, |
|
|
|
scheduleDate:null, |
|
|
|
@ -1053,13 +1074,22 @@ |
|
|
|
return false |
|
|
|
} |
|
|
|
let inData={ |
|
|
|
site:row.site, |
|
|
|
site:this.schedulingModalData.site, |
|
|
|
sResourceID:row.resourceId, |
|
|
|
sScheduledDate:row.scheduleDate, |
|
|
|
sShiftNo:row.shiftNo, |
|
|
|
} |
|
|
|
getHasScheduledData(inData).then(({data}) => { |
|
|
|
this.hasScheduledData = data.rows |
|
|
|
let number=0; |
|
|
|
if(this.hasScheduledData.length>0){ |
|
|
|
for (let i = 0; i <this.hasScheduledData.length ; i++) { |
|
|
|
if(this.hasScheduledData[i].timeRequired!=null&&this.hasScheduledData[i].timeRequired!=''){ |
|
|
|
number+=Number(this.hasScheduledData[i].timeRequired) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
this.sumTime=number; |
|
|
|
}) |
|
|
|
this.hasScheduledModalFlag=true; |
|
|
|
}, |
|
|
|
@ -1122,6 +1152,7 @@ |
|
|
|
scheduleDate:this.searchData.scheduleDate, |
|
|
|
scheduleTime:this.searchData.scheduleDate, |
|
|
|
userId:this.$store.state.user.name, |
|
|
|
shiftNo:this.searchData.shiftNo, |
|
|
|
} |
|
|
|
scheduleOne(inData).then(({data}) => { |
|
|
|
if(data.code===0){ |
|
|
|
@ -1192,6 +1223,7 @@ |
|
|
|
qtyToSchedule:this.schedulingModalTableData[i].scheduleQty, |
|
|
|
scheduleDate:this.schedulingModalTableData[i].scheduleDate, |
|
|
|
userId:this.$store.state.user.name, |
|
|
|
shiftNo:this.schedulingModalTableData[i].shiftNo, |
|
|
|
} |
|
|
|
inList.push(thisData); |
|
|
|
} |
|
|
|
|
