计价方式

src/BIZComponents/inventoryTableDetails.vue

@@ -208,7 +208,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '按数量计价' : row.pricingWay == 2 ? '按数量计价':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/enum/dict.js

@@ -135,6 +135,6 @@ export const proStatusEnum = [
 ];
 // 计价方式
 export const pricingWayList= [
-  { id: 1, name: '按数量计价' },
-  { id: 2, name: '按重量计价' }
+  { id: 1, name: '按数量计费' },
+  { id: 2, name: '按重量计费' }
 ]

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -472,7 +472,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -363,7 +363,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/purchaseOrder/invoice/inventoryTable.vue

@@ -333,7 +333,8 @@ export default {
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
         {

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/detailDialog.vue

@@ -269,7 +269,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/detailDialog.vue

@@ -346,7 +346,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/inventoryTable.vue

@@ -401,7 +401,8 @@ export default {
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
         {

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/detailDialog.vue

@@ -268,7 +268,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

@@ -390,7 +390,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -425,7 +425,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoice/inventoryTable.vue

@@ -450,7 +450,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/detailDialog.vue

@@ -396,7 +396,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -521,7 +521,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTable.vue

@@ -332,7 +332,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/detailDialog.vue

@@ -313,7 +313,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/inventoryTable.vue

@@ -449,7 +449,8 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
+
             }
           },
           {