From bb10c30758840167bf418edbdf4888c50b0e3b5c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 16 Apr 2024 17:11:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionStockArticle.js | 10 + src/components/pric/tablePric.vue | 2 +- .../Pricesystem/Price/PriceWarehousing.vue | 460 +++++++++++++----- src/views/Pricesystem/PricesyHome.vue | 2 +- .../Financialse/FinancialWarehousing.vue | 6 +- .../distributionStockArticle.vue | 45 +- 6 files changed, 386 insertions(+), 139 deletions(-) diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index cb307d5d..6ff775df 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -364,3 +364,13 @@ export const postShowOrderCode = params => { params, }); }; + + +export const $_signforDistributionStockArticleList = params => { + return request({ + url: '/api/logpm-distribution/distributionStockArticle/export-signforDistributionStockArticleList', + method: 'get', + params, + responseType: 'blob', + }); +}; \ No newline at end of file diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue index ff61a18e..f4fb0ecf 100644 --- a/src/components/pric/tablePric.vue +++ b/src/components/pric/tablePric.vue @@ -13,7 +13,7 @@ v-model="scope.row[column.prop]" :precision="2" :min="0" - :max="10" + :max="999999" :controls="false" placeholder="请输入价格" /> diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue index 948011c6..71ff01e2 100644 --- a/src/views/Pricesystem/Price/PriceWarehousing.vue +++ b/src/views/Pricesystem/Price/PriceWarehousing.vue @@ -4,29 +4,72 @@
- + + + - + + +
- + + {{ + item.label + }} +
-
+
附加费用
统一计费单价
- + - +
-
+
-
+
@@ -68,7 +115,7 @@
-
+ -
+ -
+
- 按吨计费(t) - - - - - + {{tabform.title}} + +
@@ -133,153 +174,309 @@ diff --git a/src/views/Pricesystem/PricesyHome.vue b/src/views/Pricesystem/PricesyHome.vue index 1ae244af..52e6bf7c 100644 --- a/src/views/Pricesystem/PricesyHome.vue +++ b/src/views/Pricesystem/PricesyHome.vue @@ -29,11 +29,10 @@ import { ref, defineAsyncComponent } from 'vue'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { $_basicdataBrande } from '@/api/financialsector/index'; //价格模板 -import { $_InfopriceTemplate as getInfo } from '@/api/Pricesystem/index.js'; +import { $_InfopriceTemplate as getInfo,getBasicdataPrice } from '@/api/Pricesystem/index.js'; import { $_InfopriceTemplate } from '@/api/financialsector/index.js'; import { useRoute } from 'vue-router'; import { nextTick } from 'vue'; - const $route = useRoute(); //仓储模板 @@ -101,7 +100,7 @@ const initData = async () => { const { code, data } = res.data; if (code !== 200) return; - + form.value.requestInfo=data;//发送回显数据 // form.value = data; } catch (error) { console.log('error :>> ', error); @@ -112,7 +111,7 @@ const initData = async () => { const onLoad = async () => { try { pageLoading.value = true; - + const PromiseAll = [ /** 服务类型 */ updateDictionary(ServiceList.value, 'service_type'), @@ -121,8 +120,8 @@ const onLoad = async () => { ]; await Promise.all(PromiseAll); - - initData(); + + console.log('VehicleTypeList :>> ', VehicleTypeList); let data = { @@ -140,10 +139,10 @@ const onLoad = async () => { form.value.request = data; console.log('form.value.ServiceType :>> ', form.value.ServiceType); const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value)); - + await initData(); // 激活菜单设置为已经存在的 executeCheckedResults(result); - + await nextTick(); setTimeout(() => { console.log('financialBill :>> ', financialBill); diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 5457c528..7bfc9d2a 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2293,11 +2293,11 @@ export default { }, //确定 callFordelivery(inde) { - if (!this.selectionList.length) { - console.log(this.selectionListStock, '23'); - this.$message.warning('至少选择一条数据！'); - return; - } + // if (!this.selectionList.length) { + // console.log(this.selectionListStock, '23'); + // this.$message.warning('至少选择一条数据！'); + // return; + // } let isa = false; this.selectionList.some(i => { if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) {