代理推广

src/api/account/types.ts

@@ -18,3 +18,63 @@ export interface VersionList {
   updateTime: string;
   wallet: string;
 }
+export interface TenantForm {
+  // ID（支持数字、字符串或未定义）
+  id: number | string | undefined;
+  // 代理机构名称
+  agencyName: string;
+  // 所属区县
+  county: string;
+  // 详细地址
+  address: string;
+  // 负责人姓名
+  contactUserName: string;
+  // 负责人联系电话
+  contactPhone: string;
+  // 负责人证件类型
+  idCardType: string;
+  // 证件信息
+  idCard: string;
+  // 证件图片
+  certificate: string;
+  // 出生年月
+  birthday: string;
+  // 代理人资质
+  qualification: string;
+  // 收款方名称
+  payeeName: string;
+  // 开户行名称
+  bankName: string;
+  // 银行卡账号
+  bankCard: string;
+  // 绑定银行卡的手机号
+  bankPhone: string;
+  // 用户名
+  username: string;
+  // 用户密码
+  password: string;
+  // 代理人套餐
+  packageId: string;
+  // 紧急联系人
+  emergencyContact: string;
+  // 联系人电话
+  emergencyContactPhone: string;
+  // 签约日期
+  signDate: string;
+  // 甲方签约人
+  signer: string;
+  // 保证金金额
+  depositAmount: number;
+  // 代理年限
+  agencyYear: number;
+  // 利润分成模板
+  splitRatio: string;
+  // 协议附件
+  agreement: string;
+  // 其他附件
+  otherAttachment: string;
+  // 签约状态
+  signStatus: string;
+  // 类型
+  type: number;
+}

src/api/agent/types.ts

@@ -18,6 +18,19 @@ export interface VersionList {
   updateTime: string;
   wallet: string;
 }
