提交

src/views/business/housingFund/confirm/index.vue

@@ -18,7 +18,7 @@
             <el-dropdown-item
               icon="Upload"
               @click="handleImport"
-              v-hasPermi="['business:housingFundConfirm:Import']"
+              v-hasPermi="['business:housingFundConfirm:import']"
               >导入</el-dropdown-item
             >
           </el-dropdown-menu>

src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -29,12 +29,14 @@
                   v-if="!isView"
                   placeholder="个税金额"
                   v-model="emptyForm.amount"
+                  :precision="2"
                   style="
                     display: flex;
                     align-items: center;
                     justify-content: center;
                   "
                   :controls="false"
+                  @keypress.enter.prevent
                 />
                 <div v-else>{{ rowNum(emptyForm.amount) }}</div>
               </el-form-item>

src/views/business/production/IndividualIncomeTaxIs/index.vue

@@ -11,7 +11,7 @@
             <el-dropdown-item
               icon="Download"
               @click="handleExport"
-              v-hasPermi="['business:tax:export']"
+              v-hasPermi="['business:detail:export']"
             >
               导出</el-dropdown-item
             >

src/views/business/production/financialReportTax/index.vue

@@ -11,7 +11,7 @@
             <el-dropdown-item
               icon="Download"
               @click="handleExport"
-              v-hasPermi="['business:tax:export']"
+              v-hasPermi="['business:financialReportTaxNonZero:export']"
             >
               导出</el-dropdown-item
             >

src/views/business/production/financialReportTaxIsZero/index.vue

@@ -11,7 +11,7 @@
             <el-dropdown-item
               icon="Download"
               @click="handleExport"
-              v-hasPermi="['business:tax:export']"
+              v-hasPermi="['business:financialReportTax:export']"
             >
               导出</el-dropdown-item
             >

src/views/business/production/salary/index.vue

@@ -19,7 +19,7 @@
           <el-dropdown-item
             icon="Upload"
             @click="handleImport"
-            v-hasPermi="['business:salary:Import']"
+            v-hasPermi="['business:salary:import']"
             >导入</el-dropdown-item
           >
         </template>

src/views/business/production/salaryZero/index.vue

@@ -18,7 +18,7 @@
             <el-dropdown-item
               icon="Upload"
               @click="handleImport"
-              v-hasPermi="['business:salaryZero:Import']"
+              v-hasPermi="['business:salaryZero:import']"
               >导入</el-dropdown-item
             >
           </el-dropdown-menu>

src/views/business/socialSecurity/confirm/index.vue

@@ -18,7 +18,7 @@
             <el-dropdown-item
               icon="Upload"
               @click="handleImport"
-              v-hasPermi="['business:socialSecurityConfirm:Import']"
+              v-hasPermi="['business:socialSecurityConfirm:import']"
               >导入</el-dropdown-item
             >
           </el-dropdown-menu>

src/views/system/dept/index.vue

@@ -3,22 +3,61 @@
     <div :gutter="10" class="list-btns-container">
       <!--<el-button size="small" type="primary" icon="Plus" @click="handleAdd()"
         v-hasPermi="['system:dept:add']">新增</el-button>-->
-      <el-button size="small" type="info" icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
+      <el-button size="small" type="info" icon="Sort" @click="toggleExpandAll"
+        >展开/折叠</el-button
+      >
     </div>
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item :label="dept + '名称：'" prop="deptName">
-        <el-input size="small" v-model="queryParams.deptName" :placeholder="'请输入' + dept + '名称'" clearable
-          style="width: 200px" @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.deptName"
+          :placeholder="'请输入' + dept + '名称'"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
-    <el-table size="small" v-if="refreshTable" v-loading="loading" :data="deptList" height="100%" row-key="deptId"
-      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-      <el-table-column prop="deptName" :label="dept + '名称'" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+    <el-table
+      size="small"
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="deptList"
+      border
+      height="100%"
+      row-key="deptId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="deptName"
+        :label="dept + '名称'"
+        width="260"
+      ></el-table-column>
+      <el-table-column
+        prop="orderNum"
+        label="排序"
+        width="200"
+      ></el-table-column>
       <el-table-column prop="type" label="类别" width="100">
         <template #default="scope">
           <dict-tag :options="company_dept" :value="scope.row.type" />
