ruanqi 2 years ago
parent
commit
076c384aa2
  1. 92
      src/views/modules/board/SORoutingBoard.vue
  2. 24
      src/views/modules/board/scheduledBoard.vue
  3. 4
      src/views/modules/board/shopOrderBoard.vue
  4. 17
      src/views/modules/schedule/closeSchedule.vue
  5. 17
      src/views/modules/schedule/generateReport.vue
  6. 25
      src/views/modules/schedule/scheduleForShopOrder.vue
  7. 17
      src/views/modules/schedule/soscheduleRouting.vue

92
src/views/modules/board/SORoutingBoard.vue

@ -15,14 +15,14 @@
border border
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
style="width: 100%;"> style="width: 100%;">
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="25"
style="font-size: 20px"
label="工厂">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="site"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- min-width="25"-->
<!-- style="font-size: 20px"-->
<!-- label="工厂">-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
prop="seqNo" prop="seqNo"
header-align="center" header-align="center"
@ -49,7 +49,7 @@
<el-table-column <el-table-column
prop="sScheduledDate" prop="sScheduledDate"
header-align="center" header-align="center"
align="left"
align="center"
min-width="50" min-width="50"
label="派工日期"> label="派工日期">
</el-table-column> </el-table-column>
@ -70,7 +70,7 @@
<el-table-column <el-table-column
prop="lastLineName" prop="lastLineName"
header-align="center" header-align="center"
align="left"
align="center"
min-width="40" min-width="40"
label="上道生产线"> label="上道生产线">
</el-table-column> </el-table-column>
@ -89,6 +89,63 @@
label="上工序完成数量"> label="上工序完成数量">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table
cell-style="cc"
height="140"
:data="tableData2"
ref="wt_table"
border
style="width: 100%;">
<el-table-column
prop="seqNo"
header-align="center"
align="left"
width="60"
label="派工单号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
width="100"
label="生产订单">
</el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="left"
width="100"
label="物料编码">
</el-table-column>
<el-table-column
prop="feedbackDate"
header-align="center"
align="left"
width="80"
label="反馈时间">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="left"
width="60"
label="状态">
</el-table-column>
<el-table-column
prop="abnormalDesc"
header-align="center"
align="left"
width="100"
label="异常原因">
</el-table-column>
<el-table-column
prop="abnormalRemark"
header-align="center"
align="left"
min-width="200"
label="异常描述">
</el-table-column>
</el-table>
</div> </div>
</div> </div>
@ -111,6 +168,9 @@
totalPage: 1, totalPage: 1,
height: 200, height: 200,
tableData: [], tableData: [],
pageIndex2: 1,
totalPage2: 1,
tableData2: [],
// //
// refreshTime: 5, // refreshTime: 5,
// rollTime: 5, // rollTime: 5,
@ -119,7 +179,7 @@
}, },
mounted () { mounted () {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 80
this.height = window.innerHeight - 221
}) })
// this.autoRoll() // this.autoRoll()
}, },
@ -132,7 +192,7 @@
return '' return ''
}, },
search () { search () {
let inData= {number:this.pageIndex,
let inData= {number:this.pageIndex,number2:this.pageIndex2,
text1:this.lineNo}; text1:this.lineNo};
SORoutingBoard(inData).then(({data}) => { SORoutingBoard(inData).then(({data}) => {
this.tableData = data.rows; this.tableData = data.rows;
@ -142,6 +202,14 @@
}else { }else {
this.pageIndex=this.pageIndex+1 this.pageIndex=this.pageIndex+1
} }
this.tableData2 = data.rows2;
this.totalPage2= data.maxPage2;
if(this.pageIndex2+1>data.maxPage2){
this.pageIndex2=1
}else {
this.pageIndex2=this.pageIndex2+1
}
}) })
}, },
// //

24
src/views/modules/board/scheduledBoard.vue

