|
|
|
@ -1,5 +1,5 @@ |
|
|
|
<template> |
|
|
|
<div class="mod-config"> |
|
|
|
<div class="mod-config yzz"> |
|
|
|
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-top: 0px"> |
|
|
|
<el-form-item :label="'申请单号'"> |
|
|
|
@ -29,6 +29,13 @@ |
|
|
|
placeholder="选择日期"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="状态" > |
|
|
|
<el-select v-model="searchData.status" placeholder="请选择" 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.issueFlag" placeholder="请选择" style="width: 120px"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
@ -43,6 +50,16 @@ |
|
|
|
<el-option label="全部发料" value="全部发料"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'车间'"> |
|
|
|
<el-select v-model="searchData.workShopList" multiple style="width: 360px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in workShopList" |
|
|
|
:key = "i.workShopId" |
|
|
|
:label = "i.workShopName" |
|
|
|
:value = "i.workShopId"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="searchTable()">查询</el-button> |
|
|
|
<download-excel |
|
|
|
@ -91,11 +108,10 @@ |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="80" |
|
|
|
fixed="left" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">结束</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">打开</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">关闭</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -152,6 +168,7 @@ |
|
|
|
:data="dataList3" |
|
|
|
:height="height" |
|
|
|
border |
|
|
|
:row-class-name="tableRowClassName" |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%; "> |
|
|
|
<!-- <el-table-column--> |
|
|
|
@ -281,6 +298,7 @@ |
|
|
|
,searchNotifyLog |
|
|
|
}from "@/api/orderIssure/soIssueNotify.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
import {getEamWorkShop} from "@/api/factory/site.js"; |
|
|
|
export default { |
|
|
|
components: { |
|
|
|
Chooselist |
|
|
|
@ -302,12 +320,15 @@ |
|
|
|
site:this.$store.state.user.site, |
|
|
|
userName: '', |
|
|
|
notifyNo: '', |
|
|
|
status: '', |
|
|
|
issueFlag: '', |
|
|
|
issueResult: '', |
|
|
|
workShopList: [], |
|
|
|
startDate: this.dayjs().format("YYYY-MM-DD"), |
|
|
|
endDate: this.dayjs().format("YYYY-MM-DD"), |
|
|
|
sql: " and a.status!='已计划' ", |
|
|
|
}, |
|
|
|
workShopList: [], |
|
|
|
exportList:[], |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 100, |
|
|
|
@ -333,6 +354,23 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table1WorkShopName', |
|
|
|
tableId: "701002Table1", |
|
|
|
tableName: "领料申请主表", |
|
|
|
columnProp: "workShopName", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "车间", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
@ -506,6 +544,24 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 40 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table2NeedDate', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "领料申请派工单子表", |
|
|
|
columnProp: 'needDate', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '要求发料时间', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
@ -627,25 +683,6 @@ |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table2NeedDate', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "领料申请派工单子表", |
|
|
|
columnProp: 'needDate', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '要求发料时间', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -687,81 +724,81 @@ |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3IssueType', |
|
|
|
serialNumber: '701002Table3ComponentPartNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "issueType", |
|
|
|
columnProp: "componentPartNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "类型", |
|
|
|
align: "center", |
|
|
|
columnLabel: "材料编码", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
columnWidth: 100 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3SOOrderNo', |
|
|
|
serialNumber: '701002Table3PartDesc', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "orderNo", |
|
|
|
columnProp: "partDesc", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "生产订单", |
|
|
|
columnLabel: "材料名称", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
columnWidth: 130 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3OpsItemNo', |
|
|
|
serialNumber: '701002Table3NeedDate', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "opsItemNo", |
|
|
|
columnProp: "needDate", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "工序", |
|
|
|
align: "center", |
|
|
|
columnLabel: "需求时间", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 50 |
|
|
|
columnWidth: 110 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3SeqNo', |
|
|
|
serialNumber: '701002Table3QtyToIssue', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "seqNo", |
|
|
|
columnProp: "qtyToIssue", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "派工单号", |
|
|
|
align: "right", |
|
|
|
columnLabel: "申请数量", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 150 |
|
|
|
columnWidth: 80 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3LocationNo', |
|
|
|
serialNumber: '701002Table3QtyToIssueOriginal', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "locationNo", |
|
|
|
columnProp: "qtyToIssueOriginal", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "机台", |
|
|
|
align: "right", |
|
|
|
columnLabel: "已发数量", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -772,13 +809,13 @@ |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3BOMItemNo', |
|
|
|
serialNumber: '701002Table3IssueType', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "bOMItemNo", |
|
|
|
columnProp: "issueType", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "BOM序号", |
|
|
|
columnLabel: "类型", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -789,47 +826,64 @@ |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3ComponentPartNo', |
|
|
|
serialNumber: '701002Table3SOOrderNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "componentPartNo", |
|
|
|
columnProp: "orderNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "材料编码", |
|
|
|
align: "left", |
|
|
|
columnLabel: "生产订单", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
columnWidth: 120 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3PartDesc', |
|
|
|
serialNumber: '701002Table3OpsItemNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "partDesc", |
|
|
|
columnProp: "opsItemNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "工序", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 50 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3SeqNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "seqNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "材料名称", |
|
|
|
columnLabel: "派工单号", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 130 |
|
|
|
columnWidth: 150 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3QtyToIssue', |
|
|
|
serialNumber: '701002Table3LocationNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "qtyToIssue", |
|
|
|
columnProp: "locationNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "申请数量", |
|
|
|
align: "left", |
|
|
|
columnLabel: "机台", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -840,13 +894,13 @@ |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table3QtyToIssueOriginal', |
|
|
|
serialNumber: '701002Table3BOMItemNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "qtyToIssueOriginal", |
|
|
|
columnProp: "bOMItemNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "已发数量", |
|
|
|
columnLabel: "BOM序号", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -854,6 +908,7 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
}, |
|
|
|
], |
|
|
|
columnList4:[ |
|
|
|
@ -1136,7 +1191,11 @@ |
|
|
|
mounted () { |
|
|
|
this.$nextTick(() => { |
|
|
|
this.height = (window.innerHeight- 250) / 2 |
|
|
|
|
|
|
|
getEamWorkShop({}).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.workShopList=data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1392,10 +1451,18 @@ |
|
|
|
|
|
|
|
return s |
|
|
|
}, |
|
|
|
|
|
|
|
tableRowClassName ({row, rowIndex}) { |
|
|
|
|
|
|
|
if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) { |
|
|
|
return 'error-row' |
|
|
|
} |
|
|
|
|
|
|
|
return '' |
|
|
|
}, |
|
|
|
}, |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
<style scoped> |
|
|
|
|
|
|
|
</style> |
yuejiayang
1 year ago