style：1、审核流管理模块功能页面高度调整2、租户管理模块页面调整

smsb-plus-ui/src/views/system/tenant/index.vue

@@ -2,23 +2,29 @@
   <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-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="租户编号" prop="tenantId">
-              <el-input v-model="queryParams.tenantId" placeholder="请输入租户编号" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.tenantId" style="width: 140px" placeholder="请输入租户编号" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="联系人" prop="contactUserName">
-              <el-input v-model="queryParams.contactUserName" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.contactUserName" style="width: 140px" placeholder="请输入联系人" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="联系电话" prop="contactPhone">
-              <el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.contactPhone" style="width: 140px" placeholder="请输入联系电话" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="企业名称" prop="companyName">
-              <el-input v-model="queryParams.companyName" placeholder="请输入企业名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.companyName" style="width: 140px" placeholder="请输入企业名称" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button v-hasPermi="['system:tenant:add']" type="primary" plain icon="Plus" @click="handleAdd">新增
+              </el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -26,38 +32,16 @@
     </transition>
 
     <el-card shadow="hover">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant: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>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :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="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="expireTime" width="180">
-          <template #default="scope">
+      <div class="table-content" style="height: 75vh">
+        <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
+          <el-table-column v-if="false" label="id" align="center" prop="id"/>
+          <el-table-column label="租户编号" align="left" prop="tenantId"/>
+          <el-table-column label="联系人" align="left" prop="contactUserName"/>
+          <el-table-column label="联系电话" align="left" prop="contactPhone"/>
+          <el-table-column label="企业名称" align="left" prop="companyName"/>
+          <el-table-column label="社会信用代码" align="left" prop="licenseNumber"/>
+          <el-table-column label="过期时间" align="left" prop="expireTime" width="180">
+            <template #default="scope">
             <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
@@ -66,69 +50,101 @@
             <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
           </template>
         </el-table-column>
-        <el-table-column width="150" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column width="250" 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" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
             </el-tooltip>
             <el-tooltip content="同步套餐" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Refresh"
+                         @click="handleSyncTenantPackage(scope.row)">同步套餐
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete"
+                         @click="handleDelete(scope.row)">删除</el-button>
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table>
-
+        </el-table>
+      </div>
       <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
     </el-card>
     <!-- 添加或修改租户对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
       <el-form ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="companyName">
           <el-input v-model="form.companyName" placeholder="请输入企业名称" />
         </el-form-item>
-        <el-form-item label="联系人" prop="contactUserName">
-          <el-input v-model="form.contactUserName" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactPhone">
-          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item v-if="!form.id" label="用户名" prop="username">
-          <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
-        </el-form-item>
-        <el-form-item v-if="!form.id" label="用户密码" prop="password">
-          <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
-        </el-form-item>
-        <el-form-item label="租户套餐" prop="packageId">
-          <el-select v-model="form.packageId" :disabled="!!form.tenantId" 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-form-item label="过期时间" prop="expireTime">
-          <el-date-picker v-model="form.expireTime" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择过期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="用户数量" prop="accountCount">
-          <el-input v-model="form.accountCount" placeholder="请输入用户数量" />
-        </el-form-item>
-        <el-form-item label="绑定域名" prop="domain">
-          <el-input v-model="form.domain" placeholder="请输入绑定域名" />
-        </el-form-item>
-        <el-form-item label="企业地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入企业地址" />
-        </el-form-item>
-        <el-form-item label="企业代码" prop="licenseNumber">
-          <el-input v-model="form.licenseNumber" placeholder="请输入统一社会信用代码" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="contactUserName">
+              <el-input v-model="form.contactUserName" placeholder="请输入联系人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="contactPhone">
+              <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="!form.id" label="用户名" prop="username">
+              <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="!form.id" label="用户密码" prop="password">
+              <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="过期时间" prop="expireTime">
+              <el-date-picker v-model="form.expireTime" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择过期时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="租户套餐" prop="packageId">
+              <el-select v-model="form.packageId" :disabled="!!form.tenantId" 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>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户数量" prop="accountCount">
+              <el-input v-model="form.accountCount" placeholder="请输入用户数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="绑定域名" prop="domain">
+              <el-input v-model="form.domain" placeholder="请输入绑定域名" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="企业地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入企业地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业代码" prop="licenseNumber">
+              <el-input v-model="form.licenseNumber" placeholder="请输入统一社会信用代码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="企业简介" prop="intro">
-          <el-input v-model="form.intro" type="textarea" placeholder="请输入企业简介" />
+          <el-input v-model="form.intro" :rows="4" type="textarea" placeholder="请输入企业简介" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+<!--        <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -141,12 +157,20 @@
 </template>
 
 <script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage } from '@/api/system/tenant';
-import { selectTenantPackage } from '@/api/system/tenantPackage';
-import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
-import { TenantPkgVO } from '@/api/system/tenantPackage/types';
+import {
+  addTenant,
+  changeTenantStatus,
+  delTenant,
+  getTenant,
+  listTenant,
+  syncTenantPackage,
+  updateTenant
+} from '@/api/system/tenant';
+import {selectTenantPackage} from '@/api/system/tenantPackage';
+import {TenantForm, TenantQuery, TenantVO} from '@/api/system/tenant/types';
+import {TenantPkgVO} from '@/api/system/tenantPackage/types';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const tenantList = ref<TenantVO[]>([]);
 const packageList = ref<TenantPkgVO[]>([]);

smsb-plus-ui/src/views/system/tenantPackage/index.vue

@@ -2,14 +2,17 @@
   <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-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="套餐名称" prop="packageName">
