|
@@ -487,21 +487,21 @@
|
|
<el-table-column
|
|
<el-table-column
|
|
align="left"
|
|
align="left"
|
|
label="实装厂产品编码"
|
|
label="实装厂产品编码"
|
|
- prop="depositMaterial0ldNumber"
|
|
|
|
|
|
+ prop="depositMaterialOldNumber"
|
|
min-width="200"
|
|
min-width="200"
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div
|
|
<div
|
|
v-if="title=='详情'"
|
|
v-if="title=='详情'"
|
|
- :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
|
|
|
|
|
|
+ :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
|
|
>
|
|
>
|
|
- {{ scope.row.depositMaterial0ldNumber }}
|
|
|
|
|
|
+ {{ scope.row.depositMaterialOldNumber }}
|
|
</div>
|
|
</div>
|
|
<el-input
|
|
<el-input
|
|
v-else
|
|
v-else
|
|
- v-model="scope.row.depositMaterial0ldNumber"
|
|
|
|
- :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
|
|
|
|
|
|
+ v-model="scope.row.depositMaterialOldNumber"
|
|
|
|
+ :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
|
|
size="mini"
|
|
size="mini"
|
|
readonly
|
|
readonly
|
|
@click.native="getRealMaterData(scope.$index)"
|
|
@click.native="getRealMaterData(scope.$index)"
|
|
@@ -1598,7 +1598,7 @@ export default {
|
|
getRetailProductList({
|
|
getRetailProductList({
|
|
pageNum: this.currentPage,
|
|
pageNum: this.currentPage,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
- saleId: '',
|
|
|
|
|
|
+ saleId: this.detailList.saleTypeId,
|
|
billType: 'HOME',
|
|
billType: 'HOME',
|
|
materialCode: this.goodsScreenForm.proNum,
|
|
materialCode: this.goodsScreenForm.proNum,
|
|
materialName: this.goodsScreenForm.proName,
|
|
materialName: this.goodsScreenForm.proName,
|
|
@@ -1627,7 +1627,7 @@ export default {
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialId', currentData.materialId)
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialId', currentData.materialId)
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialName', currentData.materialName)
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialName', currentData.materialName)
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialNumber', currentData.materialNumber)
|
|
this.$set(this.detailList.items[this.currentId], 'depositMaterialNumber', currentData.materialNumber)
|
|
- this.$set(this.detailList.items[this.currentId], 'depositMaterial0ldNumber', currentData.materialOldNumber)
|
|
|
|
|
|
+ this.$set(this.detailList.items[this.currentId], 'depositMaterialOldNumber', currentData.materialOldNumber)
|
|
this.$set(this.detailList.items[this.currentId], 'depositSpecification', currentData.specification)
|
|
this.$set(this.detailList.items[this.currentId], 'depositSpecification', currentData.specification)
|
|
this.isSetMaterial = false
|
|
this.isSetMaterial = false
|
|
},
|
|
},
|