Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test

src/views/shop/branchStore/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-input v-model="state.query.name" clearable placeholder="请输入分店名称" style="width: 100%" class="filter-item"
+              @keyup.enter="getTableData" />
+          </el-col>
+
+          <el-col :span="6">
+            <el-button type="primary" @click="getTableData">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
+          <el-table-column prop="status" label="ID" width="80" />
+          <el-table-column label="店铺信息" >
+            <template v-slot="scope">
+              <div>{{ scope.row.shopName }}（{{ scope.row.shopName }}）</div>
+              <div>账号：{{ scope.row.shopName }}</div>
+              <div>联系电话：{{ scope.row.phone }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="商品同步" width="120">
+            <template v-slot="scope">
+              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="会员同步" width="120">
+            <template v-slot="scope">
+              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="耗材同步" width="120">
+            <template v-slot="scope">
+              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="账号状态" width="120">
+            <template v-slot="scope">
+              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="createdAt" label="备注" />
+          <el-table-column label="操作" width="200">
+            <template v-slot="scope">
+              <el-button type="primary" size="small" link icon="edit" @click="handleSync(scope.row)">
+                同步启用
+              </el-button>
+              <el-button type="primary" size="small" link icon="edit" @click="handleAccount(scope.row.id)">
+                账号启用
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+    </div>
+    <div class="head-container">
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+import ShopApi from "@/api/account/shop";
+import { ElNotification, ElMessageBox } from "element-plus";
+
+const state = reactive({
+  query: {
+    name: "",
+  },
+  status: [
+    {
+      type: 1,
+      label: "开启",
+    },
+    {
+      type: 0,
+      label: "关闭",
+    },
+  ],
+  tableData: {
+    list: [],
+    page: 1,
+    size: 10,
+    loading: false,
+    total: 0,
+  },
+});
+onMounted(() => {
+  getTableData();
+});
+// 获取商家列表
+async function getTableData() {
+  state.tableData.loading = true;
+  try {
+    const res = await ShopApi.getList({
+      page: state.tableData.page,
+      size: state.tableData.size,
+      shopName: state.query.name,
+      account: state.query.account,
+      status: state.query.status,
+    });
+    state.tableData.loading = false;
+    state.tableData.list = res.records;
+    state.tableData.total = res.totalRow * 1;
+  } catch (error) {
+    console.log(error);
+  }
+}
+function handleSync(e) {
+  console.log(e)
+  ElMessageBox.confirm(`同步功能开启后不能关闭，请确认是否给${e.shopName}开启同步?`, "提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const res = await ShopApi.delete({ id: row.id });
+    ElMessage({
+      type: "success",
+      message: "同步成功",
+    });
+    getTableData();
+  }).catch(() => { });
+}
+// 重置查询
+function resetHandle() {
+  state.query.name = "";
+  getTableData();
+}
+// 分页回调
+function paginationChange(e) {
+  state.tableData.page = e;
+  getTableData();
+}
+
+</script>
+
+<style scoped lang="scss">
+.head-container {
+  margin-bottom: 20px;
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 4px;
+  }
+}
+
+.el-link {
+  min-height: 23px;
+  margin: 0 5px;
+}
+</style>

src/views/shop/list/components/addShop.vue

@@ -1,17 +1,7 @@
 <template>
-  <el-dialog
-    :title="state.form.id ? '编辑店铺' : '添加店铺'"
-    v-model="state.dialogVisible"
-    @close="reset"
-  >
+  <el-dialog :title="state.form.id ? '编辑店铺' : '添加店铺'" v-model="state.dialogVisible" @close="reset">
     <div style="height: 50vh; overflow-y: auto">
-      <el-form
-        ref="refForm"
-        :model="state.form"
-        :rules="state.rules"
-        label-width="120px"
-        label-position="left"
-      >
+      <el-form ref="refForm" :model="state.form" :rules="state.rules" label-width="120px" label-position="left">
         <el-form-item label="店铺名称" prop="shopName">
           <el-input v-model="state.form.shopName" placeholder="请输入门店名称"></el-input>
         </el-form-item>
@@ -23,22 +13,18 @@
           </el-radio-group>
           <div class="tips">请谨慎修改！！！</div>
         </el-form-item>