+export interface TenantQuery {
+  pageSize: number;
+  pageNum: number;
+  current: number;
+  promoterStatus: number | string;
+  size: number;
+  type: number;
+  county: number | string;
+  contactUserName: number | string;
+  contactPhone: number | string;
+  signTime: number | string;
+  signStatus: number | string;
+}
 export interface VersionAdd {
   platformType: string;
   versionCode: string;
@@ -27,3 +40,67 @@ export interface VersionAdd {
   releaseNotes: string;
   status: string;
 }
+export interface TenantForm {
+  accountCount: number;
+  address: string;
+  agencyName: string;
+  agencyYear: string;
+  agreement: string;
+  attachment: string | number;
+  bankCard: string;
+  bankName: string;
+  bankPhone: string;
+  bankType: string | number;
+  birthday: string;
+  businessLicense: string | number;
+  businessTypes: string | number;
+  certificate: string;
+  companyName: string | number;
+  companyType: string | number;
+  contactPhone: string;
+  contactUserName: string;
+  contractAttachment: string | number;
+  contractYear: string | number;
+  county: string;
+  delFlag: string;
+  depositAmount: string;
+  domain: string | number;
+  emergencyContact: string;
+  emergencyContactPhone: string;
+  entryTime: string | number;
+  expiryDate: string | number;
+  expireTime: string | number;
+  id: string;
+  idCard: string;
+  idCardType: string;
+  intro: string | number;
+  inviteUserId: string | number;
+  inviteUserName: string | number;
+  joinTime: string;
+  licenseNumber: string | number;
+  otherAttachment: string;
+  packageId: string;
+  packageName: string | number;
+  password: string;
+  payeeName: string;
+  personName: string | number;
+  personPhone: string | number;
+  promoteList: string | number;
+  promoterName: string | number;
+  promoterPhone: string | number;
+  promoterStatus: string | number;
+  qualification: string;
+  related: string | number;
+  remark: string | number;
+  signDate: string;
+  signStatus: string;
+  signer: string;
+  splitRatio: string;
+  status: string;
+  storeId: string;
+  storeName: string | number;
+  templateName: string;
+  tenantId: string;
+  type: number;
+  username: string;
+}

src/api/system/common.js

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 // 查询省市区列表
 export function areaSelect(query) {
   return request({
-    url: '/area',
+    url: '/common/area',
     method: 'get',
     params: query
   });

src/api/system/tenant/index.ts

@@ -4,7 +4,7 @@ import { AxiosPromise } from 'axios';
 import request from '@/utils/request';
 
 // 查询租户列表
-export function listTenant(query: TenantQuery): AxiosPromise<TenantVO[]> {
+export function listTenant(query: any): AxiosPromise<TenantVO[]> {
   return request({
     url: '/system/tenant/list',
     method: 'post',
@@ -12,7 +12,7 @@ export function listTenant(query: TenantQuery): AxiosPromise<TenantVO[]> {
   });
 }
 // 获取比例套餐分成下拉表
-export function getlistDivide(query): AxiosPromise<TenantVO[]> {
+export function getlistDivide(): AxiosPromise<TenantVO[]> {
   return request({
     url: '/system/commission-template/all',
     method: 'get'

src/api/system/tenant/types.ts

@@ -20,6 +20,7 @@ export interface TenantQuery extends PageQuery {
   tenantId: string | number;
   address: string;
   signStatus: string;
+  type: number;
   contactUserName: string;
   personName: string;
   companyType: string;
@@ -27,12 +28,16 @@ export interface TenantQuery extends PageQuery {
   storeName: string;
   current: number;
   size: number;
+  county: number | string;
+  contactPhone: number | string;
+  signTime: number | string;
 }
 
 export interface TenantForm {
   id: number | string | undefined;
   tenantId: number | string | undefined;
   username: string;
+  type: number;
   templateName: string;
   password: string;
   storeName: string;

src/components/OssImageUpload/index.vue

@@ -85,7 +85,6 @@ export default {
     modelValue: {
       handler(val) {
         if (val) {
-          console.log(val);
           // 首先将值转为数组
           const list = Array.isArray(val) ? val : this.modelValue.split(',');
           // 然后将数组转为对象数组

src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
+        <!-- <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyId"
           class="min-w-244px"
@@ -19,7 +19,7 @@
         >
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
+        </el-select> -->
 
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">

src/views/oms/order/index.vue

@@ -3,41 +3,24 @@
     <el-card shadow="hover" class="mb-[10px]">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
         <el-form-item label="订单类型" prop="orderType">
-          <DictRadio v-model="queryParams.type" radioData="oms_order_type" :radioList="orderTypeMap" :show-all="'all'" @change="handleQuery">
+          <el-select v-model="queryParams.type" placeholder="请选择订单类型" clearable>
-          </DictRadio>
+            <el-option v-for="item in orderTypeMap" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="订单状态" prop="status">
-          <DictRadio
+          <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable>
-            v-if="orderStatusMap.length > 0"
+            <el-option v-for="item in orderStatusMap" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            :radioList="orderStatusMap"
+          </el-select>
-            v-model="queryParams.status"
-            radioData="oms_order_status"
-            :show-all="'all'"
-            :filter="['11', '12', '13', '14']"
-            @change="handleQuery"
-          ></DictRadio>
         </el-form-item>
         <el-form-item label="提现状态" prop="withdrawStatus">
-          <DictRadio
+          <el-select v-model="queryParams.withdrawStatus" placeholder="请选择提现状态" clearable>
-            v-if="orderWithdrawMap.length > 0"
+            <el-option v-for="item in orderWithdrawMap" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            v-model="queryParams.withdrawStatus"
+          </el-select>
-            radioData="oms_withdraw_staus"
-            :radioList="orderWithdrawMap"
-            :show-all="'all'"
-            @change="handleQuery"
-          >
-          </DictRadio>
         </el-form-item>
         <el-form-item label="退款状态" prop="aftersaleStatus">
-          <DictRadio
+          <el-select v-model="queryParams.aftersaleStatus" placeholder="请选择退款状态" clearable>
-            v-if="orderAftersaleMap.length > 0"
+            <el-option v-for="item in orderAftersaleMap" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            v-model="queryParams.aftersaleStatus"
+          </el-select>
-            radioData="oms_aftersale_status"
-            :radioList="orderAftersaleMap"
-            :show-all="'all'"
-            @change="handleQuery"
-          >
-          </DictRadio>
         </el-form-item>
         <el-form-item label="订单编号" prop="id">
           <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
@@ -45,12 +28,7 @@
         <el-form-item label="交易流水号" prop="orderSn">
           <el-input v-model.trim="queryParams.userPhone" placeholder="请输入交易流水号" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="会员手机号" prop="userPhone">
+
-          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="省市区" prop="provinces">
-          <address-selector v-model="queryParams.provinces"></address-selector>
-        </el-form-item>
         <el-form-item label="下单时间" prop="Time">
           <!-- <el-date-picker
             v-model="queryParams.Time"
@@ -79,6 +57,12 @@
             @change="handleChange"
           />
         </el-form-item>
+        <el-form-item label="会员手机号" prop="userPhone">
+          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="省市区" prop="provinces">
+          <address-selector v-model="queryParams.provinces"></address-selector>
+        </el-form-item>
         <el-form-item class="flex_one tr">
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -168,10 +152,10 @@
                 {{ getEmulistLabelById(scope.row.status, orderStatusMap) }}
               </el-tag>
             </div>
-            <div v-if="scope.row.deliverySn">
+            <!-- <div v-if="scope.row.deliverySn">
               物流单号：{{ scope.row.deliverySn }}
               <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link>
-            </div>
+            </div> -->
             <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
           </template>
         </el-table-column>

src/views/pms/brand/index.vue

@@ -15,7 +15,7 @@
           <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['pms:brand:query']">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -25,7 +25,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"  v-hasPermi="['pms:brand:add']">新增</el-button>
           </el-col>
         </el-row>
       </template>
@@ -44,8 +44,8 @@
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template v-slot="scope">
-            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
+            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['pms:brand:edit']">修改 </el-button>
-            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['pms:brand:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/pms/product/AddProduct.vue

@@ -90,22 +90,67 @@
                   <div class="flex-one">
                     <dict-select v-model="s.name" prop-name="sku_sort_list" value-prop="label"></dict-select>
                   </div>
-                  <a class="red" @click="deleteSkuSort(idx0)">删除规格类型</a>
+                  <a class="red" @click="deleteSkuSort(idx0)">{{ s.name }}</a>
                 </div>
                 <div class="values" v-if="s.name">
-                  <div class="value" v-for="(it2, idx1) in s.options" :key="idx1">
+                  <div :style="{ display: 'flex' }" v-if="s.name == '颜色'">
-                    <el-input :value="it2.name" @input="changeName(s, idx1, $event)" placeholder="请输入规格名称"></el-input
+                    <div class="value" v-for="(it2, idx1) in s.options" :key="idx1">
-                    ><a
+                      <el-tag type="primary" v-if="idx1 != undefined">
-                      class="red no-break ml8"
+                        <span>{{ it2.name }} </span>
-                      v-if="idx1 < s.options.length - 1 || (s.options.length === maxOptionNum &amp;&amp; idx1 === 3)"
+                        <span :style="{ color: 'red', cursor: 'pointer', paddingLeft: '8px' }" @click="deleteOption(s, idx1)" v-if="idx1 != undefined"
-                      @click="deleteOption(s, idx1)"
+                          >X</span
-                      >删除</a
+                        >
-                    >
+                      </el-tag>
+                    </div>
+                    <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
+                      <el-input v-model="color" placeholder="请输入规格名称"></el-input>
+                      <el-tag type="primary">
+                        <span @click="addOption(s, idx1)">添加</span>
+                      </el-tag>
+                    </div>
+                  </div>
+                  <div :style="{ display: 'flex' }" v-if="s.name == '大小'">
+                    <div class="value" v-for="(it2, idx1) in s.memory" :key="idx1">
+                      <el-tag type="primary" v-if="idx1 != undefined">
+                        <span>{{ it2.name }} </span>
+                        <span
+                          :style="{ color: 'red', cursor: 'pointer', paddingLeft: '8px' }"
+                          @click="deleteOption1(s, idx1)"
+                          v-if="idx1 != undefined"
+                          >X</span
+                        >
+                      </el-tag>
+                    </div>
+                    <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
+                      <el-input v-model="memory" placeholder="请输入规格名称" @keyup.enter="addOption1(s, idx1)"></el-input>
+                      <el-tag type="primary">
+                        <span @click="addOption1(s, idx1)">添加</span>
+                      </el-tag>
+                    </div>
+                  </div>
+                  <div :style="{ display: 'flex' }" v-if="s.name == '版本'">
+                    <div class="value" v-for="(it2, idx1) in s.version" :key="idx1">
+                      <el-tag type="primary" v-if="idx1 != undefined">
+                        <span>{{ it2.name }} </span>
+                        <span
+                          :style="{ color: 'red', cursor: 'pointer', paddingLeft: '8px' }"
+                          @click="deleteOption2(s, idx1)"
+                          v-if="idx1 != undefined"
+                          >X</span
+                        >
+                      </el-tag>
+                    </div>
+                    <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
+                      <el-input v-model="version" placeholder="请输入规格名称" @keyup.enter="addOption2(s, idx1)"></el-input>
+                      <el-tag type="primary">
+                        <span @click="addOption2(s, idx1)">添加</span>
+                      </el-tag>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-            <el-button v-if="productAttr.length < 2" @click="addSkuSort">+添加规格类型</el-button>
+            <!-- <el-button v-if="productAttr.length < 2" @click="addSkuSort">+添加规格类型</el-button> -->
           </div>
         </el-form-item>
         <el-form-item label="规格信息">
@@ -166,7 +211,6 @@
 import { addPmsProduct, getPmsProduct, updatePmsProduct } from '@/api/pms/product';
 import ProductCategorySelect from '@/views/components/ProductCategorySelect';
 import BrandSelect from '@/views/components/BrandSelect';
-import { useMallStore } from '@/store/modules/mall';
 
 export default {
   name: 'AddProduct',
@@ -174,6 +218,9 @@ export default {
   components: { BrandSelect, ProductCategorySelect },
   data() {
     return {
+      color: '',
+      memory: '',
+      version: '',
       rules: {
         name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }]
       },
@@ -186,7 +233,15 @@ export default {
       productAttr: [
         {
           name: '颜色',
-          options: [{ name: '红' }, { name: null }]
+          options: [{ name: '红' }]
+        },
+        {
+          name: '大小',
+          memory: [{ name: '4G' }]
+        },
+        {
+          name: '版本',
+          version: [{ name: '12' }]
         }
       ],
       maxOptionNum: 44
@@ -205,23 +260,55 @@ export default {
       this.skuAttr = [...this.productAttr];
       if (this.form.skuList) {
         this.form.skuList.forEach((sku) => {
+          console.log(sku);
           skuMap.set(sku.spData, sku);
         });
       }
+      console.log(skuMap);
       this.productAttr.forEach((attr, index) => {
         const attrSku = [];
-        attr.options.forEach((option) => {
+        if (attr.name === '颜色') {
-          if (!option.name) {
+          attr.options.forEach((option) => {
-            return;
+            if (!option.name) {
-          }
+              return;
-          if (index === 0) {
+            }
-            attrSku.push({ [attr.name]: option.name });
+            if (index === 0) {
-          } else {
+              attrSku.push({ [attr.name]: option.name });
-            skus.forEach((it3) => {
+            } else {
-              attrSku.push({ ...it3, [attr.name]: option.name });
+              skus.forEach((it3) => {
-            });
+                attrSku.push({ ...it3, [attr.name]: option.name });
-          }
+              });
-        });
+            }
+          });
+        }
+        if (attr.name === '大小') {
+          attr.memory.forEach((option) => {
+            if (!option.name) {
+              return;
+            }
+            if (index === 0) {
+              attrSku.push({ [attr.name]: option.name });
+            } else {
+              skus.forEach((it3) => {
+                attrSku.push({ ...it3, [attr.name]: option.name });
+              });
+            }
+          });
+        }
+        if (attr.name === '版本') {
+          attr.version.forEach((option) => {
+            if (!option.name) {
+              return;
+            }
+            if (index === 0) {
+              attrSku.push({ [attr.name]: option.name });
+            } else {
+              skus.forEach((it3) => {
+                attrSku.push({ ...it3, [attr.name]: option.name });
+              });
+            }
+          });
+        }
         skus = attrSku;
       });
       skus.forEach((it) => {
@@ -334,6 +421,36 @@ export default {
     },
     deleteOption(s, idx) {
       s.options.splice(idx, 1);
+    },
+    deleteOption1(s, idx) {
+      s.memory.splice(idx, 1);
+    },
+    deleteOption2(s, idx) {
+      s.version.splice(idx, 1);
+    },
+    addOption(s, idx) {
+      this.$nextTick(() => {
+        if (this.color != '') {
+          s.options.push({ name: this.color });
+          this.color = '';
+        }
+      });
+    },
+    addOption1(s, idx) {
+      this.$nextTick(() => {
+        if (this.memory !== '') {
+          s.memory.push({ name: this.memory });
+          this.memory = '';
+        }
+      });
+    },
+    addOption2(s, idx) {
+      this.$nextTick(() => {
+        if (this.version !== '') {
+          s.version.push({ name: this.version });
+          this.version = '';
+        }
+      });
     }
   }
 };
@@ -362,7 +479,6 @@ export default {
           flex-wrap wrap
           .value
             padding 0 32px 8px 0
-            width 200px!important
             display flex
             align-items center
   .img-upload-mini .el-upload--picture-card

src/views/promotion/index.vue

@@ -0,0 +1,665 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!-- <el-form-item label="所属区县:" prop="county" label-width="100px">
+              <AddressSelector v-model="queryParams.county" clearable />
+            </el-form-item> -->
+            <el-form-item label="推广人姓名:" prop="contactUserName" label-width="100px">
+              <el-input v-model="queryParams.contactUserName" placeholder="请输入推广人姓名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="推广人电话:" prop="contactPhone" label-width="100px">
+              <el-input v-model="queryParams.contactPhone" placeholder="请输入推广人电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="状态:" prop="promoterStatus" label-width="100px">
+              <el-select v-model="queryParams.promoterStatus" placeholder="请选择状态" style="width: 100%" clearable>
+                <el-option label="有效" :value="0" />
+                <el-option label="无效" :value="1" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['system:tenant:query']">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button v-hasPermi="['account:promotion:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button v-hasPermi="['account:promotion:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button v-hasPermi="['account:promotion:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+              删除
+            </el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
+          </el-col>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table v-loading="loading" border :data="tenantList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column v-if="false" label="id" align="center" prop="id" />
+        <!-- <el-table-column label="地域" align="center" prop="county">
+          <template #default="scope">
+            {{ JSON.parse(scope.row.county).join('、') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="代理机构" align="center" prop="agencyName" /> -->
+        <el-table-column label="姓名" align="center" prop="contactUserName" />
+        <el-table-column label="入职时间" align="center" prop="entryTime" />
+        <el-table-column label="出生年月" align="center" prop="birthday" />
+        <el-table-column label="负责人联系电话" align="center" prop="contactPhone">
+          <template #default="scope">
+            {{ getPhon(scope.row.contactPhone) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="promoterStatus">
+          <template #default="scope">
+            {{ scope.row.promoterStatus == 1 ? '无效' : '有效' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="180" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="查看" placement="top">
+              <el-button v-hasPermi="['account:promotion:seach']" link type="primary" @click="funseach(scope.row, true)">
+                <el-icon><Search /></el-icon>
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="修改" placement="top">
+              <el-button v-hasPermi="['account:promotion:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="同步套餐" placement="top">
+              <el-button v-hasPermi="['account:promotion:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button v-hasPermi="['account:promotion:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改租户对话框 -->
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="1200px" append-to-body>
+      <el-form ref="tenantFormRef" :model="form" :rules="rules">
+        <div class="form-group">
+          <h3 class="group-title">店铺信息</h3>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="推广人姓名:" prop="contactUserName">
+                <el-input v-model="form.contactUserName" placeholder="请输入推广人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="详细地址:" prop="address">
+                <el-input v-model="form.address" placeholder="请输入详细地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人电话:" prop="contactPhone">
+                <el-input v-model="form.contactPhone" placeholder="请输入负责人电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人证件类型:" prop="idCardType">
+                <el-select v-model="form.idCardType" placeholder="请选择负责人证件类型" style="width: 100%" clearable>
+                  <el-option v-for="(item, index) in certificateList" :key="index" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人证件信息:" prop="idCard">
+                <el-input v-model="form.idCard" placeholder="请输入负责人证件信息" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="出生年月:" prop="birthday">
+                <el-date-picker v-model="form.birthday" type="datetime" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出生年月" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入职时间:" prop="entryTime">
+                <el-date-picker v-model="form.entryTime" type="datetime" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入职时间" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="有效期:" prop="expiryDate">
+                <el-input v-model="form.expiryDate" placeholder="请输入有效期" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="其他附件" prop="otherAttachment" align="left">
+                <oss-image-upload v-model="form.otherAttachment" :limit="1"> </oss-image-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="证件信息:" prop="certificate">
+                <oss-image-upload v-model="form.certificate" :limit="2"> </oss-image-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div class="form-group">
+          <h3 class="group-title">登录账号</h3>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="用户名:" prop="username">
+                <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="用户密码:" prop="password">
+                <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="状态:" prop="promoterStatus">
+                <el-select v-model="form.promoterStatus" placeholder="请选择状态" style="width: 100%" clearable>
+                  <el-option label="有效" :value="0" />
+                  <el-option label="无效" :value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="备注:" prop="remark">
+                <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="租户套餐:" prop="packageId">
+                <el-select v-model="form.packageId" placeholder="请选择租户套餐" clearable style="width: 100%">
+                  <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 查看详情 -->
+    <el-dialog v-model="sexDialog.visible" :title="sexDialog.title" width="1200px" append-to-body>
+      <el-form ref="tenantFormRef" :model="form" :rules="rules">
+        <!-- 基本信息组 -->
+        <div class="form-group">
+          <h3 class="group-title">推广人</h3>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="推广人姓名:" prop="contactUserName">
+                {{ tenantForm.contactUserName }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="详细地址:" prop="address">
+                {{ tenantForm.address }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人电话:" prop="contactPhone">
+                {{ tenantForm.contactPhone }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人证件类型:" prop="idCardType">
+                {{ certificateList[tenantForm.idCardType].label }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="负责人证件信息:" prop="idCard">
+                {{ tenantForm.idCard }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="出生年月:" prop="birthday">
+                {{ tenantForm.birthday }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="证件信息:" prop="certificate">
+                <div v-for="fit in tenantForm.certificate?.split(',')" :key="fit" class="block">
+                  <el-image style="width: 100px; height: 100px" :src="fit" :fit="fit" />
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="form-group">
+          <h3 class="group-title">管理员账号</h3>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="用户名:" prop="username">
+                {{ tenantForm.username }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="用户密码:" prop="password">
+                {{ tenantForm.password }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="状态:" prop="promoterStatus">
+                {{ tenantForm.promoterStatus == 1 ? '无效' : '有效' }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="备注:" prop="remark">
+                {{ tenantForm.remark }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="租户套餐:" prop="packageId">
+                {{ packageList.filter((item) => item.packageId == tenantForm.packageId)[0]?.packageName }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Tenant" lang="ts">
+import {
+  getlistDivide,
+  listTenant,
+  getTenant,
+  delTenant,
+  addTenant,
+  updateTenant,
+  changeTenantStatus,
+  syncTenantPackage,
+  syncTenantDict,
+  getTenantBannelList
+} from '@/api/system/tenant';
+import AddressSelector from '@/views/components/AddressSelector/index.vue';
+import { listUmsMember } from '@/api/ums/member';
+import { getDictionaryByKey } from '@/utils/dict';
+import { selectTenantPackage } from '@/api/system/tenantPackage';
+import { useUserStore } from '@/store/modules/user';
+import { TenantForm, TenantQuery } from '@/api/agent/types';
+import { TenantPkgVO } from '@/api/system/tenantPackage/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const uploadFileUrl = ref(baseUrl + '/resource/oss/upload'); // 上传文件服务器地址
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
+const tenantList = ref<TenantForm[]>([]);
+const packageList = ref<TenantPkgVO[]>([]);
+
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const userSelectLoading = ref(false);
+const userSelectOption = ref([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const tenantFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+const sexDialog = ref<DialogOption>({
+  visible: false,
+  title: ''
+});
+//详情数据
+const tenantForm = ref<TenantForm>();
+const funseach = (data) => {
+  getTenantPackage();
+  sexDialog.value.visible = true;
+  tenantForm.value = data;
+};
+const signfun = (data: any) => {
+  return signList.value.find((item) => item.value === data)?.label;
+};
+
+const certificateList = ref([]); // 证件类型
+const bankList = ref([]); // 银行类型
+const signList = ref([]); // 签约状态
+const getByKey = async () => {
+  const orderStatusreasontype = await getDictionaryByKey('sys_certificate_type');
+  certificateList.value = orderStatusreasontype;
+  const orderStatusaimobject = await getDictionaryByKey('sys_bank_type');
+  bankList.value = orderStatusaimobject;
+  const orderStatusstatus = await getDictionaryByKey('sys_sign_status');
+  signList.value = orderStatusstatus;
+};
+const businessTypesjson = ref([]); //经营类型
+const fnall = ref([]);
+const accountCountFun = async () => {
+  const res = await getlistDivide();
+  fnall.value = res.data;
+};
+const initFormData: TenantForm = {
+  id: undefined,
+  contactUserName: '', // 姓名
+  contactPhone: '', // 电话
+  address: '', // 详细地址
+  idCardType: '', // 证件类型
+  idCard: '', // 证件信息
+  certificate: '', // 证件图片
+  otherAttachment: '', // 其它附件
+  entryTime: null, // 入职时间
+  birthday: '', // 出生年月
+  expiryDate: null, // 有效期
+  username: '', // 用户名
+  password: '', // 用户密码
+  promoterStatus: '', // 状态(0、有效  1、无效)
+  remark: '', // 备注
+  packageId: '', // 推广人套餐
+  type: 2
+};
+
+const data = reactive<PageData<TenantForm, TenantQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageSize: 10,
+    pageNum: 1,
+    current: 1,
+    size: 10,
+    type: 2,
+    contactUserName: null, //负责人
+    contactPhone: null, //负责人电话
+    promoterStatus: null //状态(0、有效  1、无效)
+  },
+  rules: {
+    id: [{ required: true, message: 'id不能为空', trigger: 'blur' }],
+    tenantId: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
+    expiryDate: [{ required: true, message: '有效期不能为空', trigger: 'blur' }],
+    entryTime: [{ required: true, message: '入职时间不能为空', trigger: 'blur' }],
+    promoterStatus: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+    // 代理机构名称
+    agencyName: [{ required: true, message: '代理机构名称不能为空', trigger: 'blur' }],
+    // 所属区县
+    county: [{ required: true, message: '所属区县不能为空', trigger: 'blur' }],
+    // 详细地址
+    address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
+    // 负责人姓名
+    contactUserName: [{ required: true, message: '负责人姓名不能为空', trigger: 'blur' }],
+    // 负责人联系电话
+    contactPhone: [{ required: true, message: '负责人联系电话不能为空', trigger: 'blur' }],
+    // 负责人证件类型
+    idCardType: [{ required: true, message: '负责人证件类型不能为空', trigger: 'blur' }],
+    // 证件信息
+    idCard: [{ required: true, message: '证件信息不能为空', trigger: 'blur' }],
+    // 证件图片
+    certificate: [{ required: true, message: '证件图片不能为空', trigger: 'blur' }],
+    // 出生年月
+    birthday: [{ required: true, message: '出生年月不能为空', trigger: 'blur' }],
+    // 代理人资质
+    qualification: [{ required: true, message: '代理人资质不能为空', trigger: 'blur' }],
+    // 收款方名称
+    payeeName: [{ required: true, message: '收款方名称不能为空', trigger: 'blur' }],
+    // 开户行名称
+    bankName: [{ required: true, message: '开户行名称不能为空', trigger: 'blur' }],
+    // 银行卡账号
+    bankCard: [{ required: true, message: '银行卡账号不能为空', trigger: 'blur' }],
+    // 绑定银行卡的手机号
+    bankPhone: [{ required: true, message: '绑定银行卡的手机号不能为空', trigger: 'blur' }],
+    // 代理人套餐
+    packageId: [{ required: true, message: '代理人套餐不能为空', trigger: 'blur' }],
+    // 紧急联系人
+    emergencyContact: [{ required: true, message: '紧急联系人不能为空', trigger: 'blur' }],
+    // 联系人电话
+    emergencyContactPhone: [{ required: true, message: '联系人电话不能为空', trigger: 'blur' }],
+    // 签约日期
+    signDate: [{ required: true, message: '签约日期不能为空', trigger: 'blur' }],
+    // 甲方签约人
+    signer: [{ required: true, message: '甲方签约人不能为空', trigger: 'blur' }],
+    // 保证金金额
+    depositAmount: [{ required: true, message: '保证金金额不能为空', trigger: 'blur' }],
+    // 代理年限
+    agencyYear: [{ required: true, message: '代理年限不能为空', trigger: 'blur' }],
+    // 利润分成模板
+    splitRatio: [{ required: true, message: '利润分成模板不能为空', trigger: 'blur' }],
+    // 协议附件
+    agreement: [{ required: true, message: '协议附件不能为空', trigger: 'blur' }],
+    // 其他附件
+    otherAttachment: [{ required: true, message: '其他附件不能为空', trigger: 'blur' }],
+    // 签约状态
+    // signStatus: [{ required: true, message: '签约状态不能为空', trigger: 'blur' }],
+
+    username: [
+      { required: true, message: '用户名不能为空', trigger: 'blur' },
+      { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+    ],
+    password: [
+      { required: true, message: '密码不能为空', trigger: 'blur' },
+      { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询所有租户套餐 */
+const getTenantPackage = async () => {
+  const res = await selectTenantPackage();
+  packageList.value = res.data;
+};
+const packagefun = (data) => {
+  console.log(packageList.value);
+  return packageList.value.find((item) => item.packageId === data)?.packageName;
+};
+
+/** 查询租户列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listTenant(queryParams.value);
+  tenantList.value = res.data.records;
+  console.log(res.data.records);
+  total.value = res.data.total;
+  loading.value = false;
+};
+
+// 租户套餐状态修改
+const handleStatusChange = async (row: any) => {
+  const text = row.status === '0' ? '启用' : '停用';
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '""' + row.companyName + '"租户吗？');
+    await changeTenantStatus(row.id, row.tenantId, row.status);
+    proxy?.$modal.msgSuccess(text + '成功');
+  } catch {
+    row.status = row.status === '0' ? '1' : '0';
+  }
+};
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+// 表单重置
+const reset = () => {
+  form.value = { ...initFormData };
+  tenantFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.current = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+// 多选框选中数据
+const handleSelectionChange = (selection: any[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  getTenantPackage();
+  dialog.visible = true;
+  dialog.title = '新增推广人';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: any) => {
+  reset();
+  await getTenantPackage();
+  const _id = row?.id || ids.value[0];
+  const res = await getTenant(_id);
+  // businessTypesjson.value = res.data.businessTypes?.split(',');
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改推广人';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  tenantFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateTenant(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        // form.value.businessTypes = businessTypesjson.value.join(',');
+        await addTenant(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: any) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除租户编号为"' + _ids + '"的数据项？');
+  loading.value = true;
+  await delTenant(_ids).finally(() => (loading.value = false));
+  await getList();
+  proxy?.$modal.msgSuccess('删除成功');
+};
+
+/** 同步租户套餐按钮操作 */
+const handleSyncTenantPackage = async (row: any) => {
+  try {
+    await proxy?.$modal.confirm('是否确认同步租户套餐租户编号为"' + row.tenantId + '"的数据项？');
+    loading.value = true;
+    await syncTenantPackage(row.tenantId, row.packageId);
+    await getList();
+    proxy?.$modal.msgSuccess('同步成功');
+  } catch {
+    return;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/tenant/export',
+    {
+      ...queryParams.value
+    },
+    `tenant_${new Date().getTime()}.xlsx`
+  );
+};
+
+/**同步租户字典*/
+const handleSyncTenantDict = async () => {
+  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
+  const res = await syncTenantDict();
+  proxy?.$modal.msgSuccess(res.msg);
+};
+
+onMounted(() => {
+  accountCountFun();
+  getByKey();
+  getList();
+});
+</script>
+<style scoped lang="scss">
+.form-group {
+  margin-bottom: 24px;
+}
+
+.group-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin-bottom: 16px;
+  color: #1f2937;
+  padding-left: 8px;
+  border-left: 3px solid #409eff;
+}
+.upload__tip {
+  background: url('./d.png') no-repeat;
+  background-size: 100% 100%;
+  width: 100%;
+  height: 100%;
+}
+::v-deep {
+  .el-date-editor.el-input,
+  .el-date-editor.el-input__wrapper {
+    width: 240px;
+  }
+  #searc {
+    .el-form-item--default .el-form-item__label {
+      width: 100px;
+    }
+  }
+  .el-form-item__content {
+    width: 240px;
+  }
+  .el-form-item--default .el-form-item__label {
+    width: 150px;
+  }
+  .el-upload--picture-card {
+    width: 100px;
+    height: 100px;
+  }
+  .el-upload-list {
+    width: 320px;
+    .el-upload-list__item {
+      width: 100px;
+      height: 100px;
+    }
+  }
+}
+</style>

src/views/system/divide/index.vue

@@ -27,7 +27,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['tenant:divide:add']">新增</el-button>
           </el-col>
         </el-row>
       </template>
@@ -46,15 +46,15 @@
 
         <el-table-column width="180" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="增加规则" placement="top">
+            <el-tooltip content="增加规则" placement="top" v-hasPermi="['tenant:divide:add']">
               <el-button link type="primary" @click="funseach(scope.row)">
                 <el-icon><Plus /></el-icon>
               </el-button>
             </el-tooltip>
-            <el-tooltip content="修改" placement="top">
+            <el-tooltip content="修改" placement="top" v-hasPermi="['tenant:divide:update']">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
+            <el-tooltip content="删除" placement="top" v-hasPermi="['tenant:divide:delete']">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>

src/views/system/tenant/index.vue

@@ -34,7 +34,7 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['system:tenant:query']">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
@@ -101,7 +101,7 @@
         <el-table-column width="180" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" @click="funseach(scope.row, true)">
+              <el-button v-hasPermi="['system:tenant:seach']" link type="primary" @click="funseach(scope.row, true)">
                 <el-icon><Search /></el-icon>
               </el-button>
             </el-tooltip>
@@ -809,12 +809,13 @@ const initFormData: TenantForm = {
   splitRatio: '', //分成比例
   signer: '', //签约人
   contractYear: '', //合同年限
-  signStatus: '', //签约状态
+  signStatus: '1', //签约状态
   contractAttachment: '', //签约附件
   attachment: '', //营业执照附件
   promoteList: '', //推广附件
   related: '', //相关资质及附件
-  certificate: '' //身份证附件
+  certificate: '', //身份证附件
+  type: 0
 };
 
 const data = reactive<PageData<TenantForm, TenantQuery>>({
@@ -824,6 +825,7 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
     pageNum: 1,
     current: 1,
     size: 10,
+    type: 0,
     tenantId: null,
     personName: null, //负责人姓名
     storeName: null, //店铺名称
@@ -853,8 +855,6 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
     businessTypes: [{ required: true, message: '经营类型不能为空', trigger: 'blur' }],
     address: [{ required: true, message: '企业地址不能为空', trigger: 'blur' }],
     contractYear: [{ required: true, message: '合同年限不能为空', trigger: 'blur' }],
-    signStatus: [{ required: true, message: '签约状态不能为空', trigger: 'blur' }],
-    inviteUserId: [{ required: true, message: '邀请人不能为空', trigger: 'blur' }],
     splitRatio: [{ required: true, message: '分成比例不能为空', trigger: 'blur' }],
     businessLicense: [{ required: true, message: '营业执照号不能为空', trigger: 'blur' }],
     expireTime: [{ required: true, message: '到期时间不能为空', trigger: 'blur' }],