From e9463695ccea1525189190a823501f0a714fe0c5 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 15 May 2025 16:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E7=99=BB=E5=BD=95=E9=A1=B5=EF=BC=8C=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E9=A1=B5=E4=BF=AE=E6=94=B9=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/Sidebar/Logo.vue    |   2 +-
 ruoyi-ui/src/views/login.vue                  |  17 +-
 ruoyi-ui/src/views/pay/subInfo/index.vue      | 243 +++++++++++++++---
 ruoyi-ui/src/views/pay/tenant/index.vue       |  33 ++-
 ruoyi-ui/src/views/register.vue               |   2 +-
 5 files changed, 242 insertions(+), 55 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
index d768ae1..7163ec0 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: 'RuoYi-Flowable-Plus',
+      title: '薪资管理系统',
       logo: logoImg
     }
   }
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 485542f..ca369e4 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Flowable-Plus后台管理系统</h3>
+      <h3 class="title">售后管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -50,14 +50,15 @@
           <span v-else>登 录 中...</span>
         </el-button>
         <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          <router-link class="link-type" :to="'/register'">立即注册</router-link>&nbsp;&nbsp;
+          <router-link class="link-type" :to="'/forgetpass'">找回密码</router-link>
         </div>
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2021-2023 KonBAI All Rights Reserved.</span>
-    </div>
+    <!--    <div class="el-login-footer">
+          <span>Copyright © 2021-2022 konbai.work All Rights Reserved.</span>
+        </div>-->
   </div>
 </template>
 
@@ -72,8 +73,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -91,7 +92,7 @@ export default {
       // 验证码开关
       captchaEnabled: true,
       // 注册开关
-      register: false,
+      register: true,
       redirect: undefined
     };
   },
diff --git a/ruoyi-ui/src/views/pay/subInfo/index.vue b/ruoyi-ui/src/views/pay/subInfo/index.vue
index afb895d..dce0c1a 100644
--- a/ruoyi-ui/src/views/pay/subInfo/index.vue
+++ b/ruoyi-ui/src/views/pay/subInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="公司ID" prop="tenantId">
         <el-input
           v-model="queryParams.tenantId"
@@ -34,12 +34,14 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="激活情况" prop="active">
-        <el-input
-          v-model="queryParams.active"
-          placeholder="请输入激活情况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.active" placeholder="请选择激活情况">
+          <el-option
+            v-for="dict in dict.type.sub_active"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="订阅计划ID" prop="subplanId">
         <el-input
@@ -114,12 +116,12 @@
       <el-table-column label="订阅ID" align="center" prop="id" v-if="true"/>
       <el-table-column label="公司ID" align="center" prop="tenantId" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column label="开始时间" align="center" prop="startTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="endTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -158,37 +160,39 @@
 
     <!-- 添加或修改租户订阅信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="公司ID" prop="tenantId">
