添加：酒道馆关联商户

src/views/merchant/list/handle/merEditForm.vue

@@ -333,6 +333,19 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="defaultMerchantType == 1">
+              <el-form-item label="关联商户：" prop="merchant_type">
+                <el-select v-model="merData.shop_mer_id" filterable remote class="selWidth" placeholder="请输入关键字搜索商户" :remote-method="selectMerList">
+                  <el-option
+                    v-for="item in mer_list"
+                    :key="item.mer_id"
+                    :label="item.mer_name"
+                    :value="item.mer_id"
+                    :disabled="item.shopMer && item.shopMer.mer_id != merData.mer_id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <!--<el-row :gutter="24" class="mt20">
             <el-col :span="24">
@@ -348,11 +361,6 @@
               </el-form-item>
             </el-col>
           </el-row>-->
-
-
-
-
-
         </div>
       </el-tab-pane>
   </el-tabs>
@@ -362,7 +370,7 @@
 <script>
 
 import { merCategoryListApi } from '@/api/product'
-import { getstoreTypeApi, merchantUpdate, merchantCreate } from "@/api/merchant";
+import {getstoreTypeApi, merchantUpdate, merchantCreate, merchantListApi} from "@/api/merchant";
 export default {
   props: {
     merData: {
@@ -389,6 +397,7 @@ export default {
       }
     }
     return {
+      mer_list: {},
       mar_type_name: '商户',
       loading: false,
       merId: '',
@@ -398,13 +407,13 @@ export default {
       storeType: [],
       ruleValidate: {
         mer_name: [
-          { required: true, message: `请输入${this.mar_type_name}名称`, trigger: 'blur' }
+          { required: true, message: `请输入名称`, trigger: 'blur' }
         ],
         mer_account: [
-          { required: true, message: `请输入${this.mar_type_name}账号`, trigger: 'blur' }
+          { required: true, message: `请输入账号`, trigger: 'blur' }
         ],
         category_id: [
-          { required: true, message: `请选择${this.mar_type_name}分类`, trigger: 'change' }
+          { required: true, message: `请选择分类`, trigger: 'change' }
         ],
         type_id: [
           { required: true, message: '请选择店铺类型', trigger: 'change' }
@@ -419,6 +428,8 @@ export default {
       handler() {
         this.merData.merchant_type = this.defaultMerchantType || 0;
         this.mar_type_name = this.defaultMerchantType == 1 ? '酒道馆' : (this.defaultMerchantType == 2 ? '供应商' :'商户');
+
+        this.selectMerList();
       },
       deep: true
     }
@@ -490,6 +501,22 @@ export default {
           if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
         }
       });
+    },
+    // 搜索商户列表
+    selectMerList(query) {
+      let _this = this;
+      let params = {
+        page: 1,
+        limit: 100,
+        status: "1",
+        keyword: query,
+        is_shop_get: 1//是否为获取酒道馆关联商家
+      };
+      merchantListApi(params).then(res => {
+        _this.mer_list = res.data.list || {};
+      }).catch(res => {
+        this.$message.error(res.message);
+      });
     }
   },
 };

src/views/merchant/list/handle/merInfo.vue

@@ -194,6 +194,10 @@
               <div class="value" v-else-if="merData.merchant_type == 1">酒道馆</div>
               <div class="value" v-else-if="merData.merchant_type == 2">供应商</div>
             </li>
+            <li class="item" v-if="defaultMerchantType == 1">
+              <div>关联商户：</div>
+              <div class="value">{{ merData.merShop ? (merData.merShop.mer_name || '') : ''}}</div>
+            </li>
             <!--<li class="item">
               <div>商户积分兑换平台积分比例：</div>
               <div class="value">
@@ -228,6 +232,7 @@ export default {
   },
   data() {
     return {
+      mar_type_name: '',
       loading: true,
       merId: '',
       direction: 'rtl',

src/views/merchant/list/shop.vue

@@ -117,7 +117,6 @@
         <el-table-column prop="mer_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="酒道馆名称" min-width="150" />
         <el-table-column prop="real_name" label="酒道馆姓名" min-width="150" />
-
         <el-table-column prop="status" label="推荐" min-width="100">
           <template slot-scope="scope">
             <el-switch
@@ -148,10 +147,14 @@
         <el-table-column prop="margin" label="保证金" min-width="150">
           <template slot-scope="scope">
             <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
-
           </template>
         </el-table-column>
         <el-table-column prop="sort" label="排序" min-width="100" />
+        <el-table-column prop="status" label="关联商户" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.merShop ? (scope.row.merShop.mer_name || '') : ''}}
+          </template>
+        </el-table-column>
         <el-table-column prop="mark" label="备注" min-width="200" />
 
         <el-table-column label="操作" min-width="150" fixed="right" align="center">