-              <el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd">
+                新增
+              </el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -17,55 +20,37 @@
     </transition>
 
     <el-card shadow="hover">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
-              修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
-              删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出 </el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="false" label="租户套餐id" align="center" prop="packageId" />
-        <el-table-column label="套餐名称" align="center" prop="packageName" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @click="handleStatusChange(scope.row)"></el-switch>
-          </template>
-        </el-table-column>
+      <div class="table-content" style="height: 75vh">
+        <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
+          <el-table-column v-if="false" label="租户套餐id" align="center" prop="packageId"/>
+          <el-table-column label="套餐名称" align="center" prop="packageName"/>
+          <el-table-column label="备注" align="center" prop="remark"/>
+          <el-table-column label="状态" align="center" prop="status">
+            <template #default="scope">
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                         @click="handleStatusChange(scope.row)"></el-switch>
+            </template>
+          </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenantPackage:edit']" link type="primary" icon="Edit"
+                         @click="handleUpdate(scope.row)">修改</el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenantPackage:remove']" link type="primary" icon="Delete"
+                         @click="handleDelete(scope.row)">删除</el-button>
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table>
+        </el-table>
+      </div>
 
       <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
     </el-card>
 
     <!-- 添加或修改租户套餐对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
       <el-form ref="tenantPackageFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="套餐名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入套餐名称" />
@@ -86,7 +71,7 @@
           ></el-tree>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -101,19 +86,19 @@
 
 <script setup name="TenantPackage" lang="ts">
 import {
-  listTenantPackage,
-  getTenantPackage,
-  delTenantPackage,
   addTenantPackage,
-  updateTenantPackage,
-  changePackageStatus
+  changePackageStatus,
+  delTenantPackage,
+  getTenantPackage,
+  listTenantPackage,
+  updateTenantPackage
 } from '@/api/system/tenantPackage';
-import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api/system/menu';
-import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types';
-import { MenuTreeOption } from '@/api/system/menu/types';
+import {tenantPackageMenuTreeselect, treeselect as menuTreeselect} from '@/api/system/menu';
+import {TenantPkgForm, TenantPkgQuery, TenantPkgVO} from '@/api/system/tenantPackage/types';
+import {MenuTreeOption} from '@/api/system/menu/types';
 import to from 'await-to-js';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const tenantPackageList = ref<TenantPkgVO[]>([]);
 const buttonLoading = ref(false);

smsb-plus-ui/src/views/workflow/category/index.vue

@@ -24,7 +24,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: 90vh">
       <el-table
         ref="categoryTableRef"
         v-loading="loading"

smsb-plus-ui/src/views/workflow/model/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <!-- 流程分类树 -->
       <el-col :lg="4" :xs="24" style="">
-        <el-card shadow="hover" style="height: 90vh;margin-top: 10px">
+        <el-card shadow="hover" style="height: 93vh;margin-top: 10px">
           <el-input v-model="categoryName" placeholder="请输入流程分类名" prefix-icon="Search" clearable/>
           <el-tree
             ref="categoryTreeRef"
@@ -40,7 +40,7 @@
           </div>
         </transition>
         <el-card shadow="hover" style="border: none">
-          <div class="table-content" style="height: 72vh;">
+          <div class="table-content" style="height: 75vh;">
             <el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
               <el-table-column fixed align="center" type="index" label="序号" width="80"></el-table-column>
               <el-table-column align="left" :show-overflow-tooltip="true" prop="name" label="模型名称"

smsb-plus-ui/src/views/workflow/processDefinition/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <!-- 流程分类树 -->
       <el-col :lg="4" :xs="24">
-        <el-card shadow="hover" style="height: 90vh;margin-top: 10px">
+        <el-card shadow="hover" style="height: 93vh;margin-top: 10px">
           <el-input v-model="categoryName" placeholder="请输入流程分类名" prefix-icon="Search" clearable/>
           <el-tree
             ref="categoryTreeRef"
@@ -40,7 +40,7 @@
           </div>
         </transition>
         <el-card shadow="hover" style="border: none">
-          <div class="table-content" style="height: 72vh;">
+          <div class="table-content" style="height: 75vh;">
             <el-table v-loading="loading" :data="processDefinitionList" @selection-change="handleSelectionChange">
               <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
               <el-table-column align="left" prop="name" label="流程定义名称"

smsb-plus-ui/src/views/workflow/processInstance/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <!-- 流程分类树 -->
       <el-col :lg="4" :xs="24" style="">
-        <el-card shadow="hover" style="height: 90vh;margin-top: 10px">
+        <el-card shadow="hover" style="height: 92vh;margin-top: 10px">
           <el-input v-model="categoryName" placeholder="请输入流程分类名" prefix-icon="Search" clearable/>
           <el-tree
             ref="categoryTreeRef"

smsb-plus-ui/src/views/workflow/task/myDocument.vue

@@ -3,7 +3,7 @@
     <el-row>
       <!-- 流程分类树 -->
       <el-col :lg="4" :xs="24" style="">
-        <el-card shadow="hover" style="height: 90vh;margin-top: 10px">
+        <el-card shadow="hover" style="height: 93vh;margin-top: 10px">
           <el-input v-model="categoryName" placeholder="请输入流程分类名" prefix-icon="Search" clearable/>
           <el-tree
             ref="categoryTreeRef"
@@ -36,7 +36,7 @@
           </div>
         </transition>
         <el-card shadow="hover" style="border: none;">
-          <div class="table-content" style="height: 72vh;">
+          <div class="table-content" style="height: 75vh;">
             <el-table v-loading="loading" :data="processInstanceList" @selection-change="handleSelectionChange">
               <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
               <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>