-        <el-form-item label="主店账号" prop="mainId" v-if="state.form.shopType != 'only'">
-          <el-select
-            v-model="state.form.mainId"
-            placeholder="请选择主店铺"
-            filterable
-            remote
-            reserve-keyword
-            :remote-method="getTableData"
-            :loading="state.shopListLoading"
-          >
-            <el-option
-              v-for="item in state.shopList"
-              :label="`ID:${item.id} - 名称：${item.shopName}`"
-              :value="item.id"
-              :key="item.id"
-            ></el-option>
+        <el-form-item label="是否为主店" prop="isMainStore">
+        <el-radio-group v-model="state.form.isMainStore" @change=" state.form.mainId = ''">
+          <el-radio value="1">是</el-radio>
+          <el-radio value="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+        <el-form-item label="主店账号" prop="mainId" v-if="state.form.isMainStore == '0'">
+          <!-- <el-form-item label="主店账号" prop="mainId" v-if="state.form.shopType != 'only'"> -->
+          <el-select v-model="state.form.mainId" placeholder="请选择主店铺" filterable reserve-keyword
+            :remote-method="getTableData" :loading="state.shopListLoading">
+            <el-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.id"
+              :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
@@ -78,24 +64,14 @@
           <el-input v-model="state.form.accountName" placeholder="请输入登录账号"></el-input>
         </el-form-item>
         <el-form-item label="登录密码" prop="password" v-if="!state.form.id">
-          <el-input
-            type="password"
-            show-password
-            v-model="state.form.accountPwd"
-            placeholder="请输入登录密码"
-          ></el-input>
+          <el-input type="password" show-password v-model="state.form.accountPwd" placeholder="请输入登录密码"></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model="state.form.phone" placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="设备数量">
-          <el-input-number
-            v-model="state.form.supportDeviceNumber"
-            controls-position="right"
-            :min="1"
-            :step="1"
-            step-strictly
-          ></el-input-number>
+          <el-input-number v-model="state.form.supportDeviceNumber" controls-position="right" :min="1" :step="1"
+            step-strictly></el-input-number>
         </el-form-item>
         <!-- <el-form-item label="外卖起送金额">
                     <el-input-number v-model="form.takeaway_money" placeholder="0.00" controls-position="right"
@@ -104,10 +80,7 @@
         <el-form-item label="店铺经度" prop="lat">
           <el-row>
             <el-col :span="9" v-if="state.form.provinces">
-              <el-input
-                :value="`${state.form.provinces}-${state.form.cities}-${state.form.districts}`"
-                disabled
-              />
+              <el-input :value="`${state.form.provinces}-${state.form.cities}-${state.form.districts}`" disabled />
             </el-col>
             <el-col :span="4" v-if="state.form.lng">
               <el-input v-model="state.form.lng" placeholder="经度" disabled></el-input>
@@ -123,18 +96,10 @@
           </el-row>
         </el-form-item>
         <el-form-item label="店铺详细地址">
-          <el-input
-            type="textarea"
-            v-model="state.form.address"
-            placeholder="请输入门店详细地址"
-          ></el-input>
+          <el-input type="textarea" v-model="state.form.address" placeholder="请输入门店详细地址"></el-input>
         </el-form-item>
         <el-form-item label="店铺简介">
-          <el-input
-            type="textarea"
-            v-model="state.form.detail"
-            placeholder="请输入店铺简介"
-          ></el-input>
+          <el-input type="textarea" v-model="state.form.detail" placeholder="请输入店铺简介"></el-input>
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="state.form.status">
@@ -144,12 +109,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-dialog
-      title="选择地址"
-      v-model="state.showLocation"
-      :modal="false"
-      :modal-append-to-body="false"
-    >
+    <el-dialog title="选择地址" v-model="state.showLocation" :modal="false" :modal-append-to-body="false">
       <div class="map_box">
         <div class="map">
           <el-amap ref="map" :center="state.amapOptions.center" @init="mapInit">
@@ -157,13 +117,8 @@
           </el-amap>
         </div>
         <div class="search_box">
