|
@@ -343,7 +343,7 @@
|
|
|
<span v-else>{{ row.materielDesignation }}</span>
|
|
<span v-else>{{ row.materielDesignation }}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="客户代号" prop="clientCode">
|
|
|
|
|
|
|
+ <el-table-column label="客户代号" prop="clientCode" width="130">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
<el-input v-if="!row.isPack" :ref="'packing_clientCode' + $index" @keyup.native="
|
|
<el-input v-if="!row.isPack" :ref="'packing_clientCode' + $index" @keyup.native="
|
|
|
moveFocus($event, $index, 'packing_clientCode', '包装', row)
|
|
moveFocus($event, $index, 'packing_clientCode', '包装', row)
|
|
@@ -357,6 +357,20 @@
|
|
|
<span v-else> {{ row.customerMark }}</span>
|
|
<span v-else> {{ row.customerMark }}</span>
|
|
|
</template> -->
|
|
</template> -->
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="牌号" prop="brandNum" width="80">
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+ <el-table-column v-if="bizType != 2" label="供应商代号" align="center" prop="supplierCode" width="120"
|
|
|
|
|
+ :show-overflow-tooltip="true">
|
|
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
|
|
+ {{ row.supplierCode }}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+ <el-table-column v-else-if="bizType == 2" label="供应商代号" align="center" prop="supplierMark" width="120"
|
|
|
|
|
+ :show-overflow-tooltip="true">
|
|
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
|
|
+ {{ row.supplierMark }}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="刻码" prop="engrave" width="140">
|
|
<el-table-column label="刻码" prop="engrave" width="140">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
<el-input v-if="!row.isPack" :ref="'packing_engrave' + $index" @keyup.native="
|
|
<el-input v-if="!row.isPack" :ref="'packing_engrave' + $index" @keyup.native="
|
|
@@ -1964,7 +1978,8 @@ export default {
|
|
|
batchNo: batchNo, // 批次号
|
|
batchNo: batchNo, // 批次号
|
|
|
supplierListOptions: supplierList[item.id], // 供应商列表
|
|
supplierListOptions: supplierList[item.id], // 供应商列表
|
|
|
supplierId: '', // 供应商id
|
|
supplierId: '', // 供应商id
|
|
|
- supplierCode: '',
|
|
|
|
|
|
|
+ supplierCode: item.supplierCode, // 供应商代号
|
|
|
|
|
+ supplierMark: item.supplierMark, // 供应商代号
|
|
|
supplierName: '', // 供应商名称
|
|
supplierName: '', // 供应商名称
|
|
|
measureType: item.measureType, // 计量类型
|
|
measureType: item.measureType, // 计量类型
|
|
|
approvalNumber: item.approvalNumber, // 批准文号
|
|
approvalNumber: item.approvalNumber, // 批准文号
|
|
@@ -2657,6 +2672,7 @@ export default {
|
|
|
categoryModel: row.categoryModel, // 物品型号
|
|
categoryModel: row.categoryModel, // 物品型号
|
|
|
specification: row.specification, // 规格
|
|
specification: row.specification, // 规格
|
|
|
supplierCode: row.supplierCode, // 供应商编码
|
|
supplierCode: row.supplierCode, // 供应商编码
|
|
|
|
|
+ supplierMark: row.supplierMark, // 供应商代号
|
|
|
brandNum: row.brandNum, // 牌号
|
|
brandNum: row.brandNum, // 牌号
|
|
|
parentIndex: row.index, // 产品索引
|
|
parentIndex: row.index, // 产品索引
|
|
|
batchNo: row.batchNo, // 批次号
|
|
batchNo: row.batchNo, // 批次号
|
|
@@ -2814,6 +2830,7 @@ export default {
|
|
|
categoryModel: row.categoryModel, // 物品型号
|
|
categoryModel: row.categoryModel, // 物品型号
|
|
|
specification: row.specification, // 规格
|
|
specification: row.specification, // 规格
|
|
|
supplierCode: row.supplierCode, // 供应商编码
|
|
supplierCode: row.supplierCode, // 供应商编码
|
|
|
|
|
+ supplierMark: row.supplierMark,
|
|
|
brandNum: row.brandNum, // 牌号
|
|
brandNum: row.brandNum, // 牌号
|
|
|
parentIndex: row.index, // 产品索引
|
|
parentIndex: row.index, // 产品索引
|
|
|
batchNo: row.batchNo, // 批次号
|
|
batchNo: row.batchNo, // 批次号
|