供应商名称，代号调整

src/views/bpm/stockManagement/storage.vue

@@ -238,18 +238,18 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column v-if="bizType != 2" label="供应商代号" align="center" prop="supplierCode" width="120"
+              <el-table-column 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"
+              <!-- <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> -->
               <el-table-column v-if="bizType == 2" label="产地" align="center" prop="provenance "
                 :show-overflow-tooltip="true" width="120">
               </el-table-column>
@@ -359,18 +359,19 @@
           </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">
+          <el-table-column label="供应商" align="center" prop="supplierName" width="120" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column 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"
+          <!-- <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> -->
           <el-table-column label="刻码" prop="engrave" width="140">
             <template slot-scope="{ row, $index }">
               <el-input v-if="!row.isPack" :ref="'packing_engrave' + $index" @keyup.native="
@@ -937,9 +938,7 @@ export default {
               batchNo: batchNo, // 批次号
               supplierListOptions: supplierList[item.id], // 供应商列表
               supplierId: this.form.supplierId, // 供应商id
-              supplierCode: item.supplierCode, // 供应商代号
-              supplierMark: filtersItem.supplierMark, // 供应商代号
-
+              supplierCode: this.bizType == 2 ? filtersItem.supplierMark : item.supplierCode, // 供应商代号
               supplierName: this.form.supplierName, // 供应商名称
               approvalNumber: item.approvalNumber, // 批准文号
               packingSpecification: item.packingSpecification, // 包装规格
@@ -1131,8 +1130,8 @@ export default {
               batchNo: batchNo, // 批次号
               supplierListOptions: supplierList[item.id], // 供应商列表
               supplierId: '', // 供应商id
-              supplierCode: '',
-              supplierName: '', // 供应商名称
+              supplierCode: item.supplierCode,
+              supplierName: item.supplierName, // 供应商名称
               approvalNumber: item.approvalNumber, // 批准文号
               packingSpecification: item.packingSpecification, // 包装规格
               packingSpecificationOption: newSpecificationOption[index], // 包装规格选项
@@ -1982,8 +1981,7 @@ export default {
           supplierListOptions: supplierList[item.id], // 供应商列表
           supplierId: '', // 供应商id
           supplierCode: item.supplierCode, // 供应商代号
-          supplierMark: item.supplierMark, // 供应商代号
-          supplierName: '', // 供应商名称
+          supplierName: item.supplierName, // 供应商名称
           measureType: item.measureType, // 计量类型
           approvalNumber: item.approvalNumber, // 批准文号
           packingSpecification: item.packingSpecification, // 包装规格
@@ -2686,8 +2684,8 @@ export default {
             categoryCode: row.categoryCode, // 产品编码
             categoryModel: row.categoryModel, // 物品型号
             specification: row.specification, // 规格
-            supplierCode: row.supplierCode, // 供应商编码
-            supplierMark: row.supplierMark, // 供应商代号
+            supplierCode: row.supplierCode, // 供应商代号
+            supplierName: row.supplierName, // 供应商名称
             brandNum: row.brandNum, // 牌号
             parentIndex: row.index, // 产品索引
             batchNo: row.batchNo, // 批次号
@@ -2857,7 +2855,7 @@ export default {
             categoryModel: row.categoryModel, // 物品型号
             specification: row.specification, // 规格
             supplierCode: row.supplierCode, // 供应商编码
-            supplierMark: row.supplierMark,
+            supplierName: row.supplierName, // 供应商名称
             brandNum: row.brandNum, // 牌号
             parentIndex: row.index, // 产品索引
             batchNo: row.batchNo, // 批次号