Sfoglia il codice sorgente

feat: 添加型号、规格和牌号列并统一字段命名

liujt 8 mesi fa
parent
commit
b04f918728

+ 26 - 3
src/BIZComponents/outdetails.vue

@@ -168,7 +168,7 @@
             <el-table-column
               label="型号"
               align="center"
-              prop="categoryModel"
+              prop="modelType"
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
@@ -180,7 +180,7 @@
             <el-table-column
               label="牌号"
               align="center"
-              prop="brandNum"
+              prop="productBrand"
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
@@ -312,6 +312,24 @@
               prop="categoryName"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              label="型号"
+              align="center"
+              prop="modelType"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="规格"
+              align="center"
+              prop="specification"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="牌号"
+              align="center"
+              prop="productBrand"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="批次号"
               prop="batchNo"
@@ -644,6 +662,8 @@
             // productItem['bizNo'] = res.bizNo[productIndex]||res.bizNo[0];
             return {
               ...productItem,
+              productBrand: productItem.brandNum,
+              modelType: productItem.categoryModel,
               outInDetailRecordRequestList:
                 productItem.outInDetailRecordRequestList.map((packingItem) => {
                   return {
@@ -670,7 +690,10 @@
         for (const key in this.productList) {
           for (const k in this.productList[key].outInDetailRecordRequestList) {
             arr.push({
-              ...this.productList[key].outInDetailRecordRequestList[k]
+              ...this.productList[key].outInDetailRecordRequestList[k],
+              modelType: this.productList[key].categoryModel,
+              specification: this.productList[key].specification,
+              productBrand: this.productList[key].brandNum,
             });
           }
         }

+ 6 - 0
src/views/saleManage/saleOrder/exceptionManagement/components/addOrEditDialog.vue

@@ -322,6 +322,12 @@
             slot: 'modelType',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'productBrand',
+            label: '牌号',
+            align: 'center'
+          },
 
           // {
           //   minWidth: 100,

+ 21 - 1
src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -355,7 +355,27 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-
+          {
+            minWidth: 120,
+            prop: 'modelType',
+            label: '型号',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 120,
+            prop: 'specification',
+            label: '规格',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 120,
+            prop: 'productBrand',
+            label: '牌号',
+            showOverflowTooltip: true,
+            align: 'center'
+          },  
           {
             minWidth: 160,
             prop: 'batchNo',