|
|
|
@ -125,6 +125,14 @@ |
|
|
|
<span slot="label" @click="getBaseList(106,1)"><a herf="#">BU</a></span> |
|
|
|
<el-input v-model="modalData.buDesc" readonly style="width: 80px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="应用描述" prop="applicationDesc"> |
|
|
|
<el-input v-model="modalData.applicationDesc" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="产品类别" prop="productCategory"> |
|
|
|
<el-select v-model="modalData.productCategory" clearable placeholder="请选择" style="width: 165px"> |
|
|
|
<el-option v-for="item in productCategoryOptions" :key="item" :label="item" :value="item"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-tabs v-model="inventoryPartTable" style="width: 100%;height: 465px;" type="border-card" @tab-click="inventoryPartClick"> |
|
|
|
<el-tab-pane label="General" name="General"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> |
|
|
|
@ -748,7 +756,7 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 项目物料-> 快速新增 --> |
|
|
|
<el-dialog title="物料导入" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="900px"> |
|
|
|
<el-dialog title="物料导入" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="1100px"> |
|
|
|
<div style="font-size: 12px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData"> |
|
|
|
<el-form-item :label="'PLM物料编码'"> |
|
|
|
@ -772,7 +780,7 @@ |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<el-container> |
|
|
|
<el-header style="width: 880px;height: 200px;padding: 0 0 0 0"> |
|
|
|
<el-header style="width: 1080px;height: 200px;padding: 0 0 0 0"> |
|
|
|
<span style="font-size: 12px" >可选物料:</span> |
|
|
|
<el-table |
|
|
|
height="200px" |
|
|
|
@ -837,14 +845,14 @@ |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
</el-header> |
|
|
|
<el-main style="width: 880px;height: 27px;margin-top: 70px;padding: 0 0 0 0;text-align:center"> |
|
|
|
<el-main style="width: 1080px;height: 27px;margin-top: 70px;padding: 0 0 0 0;text-align:center"> |
|
|
|
<div> |
|
|
|
<el-button type="primary" @click="addPart">添加>></el-button> |
|
|
|
<el-button type="primary" @click="deletePart">删除<<</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-upload" @click="uploadVisible = true">上传</el-button> |
|
|
|
</div> |
|
|
|
</el-main> |
|
|
|
<el-footer style="width: 880px;height: 200px;padding: 0 0 0 0;"> |
|
|
|
<el-footer style="width: 1080px;height: 200px;padding: 0 0 0 0;"> |
|
|
|
<span style="font-size: 12px" >已选物料:</span> |
|
|
|
<div class="rq"> |
|
|
|
<el-table |
|
|
|
@ -917,6 +925,28 @@ |
|
|
|
<el-input v-model="scope.row.customerPartNo" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="applicationDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="140" |
|
|
|
label="应用描述"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-model="scope.row.applicationDesc" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="productCategory" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="130" |
|
|
|
label="产品类别"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.productCategory" clearable placeholder="请选择" style="width:98%"> |
|
|
|
<el-option v-for="item in productCategoryOptions" :key="item" :label="item" :value="item"></el-option> |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
</el-footer> |
|
|
|
@ -1587,6 +1617,8 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
customerNo: '', |
|
|
|
buNo: '', |
|
|
|
buDesc: '', |
|
|
|
applicationDesc: '', |
|
|
|
productCategory: '', |
|
|
|
plmPartNo: '', |
|
|
|
ifsPartNo: '', |
|
|
|
showInQueryFlag: '', |
|
|
|
@ -1685,6 +1717,20 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
trigger: ['blur','change'] |
|
|
|
} |
|
|
|
], |
|
|
|
applicationDesc: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: ['blur','change'] |
|
|
|
} |
|
|
|
], |
|
|
|
productCategory: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: ['blur','change'] |
|
|
|
} |
|
|
|
], |
|
|
|
}, |
|
|
|
inventoryPartTable: 'General', |
|
|
|
tempCodeNo: '', |
|
|
|
@ -1782,6 +1828,7 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
partListAll: [], |
|
|
|
partList1: [], |
|
|
|
partList2: [], |
|
|
|
productCategoryOptions: ['Label', 'Diecut', 'Decoration', 'Material'], |
|
|
|
partData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
@ -2357,6 +2404,8 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
partNoSource: '料号新增', |
|
|
|
buNo: '', |
|
|
|
buDesc: '', |
|
|
|
applicationDesc: '', |
|
|
|
productCategory: '', |
|
|
|
partItemList: [], |
|
|
|
plmPartNo: '', |
|
|
|
ifsPartNo: '', |
|
|
|
@ -2494,6 +2543,8 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
customerNo: this.searchData.customerId, |
|
|
|
buNo: data.rows.buNo, |
|
|
|
buDesc: data.rows.buDesc, |
|
|
|
applicationDesc: data.rows.applicationDesc || '', |
|
|
|
productCategory: data.rows.productCategory || '', |
|
|
|
partItemList: [], |
|
|
|
plmPartNo: data.rows.plmPartNo, |
|
|
|
ifsPartNo: data.rows.ifsPartNo, |
|
|
|
@ -2627,6 +2678,8 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
partNoSource: '料号复制', |
|
|
|
buNo: '', |
|
|
|
buDesc: '', |
|
|
|
applicationDesc: '', |
|
|
|
productCategory: '', |
|
|
|
partItemList: [], |
|
|
|
plmPartNo: data.rows.plmPartNo, |
|
|
|
ifsPartNo: data.rows.ifsPartNo, |
|
|
|
@ -2737,6 +2790,14 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
this.$message.warning('请选择BU!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.applicationDesc === '' || this.modalData.applicationDesc == null || !String(this.modalData.applicationDesc).trim()) { |
|
|
|
this.$message.warning('请填写应用描述!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.productCategory === '' || this.modalData.productCategory == null) { |
|
|
|
this.$message.warning('请选择产品类别!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.partItemList.length > 0 && (this.modalData.codeNo == null || this.modalData.codeNo === '')) { |
|
|
|
this.$message.warning('存在物料属性,属性模板不能为空值!') |
|
|
|
return |
|
|
|
@ -2956,6 +3017,14 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
this.$message.warning('客户料号不能为空!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.partList2.some(x => x.applicationDesc == null || String(x.applicationDesc).trim() === '')) { |
|
|
|
this.$message.warning('应用描述不能为空!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.partList2.some(x => x.productCategory == null || x.productCategory === '')) { |
|
|
|
this.$message.warning('产品类别不能为空!') |
|
|
|
return |
|
|
|
} |
|
|
|
let tempData = { |
|
|
|
site: this.searchData.site, |
|
|
|
projectId: this.searchData.projectId, |
|
|
|
|