@@ -26,80 +65,163 @@
       </el-table-column>
       <el-table-column prop="auditStatus" label="审核状态" width="100">
         <template #default="scope">
-          <dict-tag :options="sys_audit_status" :value="scope.row.auditStatus" />
+          <dict-tag
+            :options="sys_audit_status"
+            :value="scope.row.auditStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="审核信息" align="center" :show-overflow-tooltip="true">
+      <el-table-column
+        label="审核信息"
+        align="center"
+        :show-overflow-tooltip="true"
+      >
         <template #default="scope">
-          <router-link v-if="scope.row.type === '1'" :to="{
-            path: '/aduit/company/form',
-            query: { deptId: scope.row.deptId },
-          }" class="link-type">
+          <router-link
+            v-if="scope.row.type === '1'"
+            :to="{
+              path: '/aduit/company/form',
+              query: { deptId: scope.row.deptId },
+            }"
+            class="link-type"
+          >
             <span>查看详情</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button link type="primary" size="small" @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']">新增</el-button>
-          <el-button v-show="scope.row.parentId != 0" link type="warning" size="small" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']">编辑</el-button>
-          <el-button v-show="scope.row.parentId != 0" size="small" link type="danger" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']">删除</el-button>
+          <el-button
+            link
+            type="primary"
+            size="small"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+            >新增</el-button
+          >
+          <el-button
+            v-show="scope.row.parentId != 0"
+            link
+            type="warning"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+            >修改</el-button
+          >
+          <el-button
+            v-show="scope.row.parentId != 0"
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 添加或修改企业对话框 -->
-    <el-dialog :title="title" v-model="open" width="600px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="600px"
+      append-to-body
+      draggable
+    >
       <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24" v-if="form.type === '0'">
+        <el-row :gutter="24">
+          <el-col :span="12" v-if="form.type === '0'">
             <el-form-item label="上级单位" prop="parentId">
-              <el-tree-select v-model="form.parentId" :data="deptOptions" :props="{
-                value: 'deptId',
-                label: 'deptName',
-                children: 'children',
-              }" value-key="deptId" placeholder="选择上级单位" check-strictly :render-after-expand="false" />
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{
+                  value: 'deptId',
+                  label: 'deptName',
+                  children: 'children',
+                }"
+                value-key="deptId"
+                placeholder="选择上级单位"
+                check-strictly
+                :render-after-expand="false"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="form.type === '1' ? '企业名称' : '部门名称'" prop="deptName">
-              <el-input v-model="form.deptName" :placeholder="form.type === '1' ? '请输入企业名称' : '请输入部门名称'
-                " />
+            <el-form-item
+              :label="form.type === '1' ? '企业名称' : '部门名称'"
+              prop="deptName"
+            >
+              <el-input
+                v-model="form.deptName"
+                :placeholder="
+                  form.type === '1' ? '请输入企业名称' : '请输入部门名称'
+                "
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number
+                style="width: 100%"
+                v-model="form.orderNum"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input
+                v-model="form.leader"
+                placeholder="请输入负责人"
+                maxlength="20"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系电话"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="类别">
               <el-radio-group v-model="form.type" :disabled="disabled">
