From e99ab2cfc2988583ccaed2b63e9d26ba507cc19e Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 27 Sep 2024 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=B7=E6=A0=BC=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Pricesystem/Price/PriceBill.vue | 11 ++----- src/views/Pricesystem/Price/PriceDelivery.vue | 24 ++++++++++++-- .../Pricesystem/Price/PriceTrunkLine.vue | 7 +---- src/views/Pricesystem/PricesyHome.vue | 31 ++++++++++++++----- .../signfor/distributionSignfortreat.vue | 4 +-- 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/views/Pricesystem/Price/PriceBill.vue b/src/views/Pricesystem/Price/PriceBill.vue index ff5e8108..0bb982f1 100644 --- a/src/views/Pricesystem/Price/PriceBill.vue +++ b/src/views/Pricesystem/Price/PriceBill.vue @@ -837,13 +837,7 @@ const handleTrunkLinePricingType = response => { /** 处理车辆类型 */ const handleVehicleTypeArr = response => { - console.log('response :>> ', response); - - const { code, data } = response.data; - - if (code !== 200) return; - - details.vehicleTypeArr = deepClone(data) || []; + details.vehicleTypeArr = deepClone(response) || []; }; /** 获取业务字典 */ @@ -1117,7 +1111,8 @@ const handleAdd = () => { }, ]; details.form = deepClone(details.initForm); - + console.log(details.initForm,'details.form'); + for (let i = 0; i < details.form.billTemplateDetail.length; i++) { const value = details.form.billTemplateDetail[i]; diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue index f4268ca8..b62170a7 100644 --- a/src/views/Pricesystem/Price/PriceDelivery.vue +++ b/src/views/Pricesystem/Price/PriceDelivery.vue @@ -440,6 +440,7 @@ import SurchargeTable from '@/components/pric/tablePric.vue'; import { putBasicdataPrice } from '@/api/Pricesystem/index'; import { useRoute } from 'vue-router'; import { deepClone } from '@/utils/util'; +import { getList } from '@/api/basicdata/basicdataVehicleInfo'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { ElMessage, ElMessageBox } from 'element-plus'; const $route = useRoute(); //获取地址栏参数 @@ -865,12 +866,29 @@ const billing = async () => { form.value[property] = form.value.dispatchPricingType.includes(typeNumber); }); }; - +// 获取车辆类型 +const Obtainvehicle = async()=>{ + try { + let _res = await getList(); + const { code, data } = _res.data; + + if (code == 200) { + pricevehicle.value = data.map(item => { + return { + label: item.vehicleModel, + value: item.id, + }; + }); + } + } catch (e) { + console.log(e, 'error'); + } finally { + } +} const onLoad = async () => { await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型 await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型 - await updateDictionary(pricevehicle.value, 'price_vehicle_type'); //车型 - + await Obtainvehicle();//获取车 // 回显 if (props.templateData.request) { console.log(props.templateData.request, 'props.templateData.request'); diff --git a/src/views/Pricesystem/Price/PriceTrunkLine.vue b/src/views/Pricesystem/Price/PriceTrunkLine.vue index 3446b99f..a1dfc634 100644 --- a/src/views/Pricesystem/Price/PriceTrunkLine.vue +++ b/src/views/Pricesystem/Price/PriceTrunkLine.vue @@ -826,12 +826,7 @@ const handleTrunkLinePricingType = response => { /** 处理车辆类型 */ const handleVehicleTypeArr = response => { console.log('response :>> ', response); - - const { code, data } = response.data; - - if (code !== 200) return; - - details.vehicleTypeArr = deepClone(data) || []; + details.vehicleTypeArr = deepClone(response) || []; }; /** 获取业务字典 */ diff --git a/src/views/Pricesystem/PricesyHome.vue b/src/views/Pricesystem/PricesyHome.vue index 68f850f9..a1e7a40f 100644 --- a/src/views/Pricesystem/PricesyHome.vue +++ b/src/views/Pricesystem/PricesyHome.vue @@ -52,6 +52,7 @@ import { getLazyTreeAll } from '@/api/base/region'; import { $_InfopriceTemplate } from '@/api/financialsector/index.js'; import { useRoute } from 'vue-router'; import { nextTick } from 'vue'; +import { getList } from '@/api/basicdata/basicdataVehicleInfo'; const $route = useRoute(); //仓储模板 @@ -130,7 +131,27 @@ const initData = async () => { console.log('error :>> ', error); } }; - +// 获取车辆类型 +const Obtainvehicle = async()=>{ + try { + let _res = await getList(); + const { code, data } = _res.data; + if (code == 200) { + console.log(data, '车型'); + form.value.priceVehicleResult = data.map(item => { + return { + dictValue: item.vehicleModel, + dictKey: item.id, + }; + }); + initData(); + } + } catch (e) { + console.log(e, 'error'); + } finally { + } +} +Obtainvehicle() // 页面初始化必要请求 const onLoad = async () => { console.log(eltabs.value, 'eltabssss'); @@ -147,20 +168,16 @@ const onLoad = async () => { // 干线计费方式 const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type'); // 车辆类型 - const priceVehiclePromise = getDictionaryBiz('price_vehicle_type'); - const regionOptionePromise = await getLazyTreeAll(); - - const [trunkLineResult, priceVehicleResult, regionOptione] = await Promise.all([ + const [trunkLineResult, regionOptione] = await Promise.all([ trunkLinePromise, - priceVehiclePromise, regionOptionePromise, /** 服务类型 */ updateDictionary(ServiceList.value, 'service_type'), + ]); form.value.trunkLineResult = trunkLineResult; - form.value.priceVehicleResult = priceVehicleResult; form.value.regionOptione = regionOptione; console.log('VehicleTypeList :>> ', VehicleTypeList); diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 5bc2a16f..b5f7f98d 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -498,13 +498,13 @@ size="small" >审 核 - 滞 留 + > -->