Browse Source

0412 新看板

master
ruanqi 3 years ago
parent
commit
747ab9dd96
  1. 1
      src/api/board.js
  2. 1
      src/router/index.js
  3. 209
      src/views/modules/board/SORoutingBoard.vue
  4. 101
      src/views/modules/production/generateReport.vue
  5. 10
      src/views/modules/production/scheduleForSOTask.vue
  6. 4
      src/views/modules/production/scheduleForShopOrder.vue
  7. 417
      src/views/modules/production/soscheduleRouting.vue

1
src/api/board.js

@ -8,3 +8,4 @@ export const productionBlankingBoard = data => createAPI(`board/productionBlanki
export const soLiuhuaBoard= data => createAPI(`board/soLiuhuaBoard`,'post',data)
export const transFerBoard= data => createAPI(`board/transFerBoard`,'post',data)
export const SORoutingBoard= data => createAPI(`board/SORoutingBoard`,'post',data)

1
src/router/index.js

@ -26,6 +26,7 @@ const globalRoutes = [
{ path: '/transFerBoard', component: _import('modules/board/transFerBoard'), name: 'transFerBoard', meta: { title: '待入库看板' } },
{ path: '/productionBlankingBoard', component: _import('modules/board/productionBlankingBoard'), name: 'productionBlankingBoard', meta: { title: '生产打料看板' } },
{ path: '/soLiuhuaBoard', component: _import('modules/board/soLiuhuaBoard'), name: 'soLiuhuaBoard', meta: { title: '硫化看板' } },
{ path: '/SORoutingBoard', component: _import('modules/board/SORoutingBoard'), name: 'SORoutingBoard', meta: { title: '待生产工序看板' } },
{ path: '/padPart', component: _import('modules/pad/padPart1'), name: 'padPart1', meta: { title: '产品搜索' } },
{ path: '/padPartAttribute', component: _import('modules/pad/padPartAttribute'), name: 'padPartAttribute', meta: { title: '产品属性' } },
{ path: '/padPartPhoto', component: _import('modules/pad/padPartPhoto'), name: 'padPartPhoto', meta: { title: '产品图片' } }

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

@ -0,0 +1,209 @@
<template>
<div class="mod-config">
<div style="text-align: center">
<h1>待生产工序看板</h1>
</div>
<div class="board2">
<!-- @mouseenter.native="mouseEnter"-->
<!-- @mouseleave.native="mouseLeave"-->
<el-table
cell-style="cc"
:height="height"
:data="tableData"
ref="wt_table"
border
:row-class-name="tableRowClassName"
style="width: 100%;">
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="50"
style="font-size: 20px"
label="工厂编号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="100"
style="font-size: 20px"
label="生产订单号">
</el-table-column>
<el-table-column
prop="itemNo"
header-align="center"
align="left"
min-width="65"
style="font-size: 20px"
label="工序编号">
</el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="left"
min-width="160"
label="工序名称">
</el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="left"
min-width="105"
label="产品编号">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="200"
label="产品名称">
</el-table-column>
<el-table-column
prop="qtyRequired"
header-align="center"
align="right"
min-width="60"
label="需求数量">
</el-table-column>
<el-table-column
prop="qtyReported"
header-align="center"
align="right"
min-width="60"
label="报工数量">
</el-table-column>
<el-table-column
prop="qtyApprove"
header-align="center"
align="right"
min-width="60"
label="合格数量">
</el-table-column>
<el-table-column
prop="lastApproveQty"
header-align="center"
align="right"
min-width="80"
label="上工序完成数量">
</el-table-column>
<el-table-column
prop="planFinishTime"
header-align="center"
align="left"
min-width="100"
label="要求完成日期">
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
let rollstop = ''
let rolltimer = ''//
let refresher = '' //
import {
SORoutingBoard,
} from '@/api/board.js'
export default {
name: 'SORouting',
data () {
return {
pageIndex: 1,
totalPage: 1,
height: 200,
tableData: [],
//
// refreshTime: 5,
// rollTime: 5,
// rollPx: 1,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 80
})
// this.autoRoll()
},
methods: {
tableRowClassName ({row, rowIndex}) {
},
search () {
let inData= {number:this.pageIndex};
SORoutingBoard(inData).then(({data}) => {
this.tableData = data.rows;
this.totalPage= data.maxPage;
if(this.pageIndex+1>data.maxPage){
this.pageIndex=1
}else {
this.pageIndex=this.pageIndex+1
}
})
},
//
// mouseEnter (time) {
// //
// this.autoRoll(true)
// },
//
// mouseLeave () {
// //
// this.autoRoll()
// },
//
// autoRoll (stop) {
// if (stop) {
// clearInterval(rolltimer)
// return
// }
// // DOM
// const table = this.$refs.wt_table
// // div
// const divData = table.bodyWrapper
// //
// rolltimer = setInterval(() => {
// //
// divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// // (+=)
// if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
// // table
// divData.scrollTop = 0
// }
// }, this.rollTime * 10)
// },
refreshTable () {
refresher = setInterval(() => {
this.search()
}, 30000)
}
},
created () {
this.search()
this.refreshTable()
}
}
</script>
<style >
.board2 .el-table .cell {
line-height: 13px;
font-size: 12px;
height: 13px;
padding: 0px;
}
.board2 .el-table .success-row {
background: #1bb61b;
}
.board2 .el-table .false-row {
/*background: #cbcb14;*/
background: #db1212;
}
.board2 .el-table .yellow-row{
background: #ffff00;
}
</style>

101
src/views/modules/production/generateReport.vue

@ -2,16 +2,65 @@
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -20px;">
<el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
<el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
<el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工序编号'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'派工单类型'">
<el-select v-model="searchData.scheduleType" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="生产订单派工单" value="生产订单派工单"></el-option>
<el-option label="日计划派工单" value="日计划派工单"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'是否报工完成'">
<el-select v-model="searchData.reportFlag" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="QtyReported>=QtyRequired"></el-option>
<el-option label="否" value="QtyRequired>QtyReported"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'派工日期:'">
<el-date-picker
style="width: 130px"
v-model="searchData.startDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至: '">
<el-date-picker
style="width: 130px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'操作员姓名'">
<el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'机台ID'">
<el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'班次'">
<el-select v-model="searchData.sShiftNo" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="白班" value="白班"></el-option>
<el-option label="晚班" value="晚班"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
<download-excel
@ -50,7 +99,7 @@
prop="seqNo"
header-align="center"
align="left"
min-width="80"
min-width="70"
label="派工单号">
</el-table-column>
<el-table-column
@ -64,7 +113,7 @@
prop="scheduleType"
header-align="center"
align="left"
min-width="80"
min-width="100"
label="关联单号类型">
</el-table-column>
<el-table-column
@ -128,14 +177,14 @@
header-align="center"
align="left"
min-width="80"
label="物料编码">
label="产品编码">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="200"
label="物料名称">
label="产品名称">
</el-table-column>
<el-table-column
prop="sResourceID"
@ -378,18 +427,26 @@
// start
exportData: [],
exportDataStandard: {
'日计划单号': 'orderNo',
'计划日期': 'orderDate',
'订单号': 'orderRef1',
'物料编码': 'partNo',
'物料名称': 'partDescription',
'计划数量': 'orderQty',
'已完工数': 'qtyfinished',
'录入人': 'userName',
'录入时间': 'enterDate'
'派工单号': 'seqNo',
'关联单号': 'orderNo',
'关联单号类型': 'scheduleType',
'工序号': 'itemNo',
'工序名称': 'itemDesc',
'派工数量': 'qtyRequired',
'报工数量': 'qtyReported',
'合格数量': 'qtyApprove',
'需求时间': 'timeRequired',
'派工日期': 'sScheduledDate',
'操作员姓名': 'operatorName',
'产品编码': 'partNo',
'产品名称': 'partDesc',
'机台ID': 'sResourceID',
'班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo',
},
exportName: '日计划列表' + this.getStrDate(),
exportHeader: ['日计划列表'],
exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'],
exportFooter: [],
exportDefaultValue: '这一行这一列没有数据',
// end
@ -400,7 +457,15 @@
orderNo: '',
sWorkCenterNo: '',
partNo: '',
site: this.$store.state.user.site
site: this.$store.state.user.site,
itemNo:'',
scheduleType:'',
reportFlag:'QtyRequired>QtyReported',
startDate:'',
endDate:'',
operatorName:'',
sResourceID:'',
sShiftNo:'',
},
photoUrl:'',
sopData:{

10
src/views/modules/production/scheduleForSOTask.vue

@ -48,8 +48,8 @@
<el-form-item :label="'派工情况:'">
<el-select filterable v-model="searchData.planStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="未派工完" value="ROUND(a.OrderQty,3) >ROUND(ISNULL(SL.scheduledQty,0),3)"></el-option>
<el-option label="已派工完" value="ROUND(ISNULL(SL.scheduledQty,0),3) >=ROUND(a.OrderQty,3)"></el-option>
<el-option label="未派工完" value="a.OrderQty>isnull(SL.scheduledQty,0)"></el-option>
<el-option label="已派工完" value="isnull(SL.scheduledQty,0)>= a.OrderQty"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
@ -177,7 +177,7 @@
header-align="center"
align="right"
width="80"
label="已入库数量">
label="合格数量">
</el-table-column>
<el-table-column
prop="machSetupTime"
@ -395,7 +395,7 @@
"日计划数量": "lotSize",
"已派工数量": "scheduledQty",
"已报工数量": "qtyReported",
"已入库数量": "qtyApprove",
"合格数量": "qtyApprove",
"生产订单号": "orderRef1",
"调机时间": "machSetupTime",
"单位产出量": "machRunFactor",
@ -417,7 +417,7 @@
partNo: '',
orderRef1:'',
site: this.$store.state.user.site,
planStatus: 'ROUND(a.OrderQty,3) >ROUND(ISNULL(SL.scheduledQty,0),3)',
planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)',
itemNo:'',
},
schedulingModalData: {

4
src/views/modules/production/scheduleForShopOrder.vue

@ -214,7 +214,7 @@
header-align="center"
align="right"
width="80"
label="已入库数量">
label="合格数量">
</el-table-column>
<el-table-column
prop="enterDate"
@ -449,7 +449,7 @@
"订单数量": "lotSize",
"已派工数量": "scheduledQty",
"已报工数量": "qtyReported",
"已入库数量": "qtyApprove",
"合格数量": "qtyApprove",
"录入时间": "enterDate",
"录入人": "userName",
"调机时间": "machSetupTime",

417
src/views/modules/production/soscheduleRouting.vue

@ -0,0 +1,417 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -20px;">
<el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
<el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工序编号'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'派工单类型'">
<el-select v-model="searchData.scheduleType" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="生产订单派工单" value="生产订单派工单"></el-option>
<el-option label="日计划派工单" value="日计划派工单"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'是否报工完成'">
<el-select v-model="searchData.reportFlag" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="QtyReported>=QtyRequired"></el-option>
<el-option label="否" value="QtyRequired>QtyReported"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'派工日期:'">
<el-date-picker
style="width: 130px"
v-model="searchData.startDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至: '">
<el-date-picker
style="width: 130px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'操作员姓名'">
<el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'机台ID'">
<el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'班次'">
<el-select v-model="searchData.sShiftNo" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="白班" value="白班"></el-option>
<el-option label="晚班" value="晚班"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
<download-excel
:fields="exportDataStandard"
:data="tableData"
type="xlsx"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{'导出'}}
</download-excel>
</el-form-item>
</el-form>
<el-table
:height="height"
:data="tableData"
border
style="width: 100%">
<!-- <el-table-column-->
<!-- prop=""-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- min-width="50"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope" class="foo_container">-->
<!-- <a type="text" size="small" @click="initReportModal(scope.row)">报告</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop="seqNo"
header-align="center"
align="left"
min-width="70"
label="派工单号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="100"
label="关联单号">
</el-table-column>
<el-table-column
prop="scheduleType"
header-align="center"
align="left"
min-width="100"
label="关联单号类型">
</el-table-column>
<el-table-column
prop="itemNo"
header-align="center"
align="left"
min-width="70"
label="工序号">
</el-table-column>
<el-table-column
prop="itemDesc"
header-align="center"
align="left"
min-width="160"
label="工序名称">
</el-table-column>
<el-table-column
prop="qtyRequired"
header-align="center"
align="right"
min-width="80"
label="派工数量">
</el-table-column>
<el-table-column
prop="qtyReported"
header-align="center"
align="right"
min-width="80"
label="报工数量">
</el-table-column>
<el-table-column
prop="qtyApprove"
header-align="center"
align="right"
min-width="80"
label="合格数量">
</el-table-column>
<el-table-column
prop="timeRequired"
header-align="center"
align="right"
min-width="80"
label="需求时间">
</el-table-column>
<el-table-column
prop="sScheduledDate"
header-align="center"
align="left"
min-width="80"
label="派工日期">
</el-table-column>
<el-table-column
prop="operatorName"
header-align="center"
align="left"
min-width="80"
label="操作员姓名">
</el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="left"
min-width="80"
label="产品编码">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="200"
label="产品名称">
</el-table-column>
<el-table-column
prop="sResourceID"
header-align="center"
align="left"
min-width="70"
label="机台ID">
</el-table-column>
<el-table-column
prop="sShiftNo"
header-align="center"
align="left"
min-width="70"
label="班次">
</el-table-column>
<el-table-column
prop="sWorkCenterNo"
header-align="center"
align="left"
min-width="100"
label="加工中心编码">
</el-table-column>
</el-table>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getSOScheduleRoutingData
, saveGenerateReportForSchedule
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
export default {
name: 'soscheduleRouting',
components: {
Chooselist
},
data () {
return {
setUp: {
reviewFlag: false,
saveButton: false,
readonlyFlag: false,
disabled: false
},
saveHeaderData: {
site: '',
seqNo: '',
itemNo: '',
partNo: '',
partDescription: '',
operationDesc: '',
workCenterNo: '',
workCenterDesc: '',
operatorId: '',
operatorName: '',
planStartTime: '',
planFinishTime: '',
qtyReported: 0,
qtyApprove: 0,
qtyRework: 0,
operatorId2: '',
operatorIdName2: '',
scrapReason: '',
preparationTime: 0,
manufacturingTime: 0,
cleaningTime: 0,
shutdownReason: '',
remark: '',
orderRef1:'',
scheduleType:'',
userId:'',
},
sopFlag:false,
site: this.$store.state.user.site,
operatorType: 0,
// start
exportData: [],
exportDataStandard: {
'派工单号': 'seqNo',
'关联单号': 'orderNo',
'关联单号类型': 'scheduleType',
'工序号': 'itemNo',
'工序名称': 'itemDesc',
'派工数量': 'qtyRequired',
'报工数量': 'qtyReported',
'合格数量': 'qtyApprove',
'需求时间': 'timeRequired',
'派工日期': 'sScheduledDate',
'操作员姓名': 'operatorName',
'产品编码': 'partNo',
'产品名称': 'partDesc',
'机台ID': 'sResourceID',
'班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo',
},
exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'],
exportFooter: [],
exportDefaultValue: '这一行这一列没有数据',
// end
height: 200,
tableData: [],
date1: '',
searchData: {
orderNo: '',
sWorkCenterNo: '',
partNo: '',
site: this.$store.state.user.site,
itemNo:'',
scheduleType:'',
reportFlag:'QtyRequired>QtyReported',
startDate:'',
endDate:'',
operatorName:'',
sResourceID:'',
sShiftNo:'',
},
photoUrl:'',
sopData:{
site:'',
partNo:'',
},
partDescription:'',
fileTitle:'',
fileName:'',
num:1,
currentData:'',
photoDatas:[],
uploadImg:[],
showviewer: false,
url: '',
height2:600,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
this.height2 = window.innerHeight -100
})
},
methods: {
// S
getBaseList (val, type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
if (val === 24) {
strVal = this.searchData.workCenterNo
} else if (val === 26) {
this.operatorType = type
if (type === 1) {
strVal = this.saveHeaderData.operatorId
} else if (type === 2) {
strVal = this.saveHeaderData.operatorId2
}
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
console.log(val)
if (this.tagNo === 24) {
this.searchData.workCenterNo = val.WorkCenterNo
} else if (this.tagNo === 26) {
if (this.operatorType === 1) {
this.saveHeaderData.operatorId = val.OperatorID
this.saveHeaderData.operatorName = val.OperatorName
} else if (this.operatorType === 2) {
this.saveHeaderData.operatorId2 = val.OperatorID
this.saveHeaderData.operatorIdName2 = val.OperatorName
}
} else if (this.tagNo === 5) {
this.searchData.partNo = val.PartNo
}
},
search () {
getSOScheduleRoutingData(this.searchData).then(({data}) => {
this.tableData = data.rows
})
},
createExportData () {
return this.tableData
},
startDownload () {
// this.exportData = this.dataList
},
finishDownload () {
},
getStrDate () {
let dd = new Date()
let Y = dd.getFullYear()
let M = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1)// 100
let D = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate()// 100
let H = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
let MM = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
let S = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
return Y + M + D + H + MM + S
},
},
created () {
}
}
</script>
<style scoped>
.input_left{
text-align: left;
}
.input_reight{
text-align: right;
}
/deep/ input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
input[type='number'] {
-moz-appearance: textfield !important;
}
</style>
Loading…
Cancel
Save