From a3aeeeaae2525f461c41b8e8ce1c1da5b40d487a Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 1 Aug 2024 17:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/storagecost/Categorypricingunit.js | 118 +++---- .../basicdata/brand/basicStoreContact.vue | 3 + .../Basicconfiguration.vue | 55 +++ .../Categorypricingunit.vue | 6 +- .../DeliveryCostPricingTemplate.vue | 314 ++++++++++++++++++ .../Deliverymaintenancecosts.vue | 150 +-------- .../WarehouseTemplateHome.vue | 104 ++++-- 7 files changed, 516 insertions(+), 234 deletions(-) create mode 100644 src/views/cost/Deliverycostmanagement/Basicconfiguration.vue create mode 100644 src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue diff --git a/src/option/storagecost/Categorypricingunit.js b/src/option/storagecost/Categorypricingunit.js index ec183bb2..8856fb6e 100644 --- a/src/option/storagecost/Categorypricingunit.js +++ b/src/option/storagecost/Categorypricingunit.js @@ -1,70 +1,50 @@ export const columnList = [ - { - prop: 'checkbox', - label: '复选框', - type: 0, - width: 35, - fixed: true, - }, - { - prop: 'xh', - label: '序号', - type: 12, - values: '', - width: 35, - fixed: true, - }, - { - prop: 'a1', - label: '成本结算品类', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a2', - label: '维护状态 ', - type: 3, - values: '', - width: '150', - checkarr: [ - { - label: '已维护', - value: '已维护', - }, - { - label: '未维护', - value: '未维护', - }, - ], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a3', - label: '计价单位', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'createUserName', - label: '操作', - type: 6, - values: '', - width: '80', - checkarr: [], - fixed: 'right', - sortable: false, - }, - ]; - \ No newline at end of file + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 35, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 35, + fixed: true, + }, + { + prop: 'a1', + label: '成本结算品类', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'a3', + label: '计价单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '80', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/views/basicdata/brand/basicStoreContact.vue b/src/views/basicdata/brand/basicStoreContact.vue index 566907c1..c39fec42 100644 --- a/src/views/basicdata/brand/basicStoreContact.vue +++ b/src/views/basicdata/brand/basicStoreContact.vue @@ -275,6 +275,9 @@ export default { if (!this.form.id) { this.form.shopId = this.$route.query.id; //门店ID this.form.partitionType = this.$route.query.type; //区别类型 + if(!this.data.length){ + this.form.defaultType=true + } add(this.form).then(() => { this.box = false; this.onLoad(this.page); diff --git a/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue new file mode 100644 index 00000000..68fac56f --- /dev/null +++ b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue index 31cbe4d6..5b424bd5 100644 --- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue +++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue @@ -15,16 +15,16 @@ - - --> + diff --git a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue new file mode 100644 index 00000000..09bc7906 --- /dev/null +++ b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue @@ -0,0 +1,314 @@ + + + + + diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue index 687bbf0c..1c76ccee 100644 --- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue +++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue @@ -5,16 +5,6 @@
-
- 计价规则：配置 -
-
- 车型配置 -
- - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 总公里 - 点位公里 - 最远点位公里数 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 总公里数 - 点位公里数 - 最远点位公里数 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 总公里数 - 点位公里数 - 最远点位公里数 - - - - - 统一计费 - 区域计费 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - 总公里数 - 点位公里数 - 最远点位公里数 - - - - - 是 - 否 - - - - - 是 - 否 - - - - - -
@@ -355,7 +227,7 @@ import SurchargeTable from '@/components/pric/tablePric.vue'; import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js'; import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse'; const activeName = ref('Commercialdistribution'); -const SelectData=ref({});//当前点击品类 +const SelectData = ref({}); //当前点击品类 // 配置计价规则 const formLoad = ref({}); const form = ref({ @@ -673,12 +545,12 @@ const dispatchSubjoinCategory = ref([ ]); const handleRowFocus = value => { SelectData.value = value; - console.log(SelectData.value,'当前点击的品类'); + console.log(SelectData.value, '当前点击的品类'); }; // 品类搜索 -const search = (value,row) => { - console.log(value,'value'); - console.log(row,'row'); +const search = (value, row) => { + console.log(value, 'value'); + console.log(row, 'row'); }; const handleClick = () => {}; const categoriesduceSurcharge = row => { @@ -716,13 +588,11 @@ const Pricingrules = () => { console.log(form.value); }; // 新增超区区域计费 -const Oversizedbillingadd=()=>{ - -} +const Oversizedbillingadd = () => {}; // 删除超区区域计费 -const Oversizedbillingdel=(row)=>{ -console.log(row,'删除超区费'); -} +const Oversizedbillingdel = row => { + console.log(row, '删除超区费'); +};