-          <el-input
-            v-model="state.searchOption.keyword"
-            placeholder="请输入关键字"
-            @focus="state.searchOption.focus = true"
-            @blur="autoCompleteSearchBlur"
-            @input="autoCompleteSearch(state.searchOption.keyword)"
-          >
+          <el-input v-model="state.searchOption.keyword" placeholder="请输入关键字" @focus="state.searchOption.focus = true"
+            @blur="autoCompleteSearchBlur" @input="autoCompleteSearch(state.searchOption.keyword)">
             <template #append>
               <el-button type="primary" @click="placeSearchSearch(state.searchOption.keyword)">
                 搜索
@@ -171,12 +126,8 @@
             </template>
           </el-input>
           <div class="list" v-if="state.searchOption.focus && state.searchOption.show">
-            <div
-              class="item"
-              @click="autoCompleteListClick(item)"
-              v-for="item in state.autoCompleteList"
-              :key="item.id"
-            >
+            <div class="item" @click="autoCompleteListClick(item)" v-for="item in state.autoCompleteList"
+              :key="item.id">
               {{ item.name }}
             </div>
           </div>
@@ -257,6 +208,7 @@ const state = reactive({
     cities: "",
     districts: "",
     chainName: "",
+    isMainStore: '0',
   },
   resetForm: "",
   rules: {
@@ -274,6 +226,13 @@ const state = reactive({
         trigger: "blur",
       },
     ],
+    isMainStore: [
+      {
+        required: true,
+        message: " ",
+        trigger: "blur",
+      },
+    ],
     mainId: [
       {
         required: true,
@@ -347,6 +306,7 @@ onMounted(() => {
 
 // 获取商家列表
 async function getTableData(query = "") {
+  console.log(123)
   state.shopListLoading = true;
   try {
     const res = await ShopApi.getList({
@@ -356,7 +316,7 @@ async function getTableData(query = "") {
       type: "only",
     });
     state.shopListLoading = false;
-    state.shopList = res.content;
+    state.shopList = res.records;
   } catch (error) {
     state.shopListLoading = false;
     console.log(error);
@@ -525,14 +485,17 @@ defineExpose({
     top: 10px;
     left: 10px;
     z-index: 3000;
+
     .list {
       background-color: #fff;
+
       .item {
         height: 40px;
         line-height: 40px;
         box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
         padding: 0 10px;
         cursor: pointer;
+
         &:hover {
           background-color: #eee;
         }

src/views/shop/list/index.vue

@@ -3,33 +3,16 @@
     <div class="head-container">
       <el-row :gutter="20">
         <el-col :span="3">
-          <el-input
-            v-model="state.query.name"
-            clearable
-            placeholder="请输入店铺名称"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
+          <el-input v-model="state.query.name" clearable placeholder="请输入店铺名称" style="width: 100%" class="filter-item"
+            @keyup.enter="getTableData" />
         </el-col>
         <el-col :span="3">
-          <el-input
-            v-model="state.query.account"
-            clearable
-            placeholder="请输入商户号"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
+          <el-input v-model="state.query.account" clearable placeholder="请输入商户号" style="width: 100%" class="filter-item"
+            @keyup.enter="getTableData" />
         </el-col>
         <el-col :span="3">
           <el-select v-model="state.query.status" placeholder="请选择店铺状态" style="width: 100%">
-            <el-option
-              :label="item.label"
-              :value="item.type"
-              v-for="item in state.status"
-              :key="item.type"
-            />
+            <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -42,33 +25,31 @@
       <el-button type="primary" icon="plus" @click="addShopShow">添加店铺</el-button>
     </div>
     <div class="head-container">
-      <el-table :data="state.tableData.list" v-loading="state.tableData.loading">
+      <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
         <el-table-column label="店铺信息" width="200">
           <template v-slot="scope">
             <div class="shop_info">
-              <el-image
-                :src="scope.row.logo"
-                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef"
-              >
+              <el-image :src="scope.row.logo"
+                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef">
                 <template #error>
                   <div class="img_error">
-                    <i class="icon el-icon-document-delete"></i>
+                    <i class="icon el-icon-document-delete" />
                   </div>
                 </template>
               </el-image>
               <div class="info">
                 <span>{{ scope.row.shopName }}</span>
                 <div class="tag_wrap">
-                  <el-tag type="info" effect="dark" v-if="scope.row.profiles == 'no'">
+                  <el-tag v-if="scope.row.profiles == 'no'" type="info" effect="dark">
                     未激活
                   </el-tag>
-                  <el-tag type="warning" effect="dark" v-if="scope.row.profiles == 'probation'">
+                  <el-tag v-if="scope.row.profiles == 'probation'" type="warning" effect="dark">
                     试用
                   </el-tag>
-                  <el-tag type="success" effect="dark" v-if="scope.row.profiles == 'release'">
+                  <el-tag v-if="scope.row.profiles == 'release'" type="success" effect="dark">
                     正式
                   </el-tag>
-                  <el-tag type="primary" effect="dark" v-if="scope.row.isWxMaIndependent">
+                  <el-tag v-if="scope.row.isWxMaIndependent" type="primary" effect="dark">
                     独立小程序
                   </el-tag>
                 </div>
@@ -76,23 +57,24 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="registerType" label="类型">
+        <el-table-column prop="registerType" label="经营模式">
           <template v-slot="scope">
             <span v-if="scope.row.registerType == 'before'">快餐版</span>
             <span v-if="scope.row.registerType == 'after'">餐饮版</span>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="商户号"></el-table-column>
-        <el-table-column prop="lowPrice" label="来源"></el-table-column>
-        <el-table-column prop="lowPrice" label="认证状态">-</el-table-column>
+        <el-table-column prop="address" label="商户号" />
+        <el-table-column prop="status" label="店铺类型">
+          <template v-slot="scope">
+            <div>
+              <span>{{ scope.row.shopName }}</span>
+              <div>(主店：)</div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="店铺状态">
           <template v-slot="scope">
-            <el-switch
-              v-model="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
-              disabled
-            ></el-switch>
+            <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
           </template>
         </el-table-column>
         <el-table-column prop="createdAt" label="到期时间">
@@ -106,17 +88,23 @@
         <el-table-column label="操作" width="200">
           <template v-slot="scope">
             <el-link @click="addShopShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               编辑
             </el-link>
             <el-link @click="activateCodeShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               激活
             </el-link>
             <el-dropdown @command="dropdownClick($event, scope.row)">
               <el-link>
                 更多
-                <el-icon><ArrowDown /></el-icon>
+                <el-icon>
+                  <ArrowDown />
+                </el-icon>
               </el-link>
 
               <template #dropdown>
@@ -136,14 +124,9 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination
-        :total="state.tableData.total"
-        v-model:current-page="state.tableData.page"
-        v-model:page-size="state.tableData.size"
-        :page-sizes="[10, 20, 30, 50, 100]"
-        @current-change="paginationChange"
-        layout="total, sizes , prev, pager ,next, jumper "
-      ></el-pagination>
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
     </div>
     <addShop ref="refAddShop" @success="getTableData" />
     <detailModal ref="refDetailModal" />
@@ -217,7 +200,7 @@ function dropdownClick(e, row) {
         });
         getTableData();
       })
-      .catch(() => {});
+      .catch(() => { });
     return;
   }
 }
@@ -257,6 +240,7 @@ async function getTableData() {
 .head-container {
   margin-bottom: 20px;
 }
+
 .shop_info {
   display: flex;
 
@@ -265,8 +249,9 @@ async function getTableData() {
     padding-left: 4px;
   }
 }
+
 .el-link {
   min-height: 23px;
   margin: 0 5px;
 }
-</style>
+</style>

src/views/shop/staff/config/search.ts

@@ -1,9 +1,27 @@
 import type { ISearchConfig } from "@/components/CURD/types";
 import { paramTypeOptions } from './config'
+import UserAPI from "@/api/product/productclassification";
+
 
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
   formItems: [
+    {
+      type: "select",
+      label: "分店选择",
+      prop: "storeId",
+      attrs: {
+        placeholder: "请选择分店",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [],
+      async initFn(formItem) {
+        formItem.options = await UserAPI.getList();
+      },
+    },
     {
       type: "input",
       label: "账号名",