From 4ad95828e0993e4837e7b702bacbb67621b6ca6b Mon Sep 17 00:00:00 2001
From: "Michelle.Chung" <1242874891@qq.com>
Date: Sun, 5 Feb 2023 12:20:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20tenant=20=E6=9B=B4=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA,=20=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0,=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=A8=E5=8D=95=E5=A5=97=E9=A4=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=20;=20update=20tenantPackage=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/tenant/index.vue    | 38 +++----------------
 .../src/views/system/tenantPackage/index.vue  |  1 -
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/ruoyi-ui/src/views/system/tenant/index.vue b/ruoyi-ui/src/views/system/tenant/index.vue
index a6ef02448..c294b5c4b 100644
--- a/ruoyi-ui/src/views/system/tenant/index.vue
+++ b/ruoyi-ui/src/views/system/tenant/index.vue
@@ -33,30 +33,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="统一社会信用代码" prop="licenseNumber">
-        <el-input
-          v-model="queryParams.licenseNumber"
-          placeholder="请输入统一社会信用代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="过期时间" prop="expireTime">
-        <el-date-picker clearable
-          v-model="queryParams.expireTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择过期时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="用户数量" prop="accountCount">
-        <el-input
-          v-model="queryParams.accountCount"
-          placeholder="请输入用户数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -111,22 +87,16 @@
 
     <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" v-if="true"/>
       <el-table-column label="租户编号" align="center" prop="tenantId" />
       <el-table-column label="联系人" align="center" prop="contactUserName" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" />
       <el-table-column label="企业名称" align="center" prop="companyName" />
-      <el-table-column label="统一社会信用代码" align="center" prop="licenseNumber" />
-      <el-table-column label="地址" align="center" prop="address" />
-      <el-table-column label="企业简介" align="center" prop="intro" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="租户套餐编号" align="center" prop="packageId" />
+      <el-table-column label="社会信用代码" align="center" prop="licenseNumber" />
       <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="用户数量" align="center" prop="accountCount" />
       <el-table-column label="租户状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -171,8 +141,8 @@
         <el-form-item label="企业名称" prop="companyName">
           <el-input v-model="form.companyName" placeholder="请输入企业名称" />
         </el-form-item>
-        <el-form-item label="统一社会信用代码" prop="licenseNumber">
-          <el-input v-model="form.licenseNumber" placeholder="请输入统一社会信用代码" />
+        <el-form-item label="社会信用代码" prop="licenseNumber">
+          <el-input v-model="form.licenseNumber" placeholder="请输入社会信用代码" />
         </el-form-item>
         <el-form-item label="地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入地址" />
@@ -210,6 +180,7 @@
 
 <script>
 import { listTenant, getTenant, delTenant, addTenant, updateTenant } from "@/api/system/tenant";
+import { listTenantPackage } from "@/api/system/tenantPackage";
 
 export default {
   name: "Tenant",
@@ -344,6 +315,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getTenantPackage();
       this.open = true;
       this.title = "添加租户";
     },
diff --git a/ruoyi-ui/src/views/system/tenantPackage/index.vue b/ruoyi-ui/src/views/system/tenantPackage/index.vue
index 0ec34c02c..5b6349b1c 100644
--- a/ruoyi-ui/src/views/system/tenantPackage/index.vue
+++ b/ruoyi-ui/src/views/system/tenantPackage/index.vue
@@ -63,7 +63,6 @@
 
     <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="租户套餐id" align="center" prop="packageId" v-if="true"/>
       <el-table-column label="套餐名称" align="center" prop="packageName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status" >