|
|
|
@ -66,7 +66,7 @@ |
|
|
|
<el-option label="未发货" value="未发货"></el-option> |
|
|
|
<el-option label="部分发货" value="部分发货"></el-option> |
|
|
|
<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="物料编码"> |
|
|
|
@ -121,6 +121,16 @@ |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
fixed="right" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="80" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-link style="cursor: pointer" type="text" size="small" @click="searchDetailModal(scope.row)">发料明细</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
|
|
|
|
<el-pagination |
|
|
|
@ -161,6 +171,48 @@ |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
<el-dialog title="发料明细" :close-on-click-modal="false" @close="materialIssueDetailFlagClose()" v-drag :visible.sync="materialIssueDetailFlag" width="720px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="materialIssueModalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="采购订单号"> |
|
|
|
<el-input v-model="materialIssueModalData.orderNo" disabled style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="生产订单号"> |
|
|
|
<el-input v-model="materialIssueModalData.orderRef1" disabled style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input v-model="materialIssueModalData.partNo" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="物料名称"> |
|
|
|
<el-input v-model="materialIssueModalData.partDescription" disabled style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="height - 275" |
|
|
|
:data="materialIssueDataList" |
|
|
|
border |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item, index) in columnMaterialIssueList" |
|
|
|
:key="index" |
|
|
|
:prop="item.columnProp" |
|
|
|
:label="item.columnLabel" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed == '' ? false : item.fixed" |
|
|
|
:width="item.columnWidth" |
|
|
|
> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="materialIssueDetailFlag = false">关闭</el-button> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
<!-- 数据表格部分 --> |
|
|
|
<!-- <el-table :data="dataList" border style="width: 100%">--> |
|
|
|
@ -196,7 +248,7 @@ import { |
|
|
|
searchSupplierDeliverySchedule, |
|
|
|
updateSupplierDeliveryScheduleDeliveryQty |
|
|
|
} from "../../../api/deliverySchedule/supplierDeliverySchedule"; |
|
|
|
import {searchSupplierDeliveryPlan} from "../../../api/deliverySchedule/supplierDeliveryPlan"; |
|
|
|
import {searchSupplierDeliveryPlan,materialIssueSearch} from "../../../api/deliverySchedule/supplierDeliveryPlan"; |
|
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "../../../api/table"; |
|
|
|
import Chooselist from "../common/Chooselist.vue"; |
|
|
|
|
|
|
|
@ -214,11 +266,12 @@ export default { |
|
|
|
exportHeader: ["供应商送货计划信息"], |
|
|
|
exportFooter: [], |
|
|
|
exportList: [], |
|
|
|
modalData: { |
|
|
|
WantedDelDate: new Date(), |
|
|
|
DelPlace: '', |
|
|
|
Remark: '', |
|
|
|
SupplierDeliveryScheduleList: [], |
|
|
|
materialIssueModalData: { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
orderRef1: '', |
|
|
|
partNo: '', |
|
|
|
partDescription: '', |
|
|
|
}, |
|
|
|
// 导出 end |
|
|
|
searchData: { |
|
|
|
@ -729,6 +782,79 @@ export default { |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
columnMaterialIssueList: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 109003, |
|
|
|
serialNumber: '109003Table3ComponentPartNo', |
|
|
|
tableId: "109003Table3", |
|
|
|
tableName: "供应商送货计划信息表", |
|
|
|
columnWidth: 150, |
|
|
|
columnProp: 'componentPartNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
columnLabel: '料号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 109003, |
|
|
|
serialNumber: '109003Table3ComponentPartDesc', |
|
|
|
tableId: "109003Table3", |
|
|
|
tableName: "供应商送货计划信息表", |
|
|
|
columnProp: 'componentPartDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
columnLabel: '料号描述', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 109003, |
|
|
|
serialNumber: '109003Table3QtyRequired', |
|
|
|
tableId: "109003Table3", |
|
|
|
tableName: "供应商送货计划信息表", |
|
|
|
columnWidth: 110, |
|
|
|
columnProp: 'qtyRequired', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "right", |
|
|
|
columnLabel: '需求数量', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 109003, |
|
|
|
serialNumber: '109003Table3QtyIssued', |
|
|
|
tableId: "109003Table3", |
|
|
|
tableName: "供应商送货计划信息表", |
|
|
|
columnWidth: 110, |
|
|
|
columnProp: 'qtyIssue', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "right", |
|
|
|
columnLabel: '已发料数量', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
rules: { |
|
|
|
wantedDelDate: [ |
|
|
|
{ required: true, message: '要求送货日期不能为空', trigger: 'blur' } |
|
|
|
@ -747,7 +873,8 @@ export default { |
|
|
|
activeName: 'first', |
|
|
|
dataList: [], |
|
|
|
collectDataList: [], |
|
|
|
modalFlag: false, |
|
|
|
materialIssueDataList: [], |
|
|
|
materialIssueDetailFlag: false, |
|
|
|
modalDisableFlag: false, |
|
|
|
autoReservationFlag: false, |
|
|
|
options: [], |
|
|
|
@ -871,29 +998,31 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
saveData () { |
|
|
|
let inData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
delPlace: this.modalData.DelPlace, |
|
|
|
wantedDelDate: this.modalData.WantedDelDate, |
|
|
|
remark: this.modalData.Remark, |
|
|
|
supplierDeliveryScheduleList: this.modalData.SupplierDeliveryScheduleList, |
|
|
|
createBy: this.$store.state.user.name, |
|
|
|
searchDetailModal (row) { |
|
|
|
this.materialIssueModalData = row |
|
|
|
let tempData = { |
|
|
|
site: row.site, |
|
|
|
orderRef1: row.orderRef1, |
|
|
|
} |
|
|
|
addSupplierDeliveryPlan(inData).then(({data}) => { |
|
|
|
materialIssueSearch(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.modalFlag = false |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.materialIssueDataList = data.list |
|
|
|
} else { |
|
|
|
this.$message.error(data.msg) |
|
|
|
this.materialIssueDataList = [] |
|
|
|
} |
|
|
|
}) |
|
|
|
this.materialIssueDetailFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
handleSelectionChange(val) { |
|
|
|
this.selectionList = val; |
|
|
|
materialIssueDetailFlagClose () { |
|
|
|
this.materialIssueModalData = { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
orderRef1: '', |
|
|
|
partNo: '', |
|
|
|
partDescription: '', |
|
|
|
} |
|
|
|
this.materialIssueDataList = [] |
|
|
|
}, |
|
|
|
|
|
|
|
// 每页数 |
|
|
|
|
yuejiayang
11 months ago