wanma-benteng
/
new-admin-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加：酒道馆和联盟商家增加类型区分

This commit is contained in:
wuhui_zzw 2024-06-28 09:26:32 +08:00
parent ba5d7995c2
commit c3830a636d
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/merchant/list/handle/merEditForm.vue
View File

@ -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">

8
src/views/merchant/list/handle/merInfo.vue
View File

@ -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">

10
src/views/merchant/list/index.vue
View File

@ -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">