From c3830a636d1136ed6a714cf803d398d310545fcb Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 28 Jun 2024 09:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E5=92=8C=E8=81=94=E7=9B=9F=E5=95=86=E5=AE=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/list/handle/merEditForm.vue      | 25 ++++++++++++++++++-
 src/views/merchant/list/handle/merInfo.vue    |  8 ++++++
 src/views/merchant/list/index.vue             | 10 +++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index acbe1ea..3d24bec 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -329,7 +329,7 @@
             </el-row>
             <el-row :gutter="24" class="mt20">
               <el-col :span="12">
-                <el-form-item :label="mar_type_name +' 类别：'" prop="merchant_type">
+                <el-form-item :label="mar_type_name +'类别：'" prop="merchant_type">
                   <el-select v-model="merData.merchant_type" disabled placeholder="请选择" class="selWidth">
                     <el-option label="普通商户" :value="0" />
                     <el-option label="酒道馆" :value="1" />
@@ -354,6 +354,29 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <!--商户子类型-->
+            <el-row :gutter="24" class="mt20">
+              <!--商户类别：0=普通商户，1=酒道馆，2=供应商，3=烟酒店，4=超市，5=省公司门店，6=城市会客厅，7=惠民健康体检馆-->
+              <!--商户子类型：0=默认，1=酒道馆/大型餐厅，2=小酒馆/中小型餐厅-->
+              <el-col :span="12" v-if="defaultMerchantType == 1">
+                <el-form-item :label="mar_type_name +'类型：'">
+                  <el-select v-model="merData.merchant_sub_type" placeholder="请选择类型" class="selWidth">
+                    <el-option label="酒道馆" :value="1" />
+                    <el-option label="小酒馆" :value="2" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="defaultMerchantType == 0">
+                <el-form-item :label="mar_type_name +'类型：'">
+                  <el-select v-model="merData.merchant_sub_type" placeholder="请选择类型" class="selWidth">
+                    <el-option label="大型餐厅" :value="1" />
+                    <el-option label="中小型餐厅" :value="2" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <!--资源股东-->
             <el-row :gutter="24" class="mt20" v-if="defaultMerchantType != 2">
               <el-col :span="24">
                 <el-form-item label="资源股东：" label-width="200">
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index ee0067a..6f6aa8a 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -201,6 +201,14 @@
               <div>关联商户：</div>
               <div class="value">{{ merData.merShop ? (merData.merShop.mer_name || '') : ''}}</div>
             </li>
+            <li class="item" v-if="['0','1'].includes(String(defaultMerchantType))">
+              <!--商户子类型：0=默认，1=酒道馆/大型餐厅，2=小酒馆/中小型餐厅-->
+              <div>商户类型：</div>
+              <div class="value" v-if="merData.merchant_type == 0 && merData.merchant_sub_type == 1">大型餐厅</div>
+              <div class="value" v-else-if="merData.merchant_type == 0 && merData.merchant_sub_type == 2">中小型餐厅</div>
+              <div class="value" v-if="merData.merchant_type == 1 && merData.merchant_sub_type == 1">酒道馆</div>
+              <div class="value" v-else-if="merData.merchant_type == 1 && merData.merchant_sub_type == 2">小酒馆</div>
+            </li>
             <li class="item" v-if="defaultMerchantType != 2">
               <div>资源股东：</div>
               <div class="value">
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 32e7d8d..6de88e9 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -154,7 +154,15 @@
             <span v-if="scope.row.brand">{{ scope.row.brand.title || '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sort" label="排序" min-width="100"  align="center"/>
+        <el-table-column v-if="['0','1'].includes(String(tableFrom.merchant_type))" label="类型" min-width="100" align="center">
+          <template  slot-scope="scope">
+            <span v-if="tableFrom.merchant_type == 0 && scope.row.merchant_sub_type == 1">大型餐厅</span>
+            <span v-else-if="tableFrom.merchant_type == 0 && scope.row.merchant_sub_type == 2">中小型餐厅</span>
+            <span v-else-if="tableFrom.merchant_type == 1 && scope.row.merchant_sub_type == 1">酒道馆</span>
+            <span v-else-if="tableFrom.merchant_type == 1 && scope.row.merchant_sub_type == 2">小酒馆</span>
+          </template>
+        </el-table-column>
+        <!--<el-table-column prop="sort" label="排序" min-width="100"  align="center"/>-->
         <!--<el-table-column prop="mark" label="备注" min-width="200"  align="center"/>-->
         <el-table-column label="操作" min-width="150" fixed="right" align="center">
           <template slot-scope="scope">