|
|
@ -72,6 +72,7 @@
|
|
|
|
>新增
|
|
|
|
>新增
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<!--
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="info"
|
|
|
|
type="info"
|
|
|
@ -82,7 +83,7 @@
|
|
|
|
v-hasPermi="['mes:pro:order:import']"
|
|
|
|
v-hasPermi="['mes:pro:order:import']"
|
|
|
|
>导入
|
|
|
|
>导入
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>-->
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="warning"
|
|
|
|
type="warning"
|
|
|
@ -979,16 +980,16 @@ export default {
|
|
|
|
for (let i = 0; i < this.selectMaterielList.length; i++) {
|
|
|
|
for (let i = 0; i < this.selectMaterielList.length; i++) {
|
|
|
|
if(this.form.prodCode.indexOf(this.selectMaterielList[i].productCode)<0){
|
|
|
|
if(this.form.prodCode.indexOf(this.selectMaterielList[i].productCode)<0){
|
|
|
|
code = code + this.selectMaterielList[i].productCode + ',';
|
|
|
|
code = code + this.selectMaterielList[i].productCode + ',';
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){
|
|
|
|
|
|
|
|
desc = desc + this.selectMaterielList[i].productDescZh + ',';
|
|
|
|
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
message: this.selectMaterielList[i].productDescZh+'已经选择',
|
|
|
|
message: this.selectMaterielList[i].productDescZh+'已经选择',
|
|
|
|
type: 'warning'
|
|
|
|
type: 'warning'
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){
|
|
|
|
|
|
|
|
desc = desc + this.selectMaterielList[i].productDescZh + ',';
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.form.prodCode += code;
|
|
|
|
this.form.prodCode += code;
|
|
|
|
this.form.prodDesc += desc;
|
|
|
|
this.form.prodDesc += desc;
|
|
|
|