|
|
|
@ -867,6 +867,65 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 物料模态框 --> |
|
|
|
<el-dialog title="物料清单" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="940px"> |
|
|
|
<div class="rq"> |
|
|
|
<el-form :inline="true" label-position="top" :model="partData"> |
|
|
|
<el-form-item :label="'IFS料号'"> |
|
|
|
<el-input v-model="partData.finalPartNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料编码'"> |
|
|
|
<el-input v-model="partData.testPartNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'客户料号'"> |
|
|
|
<el-input v-model="partData.customerPartNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="queryPartList()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="partList" |
|
|
|
@row-dblclick="getRowData" |
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in partColumnList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<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> |
|
|
|
<!-- 分页插件 --> |
|
|
|
<el-pagination |
|
|
|
style="margin-top: 5px" |
|
|
|
@size-change="sizeChangeHandle2" |
|
|
|
@current-change="currentChangeHandle2" |
|
|
|
:current-page="pageIndex2" |
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
:page-size="pageSize2" |
|
|
|
:total="totalPage2" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
</div> |
|
|
|
<el-footer style="height:35px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="partModelFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList> |
|
|
|
|
|
|
|
<!-- 上传文件的modal --> |
|
|
|
@ -891,6 +950,7 @@ |
|
|
|
getItemList, // 查询模板属性 |
|
|
|
countersignatureSave, // 新增会签信息 |
|
|
|
getBuBySite, // 根据site查bu |
|
|
|
choosePartNoList, // 根据视图查物料计划 |
|
|
|
} from "@/api/changeManagement/changeManagement.js" |
|
|
|
import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" |
|
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
|
@ -943,6 +1003,9 @@ |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 50, |
|
|
|
totalPage: 0, |
|
|
|
pageIndex2: 1, |
|
|
|
pageSize2: 20, |
|
|
|
totalPage2: 0, |
|
|
|
activeName: 'basicInformation', |
|
|
|
tempPartRow: {}, |
|
|
|
tempExecutorRow: {}, |
|
|
|
@ -1091,6 +1154,16 @@ |
|
|
|
fileRemark: '', |
|
|
|
folder: '' |
|
|
|
}, |
|
|
|
partData: { |
|
|
|
site: '', |
|
|
|
buNo: '', |
|
|
|
finalPartNo: '', |
|
|
|
testPartNo: '', |
|
|
|
customerPartNo: '', |
|
|
|
partDesc: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
}, |
|
|
|
// ======== 数据列表 ======== |
|
|
|
dataList: [], |
|
|
|
dataList2: [], |
|
|
|
@ -1105,6 +1178,7 @@ |
|
|
|
chooseItemList: [], |
|
|
|
chooseItemList2: [], |
|
|
|
chooseCSItemList: [], |
|
|
|
partList: [], |
|
|
|
// ======== 列表表头 ======== |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
@ -1790,6 +1864,58 @@ |
|
|
|
columnWidth: 150 |
|
|
|
}, |
|
|
|
], |
|
|
|
partColumnList: [ |
|
|
|
{ |
|
|
|
columnProp: 'finalPartNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: 'IFS料号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'testPartNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '物料编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'customerPartNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '客户料号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partDesc', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '物料名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 200 |
|
|
|
}, |
|
|
|
], |
|
|
|
// ======== 必填规则 ======== |
|
|
|
rules: { |
|
|
|
applicantId: [ |
|
|
|
@ -1936,7 +2062,8 @@ |
|
|
|
chooseModelFlag2: false, |
|
|
|
chooseCSModelFlag: false, |
|
|
|
CountersignatureFlag: false, |
|
|
|
addDetailModal: false |
|
|
|
addDetailModal: false, |
|
|
|
partModelFlag: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2009,18 +2136,51 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
choosePartNo (row) { |
|
|
|
this.partData.site = row.site |
|
|
|
this.partData.buNo = row.buNo |
|
|
|
this.tempPartRow = row |
|
|
|
// if (!this.tempPartRow.newPartNo) { |
|
|
|
// this.tempPartRow.newPartNo = '' |
|
|
|
// } |
|
|
|
this.getBaseList(133) |
|
|
|
this.queryPartList() |
|
|
|
//this.getBaseList(133) |
|
|
|
}, |
|
|
|
|
|
|
|
// 查询物料 |
|
|
|
queryPartList () { |
|
|
|
this.partData.limit = this.pageSize2 |
|
|
|
this.partData.page = this.pageIndex2 |
|
|
|
choosePartNoList(this.partData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.partList = data.page.list |
|
|
|
this.pageIndex2 = data.page.currPage |
|
|
|
this.pageSize2 = data.page.pageSize |
|
|
|
this.totalPage2 = data.page.totalCount |
|
|
|
this.partModelFlag = true |
|
|
|
} else { |
|
|
|
this.partList = [] |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 双击选中物料 |
|
|
|
getRowData (row) { |
|
|
|
this.$set(this.tempPartRow,'newPartNo', row.testPartNo) |
|
|
|
this.partModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
// 每页数 |
|
|
|
sizeChangeHandle2 (val) { |
|
|
|
this.pageSize2 = val |
|
|
|
this.pageIndex2 = 1 |
|
|
|
this.queryPartList() |
|
|
|
}, |
|
|
|
|
|
|
|
// 当前页 |
|
|
|
currentChangeHandle2 (val) { |
|
|
|
this.pageIndex2 = val |
|
|
|
this.queryPartList() |
|
|
|
}, |
|
|
|
|
|
|
|
chooseExecutor (row) { |
|
|
|
this.tempExecutorRow = row |
|
|
|
// if (this.tempExecutorRow.executor == null) { |
|
|
|
// this.tempExecutorRow.executor = '' |
|
|
|
// } |
|
|
|
this.getBaseList(103, 7) |
|
|
|
}, |
|
|
|
|
|
|
|
|