-          <el-input v-model="form.tenantId" placeholder="请输入公司ID" />
-        </el-form-item>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="公司名称" prop="companyName">
-          <el-input v-model="form.companyName" placeholder="请输入公司名称" />
+          <el-input placeholder="请选择公司名称" readonly v-model="form.companyName" @focus="changeCompany" v-if="!form.id">
+            <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+          </el-input>
+          <el-input v-model="form.companyName" placeholder="请输入公司名称" disabled v-if="form.id"/>
+        </el-form-item>
+        <el-form-item label="订阅名称" prop="subplanName">
+          <el-input placeholder="请选择订阅名称" readonly v-model="form.subplanName" @focus="changePlan">
+            <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+          </el-input>
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker clearable style="width: 100%;"
+            v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker clearable style="width: 100%;"
+            v-model="form.endTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="激活情况" prop="active">
-          <el-input v-model="form.active" placeholder="请输入激活情况" />
-        </el-form-item>
-        <el-form-item label="订阅计划ID" prop="subplanId">
-          <el-input v-model="form.subplanId" placeholder="请输入订阅计划ID" />
-        </el-form-item>
-        <el-form-item label="订阅名称" prop="subplanName">
-          <el-input v-model="form.subplanName" placeholder="请输入订阅名称" />
+          <el-select v-model="form.active" placeholder="请选择激活情况" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.sub_active"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -199,14 +203,109 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 选择公司信息 -->
+    <el-dialog title="公司选择" :visible.sync="company.open" width="900px" append-to-body top="6vh">
+      <div>
+        <el-form :model="company.queryParams" :inline="true" label-width="68px">
+          <el-form-item label="公司名称" prop="name" style="margin-bottom: 10px">
+            <el-input clearable
+              v-model="company.queryParams.name"
+              placeholder="请输入账号名称"
+              clearablesize="small"
+              @keyup.enter.native="gsInfoQuery"
+            />
+          </el-form-item>
+          <el-form-item style="margin-bottom: 10px">
+            <el-button type="primary" icon="el-icon-search" size="small" @click="gsInfoQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table border v-loading="company.loading" :data="company.list" @row-click="companyRowChange">
+          <el-table-column label="序号" align="center" prop="index" width="50">
+            <template slot-scope="scope">
+              {{
+                company.queryParams.pageSize ? scope.$index + 1 + company.queryParams.pageSize * (company.queryParams.pageNum - 1) : scope.$index + 1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="公司名称" align="center" prop="name" />
+          <el-table-column label="联系人手机" align="center" prop="phone" />
+          <el-table-column label="公司固话" align="center" prop="fixPhone" />
+          <el-table-column label="公司地址" align="center" prop="address" />
+          <el-table-column label="公司网址" align="center" prop="website" />
+          <el-table-column label="备注" align="center" prop="remark" />
+        </el-table>
+        <pagination
+          v-show="company.total>0"
+          :total="company.total"
+          :page.sync="company.queryParams.pageNum"
+          :limit.sync="company.queryParams.pageSize"
+          @pagination="gsInfoQuery"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="companyCancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 选择订阅计划 -->
+    <el-dialog title="订阅计划" :visible.sync="planInfo.open" width="900px" append-to-body top="6vh">
+      <div>
+        <el-form :model="planInfo.queryParams" :inline="true" label-width="68px">
+          <el-form-item label="订阅名称" prop="name" style="margin-bottom: 10px">
+            <el-input clearable
+              v-model="planInfo.queryParams.name"
+              placeholder="请输入订阅名称"
+              clearablesize="small"
+              @keyup.enter.native="planInfoQuery"
+            />
+          </el-form-item>
+          <el-form-item style="margin-bottom: 10px">
+            <el-button type="primary" icon="el-icon-search" size="small" @click="planInfoQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table border v-loading="planInfo.loading" :data="planInfo.list" @row-click="planInfoRowChange">
+          <el-table-column label="序号" fixed align="center" prop="index" width="50">
+            <template slot-scope="scope">
+              {{
+                planInfo.queryParams.pageSize ? scope.$index + 1 + planInfo.queryParams.pageSize * (planInfo.queryParams.pageNum - 1) : scope.$index + 1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="订阅ID" align="center" prop="id" v-if="true"/>
+          <el-table-column label="订阅名称" align="center" prop="name" />
+          <el-table-column label="价格" align="center" prop="price" />
+          <el-table-column label="计划描述" align="center" prop="description" />
+          <el-table-column label="备注" align="center" prop="remark" />
+        </el-table>
+
+        <pagination
+          v-show="planInfo.total>0"
+          :total="planInfo.total"
+          :page.sync="planInfo.queryParams.pageNum"
+          :limit.sync="planInfo.queryParams.pageSize"
+          @pagination="planInfoQuery"
+        />
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="planInfoCancel">取 消</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listSubInfo, getSubInfo, delSubInfo, addSubInfo, updateSubInfo } from "@/api/pay/subInfo";
+import { listTenant } from "@/api/pay/tenant";
+import { listSubPlan } from "@/api/pay/subPlan";
 
 export default {
   name: "SubInfo",
+  dicts: ['sub_active'],
   data() {
     return {
       // 按钮loading
@@ -272,7 +371,39 @@ export default {
         remark: [
           { required: true, message: "备注不能为空", trigger: "blur" }
         ]
-      }
+      },
+      /** 选择公司*/
+      company: {
+        // 是否显示弹出层
+        open: false,
+        // 列表遮罩层
+        loading: true,
+        // 列表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 表格数据
+        list: [],
+        // 总条数
+        total: 0,
+      },
+      /** 选择订阅计划 */
+      planInfo: {
+        // 是否显示弹出层
+        open: false,
+        // 列表遮罩层
+        loading: true,
+        // 列表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 表格数据
+        list: [],
+        // 总条数
+        total: 0,
+      },
     };
   },
   created() {
@@ -391,7 +522,57 @@ export default {
       this.download('pay/subInfo/export', {
         ...this.queryParams
       }, `subInfo_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 选择公司信息*/
+    changeCompany() {
+      this.company.open = true;
+      this.company.queryParams.pageNum = 1;
+      this.gsInfoQuery();
+    },
+    /** 公司信息列表查询 */
+    gsInfoQuery() {
+      this.company.loading = true;
+      listTenant(this.company.queryParams).then(response => {
+        this.company.list = response.rows;
+        this.company.total = response.total;
+        this.company.loading = false;
+      });
+    },
+    /** 公司信息选择弹出框关闭*/
+    companyCancel() {
+      this.company.open = false
+    },
+    // 公司选择 选中数据
+    companyRowChange(val) {
+      this.form.tenantId = val.id;
+      this.form.companyName = val.name;
+      this.company.open = false;
+    },
+    /** 选择订阅计划*/
+    changePlan() {
+      this.planInfo.open = true
+      this.planInfo.queryParams.pageNum = 1;
+      this.planInfoQuery()
+    },
+    /** 订阅计划列表查询 */
+    planInfoQuery() {
+      this.planInfo.loading = true;
+      listSubPlan(this.planInfo.queryParams).then(response => {
+        this.planInfo.list = response.rows;
+        this.planInfo.total = response.total;
+        this.planInfo.loading = false;
+      });
+    },
+    /** 订阅计划选择弹出框关闭*/
+    planInfoCancel() {
+      this.planInfo.open = false;
+    },
+    // 订阅计划 选中数据
+    planInfoRowChange(val) {
+      this.form.subplanId = val.id;
+      this.form.subplanName = val.name;
+      this.planInfo.open = false;
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/pay/tenant/index.vue b/ruoyi-ui/src/views/pay/tenant/index.vue
index 1025efd..605fa43 100644
--- a/ruoyi-ui/src/views/pay/tenant/index.vue
+++ b/ruoyi-ui/src/views/pay/tenant/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
       <el-form-item label="公司名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公司电话" prop="phone">
+      <el-form-item label="联系人手机" prop="phone">
         <el-input
           v-model="queryParams.phone"
-          placeholder="请输入公司电话"
+          placeholder="请输入联系人手机"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -95,9 +95,9 @@
 
     <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="租户ID" align="center" prop="id" v-if="true"/>
       <el-table-column label="公司名称" align="center" prop="name" />
-      <el-table-column label="公司电话" align="center" prop="phone" />
+      <el-table-column label="联系人手机" align="center" prop="phone" />
       <el-table-column label="公司固话" align="center" prop="fixPhone" />
       <el-table-column label="公司地址" align="center" prop="address" />
       <el-table-column label="公司网址" align="center" prop="website" />
@@ -132,12 +132,12 @@
 
     <!-- 添加或修改租户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="95px">
         <el-form-item label="公司名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入公司名称" />
         </el-form-item>
-        <el-form-item label="公司电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入公司电话" />
+        <el-form-item label="联系人手机" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系人手机" />
         </el-form-item>
         <el-form-item label="公司固话" prop="fixPhone">
           <el-input v-model="form.fixPhone" placeholder="请输入公司固话" />
@@ -202,26 +202,31 @@ export default {
       // 表单校验
       rules: {
         id: [
-          { required: true, message: "租户id不能为空", trigger: "blur" }
+          { required: true, message: "租户ID不能为空", trigger: "blur" }
         ],
         name: [
           { required: true, message: "公司名称不能为空", trigger: "blur" }
         ],
         phone: [
-          { required: true, message: "公司电话不能为空", trigger: "blur" }
+          { required: true, message: "联系人手机不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
         ],
-        fixPhone: [
+        /*fixPhone: [
           { required: true, message: "公司固话不能为空", trigger: "blur" }
-        ],
+        ],*/
         address: [
           { required: true, message: "公司地址不能为空", trigger: "blur" }
         ],
-        website: [
+        /*website: [
           { required: true, message: "公司网址不能为空", trigger: "blur" }
         ],
         remark: [
           { required: true, message: "备注不能为空", trigger: "blur" }
-        ]
+        ]*/
       }
     };
   },
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index b8bdbbb..52a8ebb 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">RuoYi-Vue-Plus后台管理系统</h3>
+      <h3 class="title">薪资管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />