From 405e61876a638c334261ead3f9a38f7a0e0589f0 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Wed, 17 May 2023 09:53:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/.env.prod                      |  2 +-
 .../src/views/system/tenant/index.vue         | 74 ++++++++-----------
 2 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/yudao-ui-admin/.env.prod b/yudao-ui-admin/.env.prod
index 46be158eb..1734c6100 100644
--- a/yudao-ui-admin/.env.prod
+++ b/yudao-ui-admin/.env.prod
@@ -5,7 +5,7 @@ ENV = 'production'
 VUE_APP_TITLE = 创盈商户管理系统
 
 # 创盈管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyyywl-api'
 
 # 根据服务器或域名修改
 PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index ff70cead4..b3654ebfd 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -2,29 +2,31 @@
   <div class="app-container">
     <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/"/>
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="租户名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入租户名" clearable @keyup.enter.native="handleQuery"/>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="店铺名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入店铺名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="联系人" prop="contactName">
-        <el-input v-model="queryParams.contactName" placeholder="请输入联系人" clearable
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="联系手机" prop="contactMobile">
-        <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="租户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable>
+      <el-form-item label="店铺状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-                        type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                        :default-time="['00:00:00', '23:59:59']"/>
+      <el-form-item label="店铺负责人" prop="contactName">
+        <el-input v-model="queryParams.contactName" placeholder="请输入" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="店铺负责人手机号" prop="contactMobile">
+        <el-input v-model="queryParams.contactMobile" placeholder="请输入" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="销售对接人" prop="saleContactName">
+        <el-input v-model="queryParams.saleContactName" placeholder="请输入" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="销售对接人手机号" prop="saleContactMobile">
+        <el-input v-model="queryParams.saleContactMobile" placeholder="请输入" clearable
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -202,11 +204,12 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        name: null,
-        contactName: null,
-        contactMobile: null,
-        status: undefined,
-        createTime: []
+        name: '',
+        contactName: '',
+        contactMobile: '',
+        status: '',
+        saleContactName: '',
+        saleContactMobile: ''
       },
       // 表单参数
       form: {},
@@ -276,17 +279,7 @@ export default {
     },
     /** 表单重置 */
     reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        packageId: undefined,
-        contactName: undefined,
-        contactMobile: undefined,
-        accountCount: undefined,
-        expireTime: undefined,
-        domain: undefined,
-        status: CommonStatusEnum.ENABLE,
-      };
+      this.form = {}
       this.resetForm('form');
     },
     /** 搜索按钮操作 */
@@ -365,23 +358,14 @@ export default {
       params.pageNo = undefined;
       params.pageSize = undefined;
       // 执行导出
-      this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
+      this.$modal.confirm('是否确认导出所有店铺数据项?').then(() => {
         this.exportLoading = true;
         return exportTenantExcel(params);
       }).then(response => {
-        this.$download.excel(response, '租户.xls');
+        this.$download.excel(response, '店铺.xls');
         this.exportLoading = false;
       }).catch(() => {
       });
-    },
-    /** 套餐名格式化 */
-    getPackageName(packageId) {
-      for (const item of this.packageList) {
-        if (item.id === packageId) {
-          return item.name;
-        }
-      }
-      return '未知套餐';
     }
   }
 };