@ -46,7 +46,7 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="40" min-width="40"
label="派工数/PlanQty"
label="派工数/Schedule"
:render-header="renderHeader" :render-header="renderHeader"
> >
</el-table-column> </el-table-column>
@ -89,7 +89,7 @@
prop="resourceDesc" prop="resourceDesc"
header-align="center" header-align="center"
align="center" align="center"
min-width="72"
min-width="92"
label="生产线/ProduceLine" label="生产线/ProduceLine"
:render-header="renderHeader" :render-header="renderHeader"
> >
@ -99,7 +99,7 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="100" min-width="100"
label="派工数量/PlanQty"
label="派工数量/Schedule"
:render-header="renderHeader"> :render-header="renderHeader">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -107,7 +107,7 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="90" min-width="90"
label="完成数量/ReportedQty"
label="完成数量/Reported"
:render-header="renderHeader"> :render-header="renderHeader">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -115,7 +115,7 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="108" min-width="108"
label="合格数量/ApproveQty"
label="合格数量/Approve"
:render-header="renderHeader"> :render-header="renderHeader">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -123,9 +123,17 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="100" min-width="100"
label="未完成数量/UnReportedQty"
label="未完成数量/UnReported"
:render-header="renderHeader">> :render-header="renderHeader">>
</el-table-column> </el-table-column>
<el-table-column
prop="abnormalQty"
header-align="center"
align="center"
min-width="80"
label="异常/Abnormal"
:render-header="renderHeader">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div style="float: left;height: 47%;width: 62%; "> <div style="float: left;height: 47%;width: 62%; ">
@ -379,7 +387,7 @@
series: [ series: [
{ {
'name': '当日完成率',
'name': '完成率',
'type': 'bar', 'type': 'bar',
'emphasis': { 'emphasis': {
focus: 'series' focus: 'series'
@ -398,7 +406,7 @@
}, },
{ {
'name': '当日良品率',
'name': '良品率',
'type': 'bar', 'type': 'bar',
'emphasis': { 'emphasis': {
focus: 'series' focus: 'series'

4
src/views/modules/board/shopOrderBoard.vue

@ -34,7 +34,7 @@
<el-table-column <el-table-column
prop="needDate" prop="needDate"
header-align="center" header-align="center"
align="left"
align="center"
min-width="60" min-width="60"
label="要求完成日期"> label="要求完成日期">
</el-table-column> </el-table-column>
@ -72,7 +72,7 @@
<el-table-column <el-table-column
prop="receiveDate" prop="receiveDate"
header-align="center" header-align="center"
align="left"
align="center"
min-width="60" min-width="60"
label="最近入库日期"> label="最近入库日期">
</el-table-column> </el-table-column>

17
src/views/modules/schedule/closeSchedule.vue

@ -222,6 +222,20 @@
min-width="100" min-width="100"
label="加工中心编码"> label="加工中心编码">
</el-table-column> </el-table-column>
<el-table-column
prop="firstWorkDate"
header-align="center"
align="left"
min-width="120"
label="开工时间">
</el-table-column>
<el-table-column
prop="closedDate"
header-align="center"
align="left"
min-width="120"
label="结束时间">
</el-table-column>
<el-table-column <el-table-column
prop="circulationSeqNo" prop="circulationSeqNo"
header-align="center" header-align="center"
@ -391,7 +405,8 @@
'机台ID': 'sResourceID', '机台ID': 'sResourceID',
'班次': 'sShiftNo', '班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo', '加工中心': 'sWorkCenterNo',
'开工时间': 'firstWorkDate',
'结束时间': 'closedDate',
}, },
exportName: '派工单列表' + this.getStrDate(), exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'], exportHeader: ['派工单列表'],

17
src/views/modules/schedule/generateReport.vue

@ -229,6 +229,20 @@
min-width="100" min-width="100"
label="加工中心编码"> label="加工中心编码">
</el-table-column> </el-table-column>
<el-table-column
prop="firstWorkDate"
header-align="center"
align="left"
min-width="120"
label="开工时间">
</el-table-column>
<el-table-column
prop="closedDate"
header-align="center"
align="left"
min-width="120"
label="结束时间">
</el-table-column>
</el-table> </el-table>
<el-dialog title="扫描派工单" :close-on-click-modal="false" v-drag :visible.sync="scanModalFlag" width="215px" > <el-dialog title="扫描派工单" :close-on-click-modal="false" v-drag :visible.sync="scanModalFlag" width="215px" >
<el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent> <el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
@ -447,7 +461,8 @@
'机台ID': 'sResourceID', '机台ID': 'sResourceID',
'班次': 'sShiftNo', '班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo', '加工中心': 'sWorkCenterNo',
'开工时间': 'firstWorkDate',
'结束时间': 'closedDate',
}, },
exportName: '派工单列表' + this.getStrDate(), exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'], exportHeader: ['派工单列表'],

25
src/views/modules/schedule/scheduleForShopOrder.vue

@ -733,13 +733,34 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
if( Number(this.schedulingModalData.sumQty)>Number(this.schedulingModalData.qtyToSchedule)){
this.$confirm(`累计派工数量大于订单数量,是否继续`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.doSchedule();
})
}else {
this.doSchedule();
}
this.doSchedule();
}) })
}else { }else {
if( Number(this.schedulingModalData.sumQty)>Number(this.schedulingModalData.qtyToSchedule)){
this.$confirm(`累计派工数量大于订单数量,是否继续`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.doSchedule(); this.doSchedule();
})
}else {
this.doSchedule();
}
} }
}, },
doSchedule(){ doSchedule(){

17
src/views/modules/schedule/soscheduleRouting.vue

@ -257,6 +257,20 @@
min-width="100" min-width="100"
label="加工中心编码"> label="加工中心编码">
</el-table-column> </el-table-column>
<el-table-column
prop="firstWorkDate"
header-align="center"
align="left"
min-width="120"
label="开工时间">
</el-table-column>
<el-table-column
prop="closedDate"
header-align="center"
align="left"
min-width="120"
label="结束时间">
</el-table-column>
<el-table-column <el-table-column
prop="circulationSeqNo" prop="circulationSeqNo"
header-align="center" header-align="center"
@ -349,7 +363,8 @@
'机台ID': 'sResourceID', '机台ID': 'sResourceID',
'班次': 'sShiftNo', '班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo', '加工中心': 'sWorkCenterNo',
'开工时间': 'firstWorkDate',
'结束时间': 'closedDate',
}, },
exportName: '派工单列表' + this.getStrDate(), exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'], exportHeader: ['派工单列表'],

Loading…
Cancel
Save