修复开单录单查询车辆类型

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -27,7 +27,7 @@
               v-model="details.query.endWarehouseId"
               class="w100"
               clearable
-              placeholder="请选择始发仓"
+              placeholder="请选择目的仓"
               filterable
             >
               <el-option

src/views/distribution/artery/VehicleStowage.vue

@@ -31,7 +31,7 @@
               v-model="details.query.endWarehouseId"
               class="w100"
               clearable
-              placeholder="请选择始发仓"
+              placeholder="请选择目的仓"
               filterable
             >
               <el-option

src/views/distribution/inventory/CreateOrder.vue

@@ -1447,6 +1447,7 @@ import {
   postFindAdvanceDetailListByWaybillId,
 } from '@/api/distribution/CreateOrder.js';
 import { postPrintBatch } from '@/api/waybill/WaybillOrderList.js';
+import { getList } from '@/api/basicdata/basicdataVehicleInfo';
 
 // 获取vue实例
 const instance = getCurrentInstance();
@@ -2193,11 +2194,16 @@ const handleTranslationLocation = key => {
 };
 
 /** 获取车型 */
-getDictionaryBiz('price_vehicle_type').then(res => {
+getList({}).then(res => {
   const { code, data } = res.data;
-  if (code !== 200) return;
+  if (code !== 200 || getObjType(data) !== 'array') return;
 
-  details.vehicleTypeArr = data || [];
+  details.vehicleTypeArr = data.map(val => {
+    return {
+      dictKey: val.id,
+      dictValue: val.vehicleModel,
+    };
+  });
 });
 
 /** 初始化获取暂存单转运单信息 */

src/views/waybill/CreateZeroOrder.vue

@@ -1077,8 +1077,8 @@
 
 <script lang="ts">
 export default {
-  name: '/waybill/CreateZeroOrder'
+  name: '/waybill/CreateZeroOrder',
-}
+};
 </script>
 
 <script setup lang="ts">
@@ -1118,8 +1118,8 @@ import {
   postFindArrPrice,
 } from '@/api/distribution/CreateOrder.js';
 import { postFindBrandList } from '@/api/waybill/TemporaryStorageList.js';
-import { isNumber, getObjType, deepClone,floorToDecimalPlaces } from '@/utils/util.js';
+import { isNumber, getObjType, deepClone, floorToDecimalPlaces } from '@/utils/util.js';
-import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults';
+import { getList } from '@/api/basicdata/basicdataVehicleInfo';
 
 // 获取vue实例
 const instance = getCurrentInstance();
@@ -1683,11 +1683,17 @@ const handleTranslationLocation = key => {
 onMounted(() => {});
 
 /** 获取车型 */
-getDictionaryBiz('price_vehicle_type').then(res => {
+/** 获取车型 */
+getList({}).then(res => {
   const { code, data } = res.data;
-  if (code !== 200) return;
+  if (code !== 200 || getObjType(data) !== 'array') return;
 
-  details.vehicleTypeArr = data || [];
+  details.vehicleTypeArr = data.map(val => {
+    return {
+      dictKey: val.id,
+      dictValue: val.vehicleModel,
+    };
+  });
 });
 
 const initPageInfo = async () => {
@@ -1948,7 +1954,7 @@ const handleAdd = () => {
     /** 系统维护 -- 提货计价方式 */
     systemPickupChargeType: 1,
     /** 系统维护 -- 仓库计价方式 */
-    systemWarehouseChargeType: 1,    
+    systemWarehouseChargeType: 1,
     /** 件数 */
     num: 0,
     /** 重量(kg) */
@@ -2023,13 +2029,13 @@ const destinationWarehouseNameChange = val => {
 
 /** 查询货物 */
 const handleFindGoods = async (goodsName, item, isClearId = 0) => {
-  if (isClearId){
+  if (isClearId) {
-     item.goodsId = '';
+    item.goodsId = '';
-      item.confirmCostCategoryId = '';
+    item.confirmCostCategoryId = '';
-      item.confirmCostCategoryName = '';
+    item.confirmCostCategoryName = '';
-      item.confirmIncomeCategoryId = '';
+    item.confirmIncomeCategoryId = '';
-      item.confirmIncomeCategoryName = '';
+    item.confirmIncomeCategoryName = '';
-    }
+  }
 
   if (!goodsName) return (item.goodsListOptions = []);
 
@@ -2427,7 +2433,8 @@ const handleDispatchPrice = (dispatch, template) => {
 
   // 是否存在最低计费
   if (
-    (dispatch && template) &&
+    dispatch &&
+    template &&
     template.trunklineIsMinCost &&
     Number(template.dispatchMinCostMode) === 1
   ) {
@@ -2521,7 +2528,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
       /** 系统维护 -- 提货计价方式 */
       systemPickupChargeType: 1,
       /** 系统维护 -- 仓库计价方式 */
-      systemWarehouseChargeType: 1,    
+      systemWarehouseChargeType: 1,
       /** 件数 */
       num: 0,
       /** 重量(kg) */
@@ -2549,7 +2556,7 @@ const handleComputedPlanPrice = submitData => {
   const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
 
   // 总件数
-  const _totalCount = details.totalObj.totalCount
+  const _totalCount = details.totalObj.totalCount;
 
   const { addList } = submitData;
   const typeArr = { 1: 'num', 2: 'volume', 3: 'weight' };
@@ -2672,12 +2679,10 @@ const handleComputedPlanPrice = submitData => {
 
   // 配送
   if (dispatch && template && template.dispatchIsMinCost) {
-
     switch (Number(template.dispatchMinCostType)) {
       // 价格
       case 1:
-        _totalPlanPrce =
+        _totalPlanPrce = dispatch.minCost > _totalPrce ? dispatch.minCost : _totalPrce;
-          dispatch.minCost > _totalPrce ? dispatch.minCost : _totalPrce;
         break;
 
       // 件
@@ -2707,7 +2712,6 @@ const handleComputedPlanPrice = submitData => {
       default:
         break;
     }
-  
   }
 
   console.log('addList :>> ', addList);
@@ -2748,7 +2752,7 @@ const handleComputedPlanPrice = submitData => {
     if (dispatch && template && template.dispatchIsMinCost) {
       console.log('_totalPlanPrce :>> ', _totalPlanPrce);
       console.log('_totalPrce :>> ', _totalPrce);
-      const differenceValue = computeNumber(_totalPlanPrce , '-', _totalPrce).next(
+      const differenceValue = computeNumber(_totalPlanPrce, '-', _totalPrce).next(
         '/',
         _totalCount
       ).result;
@@ -2869,7 +2873,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
 
           // 零担 -- 2
           submitData.waybillType = 2;
-          handleComputedPlanPrice(submitData)
+          handleComputedPlanPrice(submitData);
 
           console.log('submitData :>> ', submitData);
           res = await postOpenOrderOpenZeroWaybill(submitData);
@@ -2925,7 +2929,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
             submitData.receipt = submitData.receipt.join(',');
           console.log('submitData :>> ', submitData);
 
-          handleComputedPlanPrice(submitData)
+          handleComputedPlanPrice(submitData);
           // 记录提交参数
           details.submitData = submitData;
 
@@ -3017,12 +3021,11 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template, chargeTy
   // 是否区分品类
   if (template.trunklineIsByCategory) {
     // 品类是否存在id
-   if (!value.goodsId) {
+    if (!value.goodsId) {
       value.price = 0;
       value.freightPrice = 0;
       value.systemChargeType = 1;
-    } 
+    } else if (chargeType === undefined) {
-    else if (chargeType === undefined) {
       let _item: any = {};
       // 件
       if (getObjType(pieceCategory) === 'array') {
@@ -3063,7 +3066,7 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template, chargeTy
         }
       }
 
-       if (!_item.chargeType) {
+      if (!_item.chargeType) {
         value.price = 0;
         value.freightPrice = 0;
         value.systemChargeType = 1;
@@ -3117,7 +3120,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
 
     // value.price = 5;
 
-    if (getObjType(trunkLine) !== 'object' || getObjType(template) !== 'object'){
+    if (getObjType(trunkLine) !== 'object' || getObjType(template) !== 'object') {
       value.freightPrice = 0;
       return (value.price = 0);
     }
@@ -3130,11 +3133,10 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
     // 是否区分品类
     if (template.trunklineIsByCategory) {
       // 品类是否存在id
-     if (!value.goodsId) {
+      if (!value.goodsId) {
         value.freightPrice = 0;
         value.price = 0;
-      }
+      } else {
-      else {
         let _item: any = {};
         // 件
         if (getObjType(pieceCategory) === 'array') {
@@ -3153,7 +3155,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
       }
     } else {
       // 不区分品类
-     const _price =
+      const _price =
         getObjType(pieceCategory) === 'array' && pieceCategory.length > 0
           ? pieceCategory[0].price || 0
           : 0;
@@ -3169,12 +3171,11 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
 
     // 是否区分品类
     if (template.trunklineIsByCategory) {
-     // 品类是否存在id
+      // 品类是否存在id
       if (!value.goodsId) {
         value.freightPrice = 0;
         value.price = 0;
-      }
+      } else {
-      else {
         let _item: any = {};
 
         // 方
@@ -3198,7 +3199,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
           ? cubeCategory[0].price || 0
           : 0;
 
-            // 不区分品类
+      // 不区分品类
       value.price = _price;
 
       value.freightPrice = _price;
@@ -3209,11 +3210,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
 };
 
 /** 提货价格赋值 */
-const handleAssignmentItemPricePickUp = (
+const handleAssignmentItemPricePickUp = (value, pickup, template) => {
-  value,
-  pickup,
-  template
-) => {
   const { pieceCategory, cubeCategory, weightCategory } = pickup;
 
   const _obj = {
@@ -3265,11 +3262,7 @@ const handleAssignmentItemPricePickUp = (
 };
 
 /** 配送价格赋值 */
-const handleAssignmentItemPriceDispatch = (
+const handleAssignmentItemPriceDispatch = (value, dispatch, template) => {
-  value,
-  dispatch,
-  template
-) => {
   const { pieceCategory, cubeCategory, weightCategory } = dispatch;
 
   const _obj = {
@@ -3319,11 +3312,7 @@ const handleAssignmentItemPriceDispatch = (
 };
 
 /** 仓储管理价格赋值 */
-const handleAssignmentItemPriceWarehouseManagementPrice = (
+const handleAssignmentItemPriceWarehouseManagementPrice = (value, warehouse, template) => {
-  value,
-  warehouse,
-  template
-) => {
   if (!template || !template.warehouseIsAddFee || !template.warehouseIsManageFee) {
     value.warehouseManagementPrice = 0;
     value.warehouseManagementType = 1;
@@ -3380,7 +3369,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
       else handleAssignmentItemPriceTrunkline(value, trunkLine, template, chargeType);
 
       // 是否为区分品类
-    } else{
+    } else {
       value.freightPrice = 0;
       value.price = 0;
     }
@@ -3392,8 +3381,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   } else value.pickupPrice = 0;
 
   // 配送
-  if (dispatch && template)
+  if (dispatch && template) handleAssignmentItemPriceDispatch(value, dispatch, template);
-    handleAssignmentItemPriceDispatch(value, dispatch, template);
   else value.deliveryPrice = 0;
 
   // 仓库
@@ -3570,43 +3558,43 @@ watch(
     if (_id === details.pageId) return;
     details.pageId = _id;
     details.goodsList = [
-    {
+      {
-      /** 货物名称  */
+        /** 货物名称  */
-      goodsName: '',
+        goodsName: '',
-      /** 品类Id */
+        /** 品类Id */
-      goodsId: '',
+        goodsId: '',
-      /** 货物品类 */
+        /** 货物品类 */
-      waybillDetailList: '',
+        waybillDetailList: '',
-      /** 计费方式 */
+        /** 计费方式 */
-      chargeType: 1,
+        chargeType: 1,
-      /** 系统维护 -- 干线计价方式 */
+        /** 系统维护 -- 干线计价方式 */
-      systemChargeType: 1,
+        systemChargeType: 1,
-      /** 系统维护 -- 配送计价方式 */
+        /** 系统维护 -- 配送计价方式 */
-      systemDeliveryChargeType: 1,
+        systemDeliveryChargeType: 1,
-      /** 系统维护 -- 提货计价方式 */
+        /** 系统维护 -- 提货计价方式 */
-      systemPickupChargeType: 1,
+        systemPickupChargeType: 1,
-      /** 系统维护 -- 仓库计价方式 */
+        /** 系统维护 -- 仓库计价方式 */
-      systemWarehouseChargeType: 1,    
+        systemWarehouseChargeType: 1,
-      /** 件数 */
+        /** 件数 */
-      num: 0,
+        num: 0,
-      /** 重量(kg) */
+        /** 重量(kg) */
-      weight: 0,
+        weight: 0,
-      /** 体积(方) */
+        /** 体积(方) */
-      volume: 0,
+        volume: 0,
-      /** 单价 */
+        /** 单价 */
-      price: 0,
+        price: 0,
-      /** 系统维护 -- 运费单价 */
+        /** 系统维护 -- 运费单价 */
-      freightPrice: 0,
+        freightPrice: 0,
-      /** 系统维护 -- 配送单价 */
+        /** 系统维护 -- 配送单价 */
-      deliveryPrice: 0,
+        deliveryPrice: 0,
-      /** 系统维护 -- 提货单价 */
+        /** 系统维护 -- 提货单价 */
-      pickupPrice: 0,
+        pickupPrice: 0,
-      /** 运费小计 */
+        /** 运费小计 */
-      subtotalFreight: 0,
+        subtotalFreight: 0,
-      goodsListOptions: [],
+        goodsListOptions: [],
-    },
+      },
-  ];
+    ];
-  initPageInfo();
+    initPageInfo();
   },
   { immediate: true }
 );