Merge branch 'dev' into pre-production

src/views/distribution/inventory/CreateOrder.vue

@@ -2868,11 +2868,13 @@ const destinationWarehouseNameChange = val => {
  * row -- 行数据
  * onlyComputedTrunline -- 是否只计算干线的价格
  */
-const handleComputed = (row: any, onlyComputedTrunline = false) => {
+const handleComputed = (row: any, onlyComputedTrunline = false, chargeType = null) => {
   const { template, trunkLine } = details.priceTemplate;
 
-  if (Boolean(isDisabled.value && template && trunkLine && !onlyComputedTrunline))
+  if (Boolean(isDisabled.value && template && trunkLine)) {
-    handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
+    if (!chargeType && !onlyComputedTrunline)
+      handleSpecialBrandPrice(row, trunkLine, template, onlyComputedTrunline);
+  }
 
   details.query.goodsCode = '-' + details.totalObj.totalCount;
 
@@ -4592,7 +4594,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   }
 
   // 计算每行价格
-  if (!isOnload) handleComputed(value, !isOnload);
+  if (!isOnload) handleComputed(value, isOnload, chargeType);
 };
 
 /** 获取价格

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -211,6 +211,7 @@ import {
   setNodeHeight,
   handleClearTableQuery,
   handleInputQuery,
+  handleTranslationDataSeclect,
 } from '@/utils/util';
 import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
@@ -374,7 +375,7 @@ export default {
         },
 
         {
-          prop: 'conditionsType',
+          prop: 'conditionsName',
           label: '包件类型',
           type: 3,
           values: '',
@@ -388,6 +389,10 @@ export default {
               label: '库存品',
               value: '2',
             },
+            {
+              label: '零担',
+              value: '3',
+            },
           ],
           fixed: false,
           sortable: false,
@@ -746,10 +751,15 @@ export default {
           const { code, data } = res.data;
           if (code !== 200) return;
           console.log(res, '获取到的页面初始值');
-          for (let index = 0; index < data.records.length; index++) {
+
-            const element = data.records[index];
+          handleTranslationDataSeclect(data.records, this.columnList);
-            element.conditionsType = element.conditions === 1 ? '定制品' : '库存品';
+
-          }
+          console.log('data.records :>> ', data.records);
+
+          // for (let index = 0; index < data.records.length; index++) {
+          //   const element = data.records[index];
+          //   element.conditionsType = element.conditions === 1 ? '定制品' : '库存品';
+          // }
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;

src/views/waybill/CreateZeroOrder.vue

@@ -2158,11 +2158,13 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => {
  * row -- 行数据
  * onlyComputedTrunline -- 是否只计算干线的价格
  */
-const handleComputed = (row: any, onlyComputedTrunline = false) => {
+const handleComputed = (row: any, onlyComputedTrunline = false, chargeType = null) => {
   const { template, trunkLine } = details.priceTemplate;
 
-  if (Boolean(isDisabled.value && template && trunkLine && !onlyComputedTrunline))
+  if (Boolean(isDisabled.value && template && trunkLine)) {
-    handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
+    if (!chargeType && !onlyComputedTrunline)
+      handleSpecialBrandPrice(row, trunkLine, template, onlyComputedTrunline);
+  }
 
   details.query.goodsCode = '-' + details.totalObj.totalCount;
 
@@ -3684,7 +3686,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   }
 
   // 计算每行价格
-  if (!isOnload) handleComputed(value, !isOnload);
+  if (!isOnload) handleComputed(value, isOnload, chargeType);
 };
 
 /** 获取价格