-                <el-radio v-for="dict in company_dept" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio
+                  v-for="dict in company_dept"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -107,8 +229,14 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -245,7 +373,6 @@ function toggleExpandAll() {
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  console.log(company_dept.value);
   reset();
   listDeptExcludeChild(row.deptId).then((response) => {
     deptOptions.value = deptOptions.value.concat(
@@ -294,7 +421,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 
 getList();

src/views/system/dict/index.vue

@@ -1,55 +1,133 @@
 <template>
   <div class="page-btns-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['system:dict:add']">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['system:dict:add']"
+        >新增</el-button
+      >
       <!-- 
       <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button> -->
 
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['system:dict:remove']">删除</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:dict:remove']"
+        >删除</el-button
+      >
       <!-- 
       <el-button type="warning" size="small" icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button> -->
 
-      <el-button type="danger" size="small" icon="Refresh" @click="handleRefreshCache"
-        v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Refresh"
+        @click="handleRefreshCache"
+        v-hasPermi="['system:dict:remove']"
+        >刷新缓存</el-button
+      >
 
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
-      label-width="68px">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="字典名称：" prop="dictName" style="width: 220px">
-        <el-input size="small" v-model="queryParams.dictName" placeholder="请输入字典名称" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.dictName"
+          placeholder="请输入字典名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="字典类型：" prop="dictType" style="width: 220px">
-        <el-input size="small" v-model="queryParams.dictType" placeholder="请输入字典类型" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.dictType"
+          placeholder="请输入字典类型"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态：" prop="status" style="width: 220px">
-        <el-select size="small" v-model="queryParams.status" placeholder="字典状态" clearable>
-          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.status"
+          placeholder="字典状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间：" style="width: 260px">
-        <el-date-picker size="small" v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          size="small"
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
-    <el-table size="small" border height="100%" v-loading="loading" :data="typeList"
-      @selection-change="handleSelectionChange">
+    <el-table
+      size="small"
+      border
+      height="100%"
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column
+        label="字典名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="字典类型"
+        align="center"
+        :show-overflow-tooltip="true"
+      >
         <template #default="scope">
-          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+          <router-link
+            :to="'/system/dict-data/index/' + scope.row.dictId"
+            class="link-type"
+          >
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
@@ -60,27 +138,65 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="160"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']">修改</el-button>
-          <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']">删除</el-button>
+          <el-button
+            link
+            type="warning"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dict:edit']"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="danger"
+            size="small"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
@@ -90,17 +206,32 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+            <el-radio
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -247,7 +378,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {

src/views/system/post/index.vue

@@ -3,39 +3,108 @@
 <template>
   <div class="page-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['system:post:add']">新增</el-button>
-      <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
-        v-hasPermi="['system:post:edit']">修改</el-button>
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['system:post:remove']">删除</el-button>
-      <el-button type="warning" size="small" icon="Download" @click="handleExport"
-        v-hasPermi="['system:post:export']">导出</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['system:post:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="success"
+        size="small"
+        icon="Edit"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['system:post:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:post:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="warning"
+        size="small"
+        icon="Download"
+        @click="handleExport"
+        v-hasPermi="['system:post:export']"
+        >导出</el-button
+      >
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="岗位编码：" prop="postCode">
-        <el-input size="small" v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable style="width: 200px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.postCode"
+          placeholder="请输入岗位编码"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="岗位名称：" prop="postName">
-        <el-input size="small" v-model="queryParams.postName" placeholder="请输入岗位名称" clearable style="width: 200px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.postName"
+          placeholder="请输入岗位名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态：" prop="status">
-        <el-select size="small" v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 200px">
-          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.status"
+          placeholder="岗位状态"
+          clearable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
-    <el-table size="small" border v-loading="loading" :data="postList" height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      size="small"
+      border
+      v-loading="loading"
+      :data="postList"
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
@@ -46,26 +115,59 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        width="180"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']">修改</el-button>
-          <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']">删除</el-button>
+          <el-button
+            link
+            type="warning"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:post:edit']"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="danger"
+            size="small"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:post:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />
@@ -74,21 +176,40 @@
           <el-input v-model="form.postCode" placeholder="请输入编码名称" />
         </el-form-item>
         <el-form-item label="岗位顺序" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.postSort"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="岗位状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+            <el-radio
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -231,7 +352,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {

src/views/system/role/index.vue

@@ -1,91 +1,144 @@
 <template>
   <div class="page-btns-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['system:role:add']">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['system:role:add']"
+        >新增</el-button
+      >
 
-      <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
-        v-hasPermi="['system:role:edit']">修改</el-button>
+      <el-button
+        type="success"
+        size="small"
+        icon="Edit"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['system:role:edit']"
+        >修改</el-button
+      >
 
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['system:role:remove']">删除</el-button>
-
-      <!-- <el-button type="warning" size="small" icon="Download" @click="handleExport"
-        v-hasPermi="['system:role:export']">导出</el-button> -->
-
-      <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:role:remove']"
+        >删除</el-button
+      >
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true"
-      label-width="68px">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      v-show="showSearch"
+      :inline="true"
+      label-width="68px"
+    >
       <el-form-item label="角色名称：" prop="roleName" style="width: 220px">
-        <el-input size="small" v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
-      <!-- <el-form-item label="权限字符：" prop="roleKey" style="width: 220px">
-        <el-input size="small" v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
-      </el-form-item> -->
-      <!-- <el-form-item label="状态：" prop="status" style="width: 220px">
-        <el-select size="small" v-model="queryParams.status" placeholder="角色状态" clearable>
-          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item> -->
-      <!-- <el-form-item label="创建时间：" style="width: 260px">
-        <el-date-picker size="small" v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item> -->
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
     <!-- 表格数据 -->
-    <el-table size="small" v-loading="loading" border :data="roleList" height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      size="small"
+      v-loading="loading"
+      border
+      :data="roleList"
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <!--<el-table-column label="角色编号" prop="roleId" width="120" />-->
-      <el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="排序" align="center" prop="roleSort" width="100" />
-      <!-- <el-table-column label="状态" align="center" width="100">
-        <template #default="scope">
-          <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 label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column
+        label="角色名称"
+        align="center"
+        prop="roleName"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+      <el-table-column
+        label="权限字符"
+        align="center"
+        prop="roleKey"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+      <el-table-column
+        label="排序"
+        align="center"
+        prop="roleSort"
+        width="100"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template #default="scope">
-          <el-button link size="small" type="warning" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
-            修改</el-button>
-
-          <!-- <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['system:role:remove']"></el-button>
-          </el-tooltip> -->
-          <!-- <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button link type="success" icon="CircleCheck" @click="handleDataScope(scope.row)"
-              v-hasPermi="['system:role:edit']"></el-button>
-          </el-tooltip> -->
-          <!-- <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
-              v-hasPermi="['system:role:edit']"></el-button>
-          </el-tooltip> -->
+          <el-button
+            link
+            size="small"
+            type="warning"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >
+            修改</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -93,7 +146,10 @@
         <el-form-item prop="roleKey">
           <template #label>
             <span>
-              <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+              <el-tooltip
+                content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
+                placement="top"
+              >
                 <el-icon><question-filled /></el-icon>
               </el-tooltip>
               权限字符
@@ -102,36 +158,69 @@
           <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.roleSort"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
-        <!-- <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item> -->
         <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-checkbox
+            v-model="menuExpand"
+            @change="handleCheckedTreeExpand($event, 'menu')"
+            >展开/折叠</el-checkbox
+          >
+          <el-checkbox
+            v-model="menuNodeAll"
+            @change="handleCheckedTreeNodeAll($event, 'menu')"
+            >全选/全不选</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'menu')"
+            >父子联动</el-checkbox
+          >
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menuRef"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="openDataScope"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
@@ -141,18 +230,41 @@
         </el-form-item>
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-checkbox
+            v-model="deptExpand"
+            @change="handleCheckedTreeExpand($event, 'dept')"
+            >展开/折叠</el-checkbox
+          >
+          <el-checkbox
+            v-model="deptNodeAll"
+            @change="handleCheckedTreeNodeAll($event, 'dept')"
+            >全选/全不选</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.deptCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'dept')"
+            >父子联动</el-checkbox
+          >
+          <el-tree
+            class="tree-border"
+            :data="deptOptions"
+            show-checkbox
+            default-expand-all
+            ref="deptRef"
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -276,7 +388,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {

src/views/system/user/index.vue

@@ -377,8 +377,14 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -428,8 +434,16 @@
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitFileForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="upload.open = false"
+            >取 消</el-button
+          >
         </div>
       </template>
     </el-dialog>