From 88e33afa0b5bb5f9199b82781e394d17745233ca Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Thu, 14 Mar 2024 10:25:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=83=9F=E9=85=92?= =?UTF-8?q?=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/modules/merchant.js | 9 + .../merchant/list/handle/merEditForm.vue | 10 +- src/views/merchant/list/handle/merInfo.vue | 7 +- src/views/merchant/list/smoke.vue | 434 ++++++++++++++++++ 4 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 src/views/merchant/list/smoke.vue diff --git a/src/router/modules/merchant.js b/src/router/modules/merchant.js index 3bd8deb..b050df1 100644 --- a/src/router/modules/merchant.js +++ b/src/router/modules/merchant.js @@ -48,6 +48,15 @@ const merchantRouter = }, component: () => import('@/views/merchant/list/supplier') }, + { + path: 'smoke', + name: 'MerchantShopList', + meta: { + title: '烟酒店', + noCache: true + }, + component: () => import('@/views/merchant/list/smoke') + }, { path: 'list/reconciliation/:id/:type?', name: 'MerchantRecord', diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index 5e34404..fc3c586 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -337,11 +337,12 @@ + - + 普通商户
酒道馆
供应商
+
烟酒店
  • 关联商户:
    @@ -244,7 +245,11 @@ export default { merData: { handler() { this.merData.merchant_type = this.defaultMerchantType || 0; - this.mar_type_name = this.defaultMerchantType == 1 ? '酒道馆' : (this.defaultMerchantType == 2 ? '供应商' :'商户'); + + if(this.defaultMerchantType == 1) this.mar_type_name = '酒道馆'; + else if(this.defaultMerchantType == 2) this.mar_type_name = '供应商'; + else if(this.defaultMerchantType == 3) this.mar_type_name = '烟酒店'; + else this.mar_type_name = '商户'; }, deep: true } diff --git a/src/views/merchant/list/smoke.vue b/src/views/merchant/list/smoke.vue new file mode 100644 index 0000000..d774aee --- /dev/null +++ b/src/views/merchant/list/smoke.vue @@ -0,0 +1,434 @@ + + + +