ezhizao_zx 1 rok pred
rodič
commit
ece3199a1a
76 zmenil súbory, kde vykonal 1996 pridanie a 7026 odobranie
  1. 1 1
      src/views/business/contracts/simpleCompany/index.vue
  2. 2 2
      src/views/business/contracts/standardCpmpany/index.vue
  3. 1 1
      src/views/business/crm/company/index.vue
  4. 1 1
      src/views/business/crm/dict/data.vue
  5. 1 1
      src/views/business/crm/dict/index.vue
  6. 1 1
      src/views/business/crm/noContractWorkOrder/index.vue
  7. 1 1
      src/views/business/crm/order/index.vue
  8. 47 167
      src/views/business/crm/workorder/index.vue
  9. 79 350
      src/views/business/deduction/index.vue
  10. 18 68
      src/views/business/entrust/deduct/index.vue
  11. 20 80
      src/views/business/entrust/deductOfFactory/index.vue
  12. 1 1
      src/views/business/entrust/deposit/index.vue
  13. 1 1
      src/views/business/entrust/depositOfFactory/index.vue
  14. 1 1
      src/views/business/entrust/entrustOrder/index.vue
  15. 1 1
      src/views/business/entrust/statementAccount/index.vue
  16. 1 1
      src/views/business/entrust/workOrder/currentMonth/index.vue
  17. 1 1
      src/views/business/entrust/workOrder/nextMonth/index.vue
  18. 1 1
      src/views/business/entrust/workOrder/once/index.vue
  19. 1 1
      src/views/business/entrust/workOrderForFactory/currentMonth/index.vue
  20. 1 1
      src/views/business/entrust/workOrderForFactory/nextMonth/index.vue
  21. 1 1
      src/views/business/entrust/workOrderForFactory/once/index.vue
  22. 8 4
      src/views/business/financial/collection/index.vue
  23. 7 7
      src/views/business/financial/contract/form.vue
  24. 32 131
      src/views/business/financial/contract/index.vue
  25. 45 186
      src/views/business/financial/payment/index.vue
  26. 2 2
      src/views/business/housingFund/confirm/index.vue
  27. 2 2
      src/views/business/housingFund/declare/index.vue
  28. 1 1
      src/views/business/paymentEntry/type/index.vue
  29. 63 226
      src/views/business/production/IndividualIncomeTaxIs/index.vue
  30. 61 239
      src/views/business/production/IndividualIncomeTaxIsZero/index.vue
  31. 2 2
      src/views/business/production/accountAdjustment/index.vue
  32. 33 145
      src/views/business/production/archiveTicket/index.vue
  33. 1 1
      src/views/business/production/deduction/index.vue
  34. 66 247
      src/views/business/production/financialReportTax/index.vue
  35. 59 216
      src/views/business/production/financialReportTaxIsZero/index.vue
  36. 72 243
      src/views/business/production/keepAccount/index.vue
  37. 41 101
      src/views/business/production/onceWork/index.vue
  38. 22 97
      src/views/business/production/productionCompany/index.vue
  39. 80 341
      src/views/business/production/receiveTicket/index.vue
  40. 42 186
      src/views/business/production/receiveTicketFeedback/index.vue
  41. 73 253
      src/views/business/production/salary/index.vue
  42. 60 230
      src/views/business/production/salaryZero/index.vue
  43. 2 2
      src/views/business/production/urgent/index.vue
  44. 2 3
      src/views/business/project/index.vue
  45. 61 186
      src/views/business/service/loop/index.vue
  46. 160 237
      src/views/business/service/once/index.vue
  47. 49 152
      src/views/business/setting/account/index.vue
  48. 71 242
      src/views/business/socialSecurity/confirm/index.vue
  49. 64 229
      src/views/business/socialSecurity/declare/index.vue
  50. 25 85
      src/views/business/source/bin/index.vue
  51. 34 128
      src/views/business/source/channel/index.vue
  52. 36 127
      src/views/business/source/index.vue
  53. 22 87
      src/views/business/tenant/index.vue
  54. 26 133
      src/views/dialog/Person.vue
  55. 1 1
      src/views/index.vue
  56. 50 221
      src/views/monitor/job/index.vue
  57. 1 1
      src/views/monitor/job/log.vue
  58. 35 149
      src/views/monitor/logininfor/index.vue
  59. 1 1
      src/views/monitor/operlog/index.vue
  60. 26 14
      src/views/system/config/index.vue
  61. 1 1
      src/views/system/dict/data.vue
  62. 37 162
      src/views/system/dict/index.vue
  63. 27 115
      src/views/system/inItRole/authUser.vue
  64. 45 193
      src/views/system/inItRole/index.vue
  65. 18 79
      src/views/system/inItRole/selectUser.vue
  66. 22 12
      src/views/system/notice/index.vue
  67. 33 148
      src/views/system/post/index.vue
  68. 41 178
      src/views/system/reconciliation/oncePrice/index.vue
  69. 28 120
      src/views/system/reconciliation/priceList/index.vue
  70. 1 1
      src/views/system/role/authUser.vue
  71. 1 1
      src/views/system/role/index.vue
  72. 1 1
      src/views/system/role/selectUser.vue
  73. 65 259
      src/views/system/user/index.vue
  74. 1 1
      src/views/tool/file/index.vue
  75. 8 22
      src/views/tool/gen/importTable.vue
  76. 47 192
      src/views/tool/gen/index.vue

+ 1 - 1
src/views/business/contracts/simpleCompany/index.vue

@@ -113,7 +113,7 @@ const total = ref(0);
 /** 查询对象 */
 const queryParams = ref({
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     category: null,
     code: null,
     name: null,

+ 2 - 2
src/views/business/contracts/standardCpmpany/index.vue

@@ -137,7 +137,7 @@ const userId = ref();
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   category: null,
   code: null,
   name: null,
@@ -198,7 +198,7 @@ const queryParams = ref({
 /** 用户对象 */
 const queryUser = {
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   userName: null,
   phonenumber: null,
   status: null,

+ 1 - 1
src/views/business/crm/company/index.vue

@@ -165,7 +165,7 @@ const exportColumnRef = ref(null);
 /** 查询 对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   name: null,
   standard: null,

+ 1 - 1
src/views/business/crm/dict/data.vue

@@ -160,7 +160,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined,

+ 1 - 1
src/views/business/crm/dict/index.vue

@@ -131,7 +131,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     module: "customer",

+ 1 - 1
src/views/business/crm/noContractWorkOrder/index.vue

@@ -152,7 +152,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   companyName: "",
   noContract: 1,

+ 1 - 1
src/views/business/crm/order/index.vue

@@ -222,7 +222,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   fromId: 0,
   orderByColumn: "create_time",
   category: null,

+ 47 - 167
src/views/business/crm/workorder/index.vue

@@ -13,117 +13,53 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="工单类型:" prop="type">
-        <el-select
-          size="small"
-          v-model="queryParams.type"
-          placeholder="工单类型"
-          clearable
-        >
-          <el-option
-            v-for="item in types"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select size="small" v-model="queryParams.type" placeholder="工单类型" clearable>
+          <el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column
-        label="客户名称"
-        align="center"
-        min-width="250"
-        prop="companyName"
-        :resizable="false"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        min-width="200"
-        prop="socialCreditCode"
-        :resizable="false"
-      />
-      <el-table-column
-        label="工单类型"
-        align="center"
-        prop="amount"
-        min-width="80"
-        :resizable="false"
-      >
+      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" :resizable="false" />
+      <el-table-column label="税号" align="center" min-width="200" prop="socialCreditCode" :resizable="false" />
+      <el-table-column label="工单类型" align="center" prop="amount" min-width="80" :resizable="false">
         <template #default="scope">
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="项目"
-        align="center"
-        prop="taskTypeName"
-        :resizable="false"
-        min-width="120"
-      >
+      <el-table-column label="项目" align="center" prop="taskTypeName" :resizable="false" min-width="120">
         <template #default="scope">
           {{ scope.row.taskTypeName }}
           {{
             scope.row.taskTypeDetailName
-              ? `-${scope.row.taskTypeDetailName}`
-              : ""
+            ? `-${scope.row.taskTypeDetailName}`
+            : ""
           }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="合同状态"
-        align="center"
-        width="150"
-        prop="socialCreditCode"
-        :resizable="false"
-      >
+      <el-table-column label="合同状态" align="center" width="150" prop="socialCreditCode" :resizable="false">
         <template #default="scope">
           <span v-if="scope.row.type === 1">{{ scope.row.closingMonth }}</span>
           <span v-else>{{ scope.row.onceContractStatus }}</span>
@@ -144,126 +80,70 @@
           </el-select> -->
         </template>
       </el-table-column>
-      <el-table-column
-        label="起始月"
-        align="center"
-        min-width="120"
-        prop="startMonth"
-        :resizable="false"
-      >
+      <el-table-column label="起始月" align="center" min-width="120" prop="startMonth" :resizable="false">
         <template #default="scope">
           <div v-if="scope.row.type === 1">
-            <div
-              v-if="scope.row.editStatus.startMonth"
-              style="
+            <div v-if="scope.row.editStatus.startMonth" style="
                 display: flex;
                 flex-direction: row;
                 justify-content: center;
-              "
-            >
-              <el-date-picker
-                v-model="scope.row.startMonth"
-                size="small"
-                placeholder="起始月"
-                :clearable="true"
-                value-format="YYYY-MM-DD"
-                format="YYYY年MM月"
-                type="month"
-                @change="(arg) => startDateChangeHandler(scope.row, arg)"
-              />
-              <el-button
-                link
-                type="primary"
-                icon="Check"
-                size="small"
-                style="padding: 0"
-                @click="saveHandler(scope.row, 'startMonth')"
-              />
+              ">
+              <el-date-picker v-model="scope.row.startMonth" size="small" placeholder="起始月" :clearable="true"
+                value-format="YYYY-MM-DD" format="YYYY年MM月" type="month"
+                @change="(arg) => startDateChangeHandler(scope.row, arg)" />
+              <el-button link type="primary" icon="Check" size="small" style="padding: 0"
+                @click="saveHandler(scope.row, 'startMonth')" />
             </div>
-            <div
-              v-else
-              style="
+            <div v-else style="
                 display: flex;
                 flex-direction: row;
                 justify-content: center;
-              "
-            >
+              ">
               <div style="width: auto">
                 {{
                   scope.row.startMonth
-                    ? moment(scope.row.startMonth).format("YYYY年MM月")
-                    : ""
+                  ? moment(scope.row.startMonth).format("YYYY年MM月")
+                  : ""
                 }}
               </div>
-              <el-button
-                v-show="
-                  scope.row.isStop === 0 && scope.row.records.length === 0
-                "
-                link
-                type="primary"
-                icon="Edit"
-                size="small"
-                style="padding: 0"
-                v-hasPermi="['business:workOrder:edit']"
-                @click="
-                  () => {
+              <el-button v-show="scope.row.isStop === 0 && scope.row.records.length === 0
+                  " link type="primary" icon="Edit" size="small" style="padding: 0"
+                v-hasPermi="['business:workOrder:edit']" @click="() => {
                     scope.row.editStatus.startMonth =
                       !scope.row.editStatus.startMonth;
                   }
-                "
-              />
+                  " />
             </div>
           </div>
           <div v-else>-</div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="结束月"
-        align="center"
-        min-width="90"
-        :resizable="false"
-      >
+      <el-table-column label="结束月" align="center" min-width="90" :resizable="false">
         <template #default="scope">
           <div v-if="scope.row.monthNum > 0">
             {{
               scope.row.type === 1
-                ? scope.row.endMonth
-                  ? moment(scope.row.endMonth).format("YYYY年MM月")
-                  : ""
-                : "-"
+              ? scope.row.endMonth
+                ? moment(scope.row.endMonth).format("YYYY年MM月")
+                : ""
+              : "-"
             }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="工单月数"
-        align="center"
-        :resizable="false"
-        width="80"
-        prop="monthNum"
-      >
+      <el-table-column label="工单月数" align="center" :resizable="false" width="80" prop="monthNum">
         <template #default="scope">
           {{ scope.row.type === 1 ? scope.row.monthNum : "-" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="工单执行人"
-        align="center"
-        :resizable="false"
-        min-width="100"
-      >
+      <el-table-column label="工单执行人" align="center" :resizable="false" min-width="100">
         <template #default="scope">{{ getTransactor(scope.row) }}</template>
       </el-table-column>
     </el-table>
     <!-- <contract-form ref="contractRef" :get-list="getList" /> -->
     <!-- 分页 -->
-    <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" />
     <ZeroChangeDialog ref="zeroChangeDialogRef" :save-call-back="thenSave" />
   </div>
 </template>
@@ -296,7 +176,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   noContract: 0,
@@ -376,7 +256,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -417,7 +297,7 @@ function saveHandler(row, field) {
             getList();
           });
         })
-        .catch((_) => {});
+        .catch((_) => { });
     }
   }
 }
@@ -430,7 +310,7 @@ function thenSave(row) {
         getList();
       });
     })
-    .catch((_) => {});
+    .catch((_) => { });
 }
 
 function getTransactor(row) {

+ 79 - 350
src/views/business/deduction/index.vue

@@ -8,24 +8,15 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:deposit:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
+              导出</el-dropdown-item>
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-radio-group
-        v-model="queryRadio"
-        style="margin-left: 20px; height: 100%"
-        size="small"
-        @change="radioChangeHandler"
-      >
+      <el-radio-group v-model="queryRadio" style="margin-left: 20px; height: 100%" size="small"
+        @change="radioChangeHandler">
         <el-radio-button label="全部" />
         <el-radio-button label="待确认扣款" />
         <el-radio-button label="可扣款" />
@@ -38,149 +29,58 @@
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="来源名:">
-        <el-select
-          v-model="queryParams.sourceNames"
-          placeholder="请选择来源名"
-          multiple
-        >
-          <el-option
-            v-for="item in sources"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="queryParams.sourceNames" placeholder="请选择来源名" multiple>
+          <el-option v-for="item in sources" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="客户名称:">
-        <el-input
-          v-model.trim="queryParams.companyName"
-          size="small"
-          type="text"
-          placeholder="客户名称"
-          :clearable="true"
-          style="width: 140px"
-        />
+        <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称" :clearable="true"
+          style="width: 140px" />
       </el-form-item>
       <el-form-item label="所属期:">
-        <el-date-picker
-          v-model="queryParams.currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          value-format="YYYY-MM"
-          style="width: 130px"
-        />
+        <el-date-picker v-model="queryParams.currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM"
+          style="width: 130px" />
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名"
-        prop="companyName"
-        min-width="250"
-        align="center"
-      />
-      <el-table-column
-        label="来源"
-        min-width="100"
-        align="center"
-        prop="fromCompanyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        prop="taxType"
-        width="100"
-        align="center"
-      />
-      <el-table-column
-        label="扣款期"
-        prop="currentMonth"
-        min-width="100"
-        align="center"
-      >
+      <el-table-column label="客户名" prop="companyName" min-width="250" align="center" />
+      <el-table-column label="来源" min-width="100" align="center" prop="fromCompanyName" />
+      <el-table-column label="纳税性质" prop="taxType" width="100" align="center" />
+      <el-table-column label="扣款期" prop="currentMonth" min-width="100" align="center">
         <template #default="scope">
           {{ scope.row.year }}年{{ scope.row.month }}月
         </template>
       </el-table-column>
-      <el-table-column
-        label="来源名"
-        prop="sourceName"
-        width="150"
-        align="center"
-      />
+      <el-table-column label="来源名" prop="sourceName" width="150" align="center" />
       <el-table-column label="金额" prop="amount" width="150" align="center">
         <template #default="scope">
-          <el-button
-            v-if="scope.row.deductible === 1"
-            type="primary"
-            link
-            size="small"
-            @click="amountDetail(scope.row)"
-            >{{ scope.row.amount }}</el-button
-          >
+          <el-button v-if="scope.row.deductible === 1" type="primary" link size="small"
+            @click="amountDetail(scope.row)">{{ scope.row.amount }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="确认人"
-        prop="confirmName"
-        width="110"
-        align="center"
-      />
-      <el-table-column
-        label="确认时间"
-        prop="confirmDate"
-        min-width="140"
-        align="center"
-      />
-      <el-table-column
-        label="操作人"
-        prop="operationName"
-        width="100"
-        align="center"
-      />
-      <el-table-column
-        label="操作时间"
-        min-width="140"
-        prop="operationDate"
-        align="center"
-      />
+      <el-table-column label="确认人" prop="confirmName" width="110" align="center" />
+      <el-table-column label="确认时间" prop="confirmDate" min-width="140" align="center" />
+      <el-table-column label="操作人" prop="operationName" width="100" align="center" />
+      <el-table-column label="操作时间" min-width="140" prop="operationDate" align="center" />
       <el-table-column label="文件查看" align="center" width="100">
         <template #default="scope">
-          <el-button
-            v-if="scope.row.status === 2"
-            size="small"
-            type="primary"
-            link
-            @click="showFiles(scope.row)"
-            >查看文件</el-button
-          >
+          <el-button v-if="scope.row.status === 2" size="small" type="primary" link
+            @click="showFiles(scope.row)">查看文件</el-button>
           <span v-else>--</span>
         </template>
       </el-table-column>
@@ -189,13 +89,8 @@
           <span v-if="scope.row.status === 0">待审核</span>
           <span v-if="scope.row.status === 1">可扣款</span>
           <span v-if="scope.row.status === 2">已扣款</span>
-          <el-tooltip
-            v-if="scope.row.status === 4"
-            :content="
-              scope.row.failureType === 1 ? scope.row.failureResult : '余额不足'
-            "
-            placement="top"
-          >
+          <el-tooltip v-if="scope.row.status === 4" :content="scope.row.failureType === 1 ? scope.row.failureResult : '余额不足'
+            " placement="top">
             <span>扣款失败</span>
           </el-tooltip>
           <span v-if="scope.row.status === 5">已申报</span>
@@ -204,93 +99,33 @@
       <el-table-column label="操作" fixed="right" width="220" align="center">
         <template #default="scope">
           <template v-if="scope.row.deductible === 1">
-            <el-button
-              v-hasPermi="['business:deduction:confirm']"
-              v-show="
-                (scope.row.status === 0 || scope.row.status === 4) &&
-                checkConfirm(scope.row)
-              "
-              link
-              type="primary"
-              size="small"
-              @click="showConfirm(scope.row)"
-              >确认扣款</el-button
-            >
+            <el-button v-hasPermi="['business:deduction:confirm']" v-show="(scope.row.status === 0 || scope.row.status === 4) &&
+              checkConfirm(scope.row)
+              " link type="primary" size="small" @click="showConfirm(scope.row)">确认扣款</el-button>
             <div v-if="scope.row.sourceName === '公积金'">
-              <el-button
-                link
-                v-hasPermi="['business:deduction:declare']"
-                v-show="scope.row.status === 1"
-                style="margin-right: 5px"
-                type="primary"
-                size="small"
-                @click="applySuccess(scope.row, 5)"
-                >申报成功</el-button
-              >
+              <el-button link v-hasPermi="['business:deduction:declare']" v-show="scope.row.status === 1"
+                style="margin-right: 5px" type="primary" size="small" @click="applySuccess(scope.row, 5)">申报成功</el-button>
             </div>
-            <div
-              v-if="scope.row.sourceName === '公积金'"
-              style="margin-left: 26px; display: flex; align-items: center"
-            >
-              <el-button
-                link
-                v-hasPermi="['business:deduction:deduction']"
-                v-show="scope.row.status === 5"
-                style="margin-left: 5px; :5px "
-                type="primary"
-                size="small"
-                @click="showFeedbackDialog(scope.row)"
-                >扣款失败</el-button
-              >
-              <el-button
-                link
-                v-hasPermi="['business:deduction:deduction']"
-                v-show="scope.row.status === 5"
-                style="margin-right: 5px"
-                type="primary"
-                size="small"
-                @click="openUpload(scope.row)"
-                >扣款成功</el-button
-              >
+            <div v-if="scope.row.sourceName === '公积金'" style="margin-left: 26px; display: flex; align-items: center">
+              <el-button link v-hasPermi="['business:deduction:deduction']" v-show="scope.row.status === 5"
+                style="margin-left: 5px; :5px " type="primary" size="small"
+                @click="showFeedbackDialog(scope.row)">扣款失败</el-button>
+              <el-button link v-hasPermi="['business:deduction:deduction']" v-show="scope.row.status === 5"
+                style="margin-right: 5px" type="primary" size="small" @click="openUpload(scope.row)">扣款成功</el-button>
             </div>
-            <div
-              v-else
-              style="margin-left: 26px; display: flex; align-items: center"
-            >
-              <el-button
-                link
-                v-hasPermi="['business:deduction:deduction']"
-                v-show="scope.row.status === 1"
-                style="margin-right: 5px"
-                type="primary"
-                size="small"
-                @click="openUpload(scope.row)"
-                >扣款成功</el-button
-              >
-              <el-button
-                link
-                v-hasPermi="['business:deduction:deduction']"
-                v-show="scope.row.status === 1"
-                style="margin-left: 5px; :5px "
-                type="primary"
-                size="small"
-                @click="showFeedbackDialog(scope.row)"
-                >扣款失败</el-button
-              >
+            <div v-else style="margin-left: 26px; display: flex; align-items: center">
+              <el-button link v-hasPermi="['business:deduction:deduction']" v-show="scope.row.status === 1"
+                style="margin-right: 5px" type="primary" size="small" @click="openUpload(scope.row)">扣款成功</el-button>
+              <el-button link v-hasPermi="['business:deduction:deduction']" v-show="scope.row.status === 1"
+                style="margin-left: 5px; :5px " type="primary" size="small"
+                @click="showFeedbackDialog(scope.row)">扣款失败</el-button>
             </div>
           </template>
         </template>
       </el-table-column>
     </el-table>
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
-    <el-dialog
-      title="扣款信息"
-      v-model="formOpen"
-      width="500px"
-      append-to-body
-      draggable
-      @close="formCancel"
-    >
+    <el-dialog title="扣款信息" v-model="formOpen" width="500px" append-to-body draggable @close="formCancel">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-row :gutter="30">
           <el-col :span="24">
@@ -301,57 +136,23 @@
           <el-col :span="24">
             <el-form-item label="凭证附件:">
               <div class="details-btns-container" style="display: flex">
-                <el-upload
-                  action="#"
-                  :http-request="upload"
-                  :with-credentials="true"
-                  :show-file-list="false"
-                  multiple
-                >
-                  <el-button size="small" type="primary" icon="Upload"
-                    >点击上传</el-button
-                  >
+                <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
+                  <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
                 </el-upload>
               </div>
-              <el-table
-                ref="filesTable"
-                :data="form.files"
-                size="small"
-                height="200px"
-                border
-                header-row-class-name="list-header-row"
-              >
-                <el-table-column
-                  type="index"
-                  label="序号"
-                  width="47"
-                  align="center"
-                />
-                <el-table-column
-                  label="文件名"
-                  prop="originalFileName"
-                  align="center"
-                >
+              <el-table ref="filesTable" :data="form.files" size="small" height="200px" border
+                header-row-class-name="list-header-row">
+                <el-table-column type="index" label="序号" width="47" align="center" />
+                <el-table-column label="文件名" prop="originalFileName" align="center">
                   <template #default="scope">
-                    <el-link
-                      :href="`${baseUrl}${scope.row.fileUrl}`"
-                      :underline="false"
-                      target="_blank"
-                      type="primary"
-                    >
+                    <el-link :href="`${baseUrl}${scope.row.fileUrl}`" :underline="false" target="_blank" type="primary">
                       {{ scope.row.originalFileName }}
                     </el-link>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" width="47" align="center">
                   <template #default="scope">
-                    <el-button
-                      link
-                      size="small"
-                      type="danger"
-                      @click="handleDelFile(scope.$index)"
-                      >删除</el-button
-                    >
+                    <el-button link size="small" type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -361,129 +162,57 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            size="small"
-            icon="Finished"
-            @click="saveHandler"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="formCancel"
-            >取 消</el-button
-          >
+          <el-button type="primary" size="small" icon="Finished" @click="saveHandler">确 定</el-button>
+          <el-button icon="close" size="small" @click="formCancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-image-viewer
-      v-if="showViewer"
-      :url-list="currentFileList"
-      @close="closeImages"
-      :initial-index="showIndex"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
     <feedbackDialog ref="feedbackDialogRef" :verify="verifyDeduction" />
     <FileDialog ref="fileDialog" />
     <MergeTaxViewDialog ref="mergeTaxViewDialog" />
     <HousingFundViewDialog ref="housingFundViewDialog" />
     <SocialSecurityViewDialog ref="socialSecurityViewDialog" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        size="small"
-        :rules="rules"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" size="small" :rules="rules" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:">
-              <el-input
-                v-model.trim="queryParams.companyName"
-                size="small"
-                type="text"
-                placeholder="客户名称"
-                :clearable="true"
-              />
+              <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="来源名:" prop="sourceNames">
-              <el-select
-                v-model="queryParams.sourceNames"
-                placeholder="请选择来源名"
-                multiple
-              >
-                <el-option
-                  v-for="item in sources"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model="queryParams.sourceNames" placeholder="请选择来源名" multiple>
+                <el-option v-for="item in sources" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
 
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="所属期:">
-              <el-date-picker
-                v-model="queryParams.currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                value-format="YYYY-MM"
-              />
+              <el-date-picker v-model="queryParams.currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -567,7 +296,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   noContract: 1,
@@ -599,7 +328,7 @@ function handleOneself() {
 function radioChangeHandler(arg) {
   const query = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyName: "",
   };
   switch (arg) {
@@ -640,7 +369,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyName: "",
     orderByColumn: "create_time",
     noContract: 1,
@@ -688,7 +417,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 18 - 68
src/views/business/entrust/deduct/index.vue

@@ -26,22 +26,15 @@
     </el-row>
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button type="success" size="small" icon="Refresh" @click="getList"
-        >刷新</el-button
-      >
+      <el-button type="success" size="small" icon="Refresh" @click="getList">刷新</el-button>
       <el-dropdown>
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:deduct:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deduct:export']">
+              导出</el-dropdown-item>
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:workOrder:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
@@ -61,73 +54,30 @@
     </el-form> -->
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="委托单号"
-        align="center"
-        prop="formNo"
-        min-width="140"
-      />
-      <el-table-column
-        label="扣款单位"
-        align="center"
-        prop="contactCompany"
-        min-width="150"
-      />
+      <el-table-column label="委托单号" align="center" prop="formNo" min-width="140" />
+      <el-table-column label="扣款单位" align="center" prop="contactCompany" min-width="150" />
       <el-table-column label="扣款信息" align="center">
         <template #default="scope">
           {{ scope.row.year }}年{{ scope.row.month }}月扣款
         </template>
       </el-table-column>
-      <el-table-column
-        label="扣款时间"
-        align="center"
-        prop="deductDate"
-        min-width="120"
-      />
-      <el-table-column
-        label="扣款金额"
-        header-align="center"
-        align="right"
-        prop="amount"
-        min-width="80"
-      />
-      <el-table-column
-        label="扣款明细"
-        align="center"
-        prop="amount"
-        min-width="80"
-      >
+      <el-table-column label="扣款时间" align="center" prop="deductDate" min-width="120" />
+      <el-table-column label="扣款金额" header-align="center" align="right" prop="amount" min-width="80" />
+      <el-table-column label="扣款明细" align="center" prop="amount" min-width="80">
         <template #default="scope">
           <!-- <el-button link size="small" type="primary" @click="handleDetail(scope.row)">查看明细</el-button> -->
-          <el-button
-            link
-            size="small"
-            type="primary"
-            v-hasPermi="['business:deduct:info']"
-            @click="handleStatementAccount(scope.row)"
-            >跳转对账单</el-button
-          >
+          <el-button link size="small" type="primary" v-hasPermi="['business:deduct:info']"
+            @click="handleStatementAccount(scope.row)">跳转对账单</el-button>
         </template>
       </el-table-column>
     </el-table>
     <statementAccountForm ref="statementAccountFormRef" :get-list="getList" />
     <!-- 分页 -->
-    <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" />
   </div>
 </template>
 
@@ -162,7 +112,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   companyName: "",
   noContract: 0,
@@ -218,7 +168,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -256,11 +206,11 @@ function saveHandler(row, field) {
           getList();
         });
       })
-      .catch((_) => {});
+      .catch((_) => { });
   }
 }
 
-function handleDetail(row) {}
+function handleDetail(row) { }
 
 function handleStatementAccount(row) {
   statementAccountFormRef.value.open(row.id);

+ 20 - 80
src/views/business/entrust/deductOfFactory/index.vue

@@ -2,99 +2,44 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="warning"
-        size="small"
-        icon="Refresh"
-        @click="getList"
-        v-hasPermi="['business:entrustOrder:remove']"
-        >刷新</el-button
-      >
+      <el-button type="warning" size="small" icon="Refresh" @click="getList"
+        v-hasPermi="['business:entrustOrder:remove']">刷新</el-button>
       <el-dropdown>
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:entrustOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:entrustOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="往来单位:" prop="contactCompany">
-        <el-input
-          v-model="queryParams.contactCompany"
-          placeholder="请输入往来单位"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.contactCompany" placeholder="请输入往来单位" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="签约日期"
-        align="center"
-        prop="formDate"
-        width="150"
-      />
-      <el-table-column
-        label="合同编号"
-        align="center"
-        prop="formNo"
-        width="120"
-      >
+      <el-table-column label="签约日期" align="center" prop="formDate" width="150" />
+      <el-table-column label="合同编号" align="center" prop="formNo" width="120">
       </el-table-column>
-      <el-table-column
-        label="往来单位"
-        align="center"
-        prop="contactCompany"
-        width="140"
-      >
+      <el-table-column label="往来单位" align="center" prop="contactCompany" width="140">
       </el-table-column>
-      <el-table-column
-        label="预存金额"
-        prop="depositAmount"
-        align="center"
-        width="100"
-      >
+      <el-table-column label="预存金额" prop="depositAmount" align="center" width="100">
       </el-table-column>
-      <el-table-column
-        label="结余金额"
-        prop="remainAmount"
-        align="center"
-        width="100"
-      >
+      <el-table-column label="结余金额" prop="remainAmount" align="center" width="100">
       </el-table-column>
       <el-table-column label="备注" prop="remark" align="center">
       </el-table-column>
@@ -106,13 +51,8 @@
     </el-table>
     <entrust-order-form ref="entrustOrderFormRef" :getList="getList" />
     <!-- 分页 -->
-    <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" />
   </div>
 </template>
 
@@ -145,7 +85,7 @@ const { entrust_order_status } = proxy.useDict("entrust_order_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   contactCompany: "",
   type: 2,
 });
@@ -212,7 +152,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 function handleConfirm(row) {
@@ -241,7 +181,7 @@ function handleFinished(row) {
     });
 }
 
-function handleViewAccountment(row) {}
+function handleViewAccountment(row) { }
 
 getList();
 </script>

+ 1 - 1
src/views/business/entrust/deposit/index.vue

@@ -219,7 +219,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   noContract: 1,

+ 1 - 1
src/views/business/entrust/depositOfFactory/index.vue

@@ -205,7 +205,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   noContract: 1,
 });

+ 1 - 1
src/views/business/entrust/entrustOrder/index.vue

@@ -105,7 +105,7 @@ const { entrust_order_status } = proxy.useDict("entrust_order_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   contactCompany: "",
   orderByColumn: "create_time",
   type: 2,

+ 1 - 1
src/views/business/entrust/statementAccount/index.vue

@@ -103,7 +103,7 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     orderByColumn: "create_time",
-    pageSize: 10,
+    pageSize: 20,
     entrustOrderId: null,
   },
   rules: {

+ 1 - 1
src/views/business/entrust/workOrder/currentMonth/index.vue

@@ -150,7 +150,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   noContract: 0,

+ 1 - 1
src/views/business/entrust/workOrder/nextMonth/index.vue

@@ -139,7 +139,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   noContract: 0,

+ 1 - 1
src/views/business/entrust/workOrder/once/index.vue

@@ -104,7 +104,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   type: 2,

+ 1 - 1
src/views/business/entrust/workOrderForFactory/currentMonth/index.vue

@@ -134,7 +134,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   noContract: 0,
   toTenantId: getTenant(),

+ 1 - 1
src/views/business/entrust/workOrderForFactory/nextMonth/index.vue

@@ -129,7 +129,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   noContract: 0,
   type: 1,

+ 1 - 1
src/views/business/entrust/workOrderForFactory/once/index.vue

@@ -98,7 +98,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   toTenantId: getTenant(),
   type: 2,

+ 8 - 4
src/views/business/financial/collection/index.vue

@@ -37,7 +37,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column v-if="getShowStatus(2)" label="客户" prop="companyName" min-width="250" align="center" />
       <el-table-column v-if="getShowStatus(3)" label="合同编号" prop="contractNo" min-width="150" align="center" />
-      <el-table-column v-if="getShowStatus(4)" label="实际付款时间" prop="actuallyDate" width="126" align="center" />
+      <el-table-column v-if="getShowStatus(4)" label="实际付款时间" prop="actuallyDate" width="100" align="center">
+        <template #default="scope">
+          {{ moment(scope.row.actuallyDate).format("YYYY-MM-DD") }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         v-if="getShowStatus(4)"
         label="收款日期"
@@ -73,7 +77,7 @@
       </el-table-column>
       <el-table-column v-if="getShowStatus(14)" label="确认到账时间" prop="actuallyDate" align="center">
         <template #default="scope">
-          {{ scope.row.actuallyDate }}
+          {{ moment(scope.row.actuallyDate).format("YYYY-MM-DD") }}
         </template>
       </el-table-column>
       <el-table-column v-if="getShowStatus(13)" label="备注" prop="remark" align="center" min-width="100" />
@@ -151,7 +155,7 @@ const { contract_status } = proxy.useDict("contract_status");
 const queryParams = ref({
   pageNum: 1,
   orderByColumn: "create_time",
-  pageSize: 10,
+  pageSize: 20,
 });
 
 /***********************  方法区  ****************************/
@@ -212,7 +216,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     nonpayment: true,
   };
   handleQuery();

+ 7 - 7
src/views/business/financial/contract/form.vue

@@ -141,9 +141,9 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="收款金额:" required>
-                <el-input-number v-if="editStatus" v-model.trim="form.amount" size="small" placeholder="收款金额"
+                <el-input-number v-if="editStatus" v-model.trim="form.arriveAmount" size="small" placeholder="收款金额"
                   :clearable="true" :precision="2" controls-position="right" :controls="false" @change="amountChange" />
-                <span v-else>{{ form.amount }}</span>
+                <span v-else>{{ form.arriveAmount }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -480,7 +480,7 @@ function computeTotalAmount() {
     const element = form.value.details[index];
     amount += element.arriveAmount == null ? 0 : element.arriveAmount;
   }
-  form.value.amount = amount;
+  form.value.arriveAmount = amount;
 }
 
 function amountChange() {
@@ -491,10 +491,10 @@ function amountChange() {
     }
     // 判断到款状态
     form.value.arriveAmount = amount;
-    if (form.value.arriveAmount > 0)
-      form.value.arriveStatus =
-        form.value.arriveAmount === form.value.amount ? 1 : 2;
-    else form.value.arriveStatus = 0;
+    // if (form.value.arriveAmount > 0)
+    //   form.value.arriveStatus =
+    //     form.value.arriveAmount === form.value.contractAmount ? 1 : 2;
+    // else form.value.arriveStatus = 0;
   }
 }
 

+ 32 - 131
src/views/business/financial/contract/index.vue

@@ -13,171 +13,71 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:collection:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:collection:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          clearable
-          style="width: 150px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable style="width: 150px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="180"
-      />
-      <el-table-column
-        label="合同编号"
-        align="center"
-        prop="contractNo"
-        min-width="150"
-      />
-      <el-table-column
-        label="签约日期"
-        align="center"
-        prop="formDate"
-        width="85"
-      >
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
+      <el-table-column label="合同编号" align="center" prop="contractNo" min-width="150" />
+      <el-table-column label="签约日期" align="center" prop="formDate" width="85">
         <template #default="scope">
           <span>{{ parseTime(scope.row.formDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="签约金额"
-        header-align="center"
-        align="right"
-        prop="amount"
-        min-width="80"
-      />
-      <el-table-column
-        label="签单人"
-        align="center"
-        prop="signerName"
-        min-width="100"
-      />
-      <el-table-column
-        label="合同来源"
-        align="center"
-        prop="sourceName"
-        min-width="130"
-      />
-      <el-table-column
-        label="审核状态"
-        align="center"
-        prop="verifyStatus"
-        min-width="100"
-      >
+      <el-table-column label="签约金额" header-align="center" align="right" prop="amount" min-width="80" />
+      <el-table-column label="签单人" align="center" prop="signerName" min-width="100" />
+      <el-table-column label="合同来源" align="center" prop="sourceName" min-width="130" />
+      <el-table-column label="审核状态" align="center" prop="verifyStatus" min-width="100">
         <template #default="scope">
-          <dict-tag
-            :options="contract_verify_status"
-            :value="scope.row.verifyStatus"
-          />
+          <dict-tag :options="contract_verify_status" :value="scope.row.verifyStatus" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="合同类型"
-        align="center"
-        width="80"
-        prop="contractType"
-      >
+      <el-table-column label="合同类型" align="center" width="80" prop="contractType">
         <template #default="scope">
           {{ scope.row.contractType === 0 ? "新签" : "续签" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="任务类型"
-        align="center"
-        width="80"
-        prop="serviceType"
-      >
+      <el-table-column label="任务类型" align="center" width="80" prop="serviceType">
         <template #default="scope">
           {{ scope.row.serviceType === 1 ? "循环" : "代办" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="合同状态"
-        min-width="100"
-        align="center"
-        prop="status"
-      >
+      <el-table-column label="合同状态" min-width="100" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="contract_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        fixed="right"
-        min-width="100"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" fixed="right" min-width="100" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            link
-            type="warning"
-            size="small"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['business:collection:add']"
-            >新增收款</el-button
-          >
+          <el-button link type="warning" size="small" @click="handleAdd(scope.row)"
+            v-hasPermi="['business:collection:add']">新增收款</el-button>
         </template>
       </el-table-column>
     </el-table>
     <contract-form ref="contractRef" :get-list="getList" />
     <!-- 分页 -->
-    <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" />
   </div>
 </template>
 
@@ -200,7 +100,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   nonpayment: true,
   orderByColumn: "create_time",
 });
@@ -228,7 +128,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     nonpayment: true,
   };
   handleQuery();
@@ -264,7 +164,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 function handleAlter(row) {
@@ -283,7 +183,7 @@ function handleDissolution() {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -291,7 +191,8 @@ function handleExport() {
   exportOrder(queryParams.value);
 }
 
-function handleImport() {}
+function handleImport() { }
 
 getList();
 </script>
+pageSize: 20pageSize: 20

+ 45 - 186
src/views/business/financial/payment/index.vue

@@ -2,238 +2,96 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['business:payment:add']"
-        >新增</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['business:payment:add']">新增</el-button>
       <el-dropdown>
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:payment:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:payment:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column type="index" label="序号" width="50" align="center" /> -->
-      <el-table-column
-        v-if="getShowStatus(2)"
-        label="客户名称"
-        prop="companyName"
-        min-width="250"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(16)"
-        label="服务公司"
-        prop="serviceCompanyName"
-        width="200"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(3)"
-        label="订单号"
-        prop="formNo"
-        min-width="200"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(4)"
-        label="支出日期"
-        prop="formDate"
-        min-width="90"
-        align="center"
-      >
+      <el-table-column v-if="getShowStatus(2)" label="客户名称" prop="companyName" min-width="250" align="center" />
+      <el-table-column v-if="getShowStatus(16)" label="服务公司" prop="serviceCompanyName" width="200" align="center" />
+      <el-table-column v-if="getShowStatus(3)" label="订单号" prop="formNo" min-width="200" align="center" />
+      <el-table-column v-if="getShowStatus(4)" label="支出日期" prop="formDate" min-width="90" align="center">
         <template #default="scope">
           {{
             scope.row.formDate
-              ? moment(scope.row.formDate).format("YYYY-MM-DD")
-              : ""
+            ? moment(scope.row.formDate).format("YYYY-MM-DD")
+            : ""
           }}
         </template>
       </el-table-column>
       <!-- <el-table-column label="服务公司" prop="subsidiary" width="150" align="center" /> -->
-      <el-table-column
-        v-if="getShowStatus(5)"
-        label="支出事由"
-        prop="paymentCause"
-        min-width="90"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(6)"
-        label="支出科目"
-        prop="paymentSubject"
-        min-width="90"
-        align="center"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        v-if="getShowStatus(7)"
-        label="支出金额"
-        prop="sumAmount"
-        width="80"
-        header-align="center"
-        align="right"
-      />
+      <el-table-column v-if="getShowStatus(5)" label="支出事由" prop="paymentCause" min-width="90" align="center" />
+      <el-table-column v-if="getShowStatus(6)" label="支出科目" prop="paymentSubject" min-width="90" align="center"
+        show-overflow-tooltip />
+      <el-table-column v-if="getShowStatus(7)" label="支出金额" prop="sumAmount" width="80" header-align="center"
+        align="right" />
       <!-- <el-table-column label="支出状态" prop="paymentStatus" width="90" align="center">
             <template #default="scope"> {{ scope.row.paymentStatus === 0 ? '未支出' : '已支出' }} </template>
           </el-table-column>
           <el-table-column label="审核状态" prop="verifyStatus" width="90" align="center">
             <template #default="scope"> {{ scope.row.verifyStatus === 0 ? '待审核' : scope.row.verifyStatus === 1 ? '审核通过' : '审核驳回' }} </template>
           </el-table-column> -->
-      <el-table-column
-        v-if="getShowStatus(15)"
-        label="审核日期"
-        prop="verifyDate"
-        width="150"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(8)"
-        label="审核状态"
-        prop="status"
-        min-width="100"
-        align="center"
-      >
+      <el-table-column v-if="getShowStatus(15)" label="审核日期" prop="verifyDate" width="150" align="center" />
+      <el-table-column v-if="getShowStatus(8)" label="审核状态" prop="status" min-width="100" align="center">
         <template #header>
           <!-- <el-badge v-if="unVerifiedNum > 0" is-dot>审核状态</el-badge> -->
           <div>审核状态</div>
         </template>
         <template #default="scope">
-          <span v-if="scope.row.verifyStatus === 0" style="color: #cd853f"
-            >未审核</span
-          >
-          <span v-else-if="scope.row.verifyStatus === 1" style="color: #32cd32"
-            >审核通过</span
-          >
-          <span v-else-if="scope.row.verifyStatus === 2" style="color: #dc143c"
-            >审核不通过</span
-          >
+          <span v-if="scope.row.verifyStatus === 0" style="color: #cd853f">未审核</span>
+          <span v-else-if="scope.row.verifyStatus === 1" style="color: #32cd32">审核通过</span>
+          <span v-else-if="scope.row.verifyStatus === 2" style="color: #dc143c">审核不通过</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="getShowStatus(9)"
-        label="支付状态"
-        min-width="100"
-        prop="arriveStatus"
-        align="center"
-      >
+      <el-table-column v-if="getShowStatus(9)" label="支付状态" min-width="100" prop="arriveStatus" align="center">
         <template #default="scope">
-          <span v-if="scope.row.paymentStatus === 0" style="color: #dc143c"
-            >未支付</span
-          >
-          <span v-else-if="scope.row.paymentStatus === 1" style="color: #32cd32"
-            >已支付</span
-          >
-          <span v-else-if="scope.row.paymentStatus === 2" style="color: #cd853f"
-            >部分支付</span
-          >
+          <span v-if="scope.row.paymentStatus === 0" style="color: #dc143c">未支付</span>
+          <span v-else-if="scope.row.paymentStatus === 1" style="color: #32cd32">已支付</span>
+          <span v-else-if="scope.row.paymentStatus === 2" style="color: #cd853f">部分支付</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="getShowStatus(10)"
-        label="收款账户名"
-        prop="acceptAccount"
-        min-width="100"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(11)"
-        label="收款账号"
-        prop="acceptAccountNo"
-        width="90"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(12)"
-        label="等待审核"
-        prop="waitForVerify"
-        min-width="90"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(13)"
-        label="申请人"
-        prop="applierName"
-        min-width="130"
-        align="center"
-      />
-      <el-table-column
-        v-if="getShowStatus(14)"
-        label="备注"
-        prop="remark"
-        align="center"
-      />
+      <el-table-column v-if="getShowStatus(10)" label="收款账户名" prop="acceptAccount" min-width="100" align="center" />
+      <el-table-column v-if="getShowStatus(11)" label="收款账号" prop="acceptAccountNo" width="90" align="center" />
+      <el-table-column v-if="getShowStatus(12)" label="等待审核" prop="waitForVerify" min-width="90" align="center" />
+      <el-table-column v-if="getShowStatus(13)" label="申请人" prop="applierName" min-width="130" align="center" />
+      <el-table-column v-if="getShowStatus(14)" label="备注" prop="remark" align="center" />
       <el-table-column label="操作" fixed="right" width="60" align="center">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="handleFormPageOpen(scope.row.id)"
-            >查看</el-button
-          >
+          <el-button link type="primary" size="small" @click="handleFormPageOpen(scope.row.id)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
     <payment-form ref="paymentRef" :get-list="getList" />
     <!-- 分页 -->
-    <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" />
   </div>
 </template>
 
@@ -296,7 +154,7 @@ const { contract_status } = proxy.useDict("contract_status");
 const queryParams = ref({
   pageNum: 1,
   orderByColumn: "create_time",
-  pageSize: 10,
+  pageSize: 20,
 });
 
 /***********************  方法区  ****************************/
@@ -322,7 +180,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     nonpayment: true,
   };
   handleQuery();
@@ -352,7 +210,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 function handleAlter(row) {
@@ -371,7 +229,7 @@ function handleDissolution() {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -379,7 +237,7 @@ function handleExport() {
   exportOrder(queryParams.value);
 }
 
-function handleImport() {}
+function handleImport() { }
 
 function getShowStatus(key) {
   const index = showRows.value.findIndex((l) => l === key);
@@ -396,3 +254,4 @@ function handleFormPageOpen(id) {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 2 - 2
src/views/business/housingFund/confirm/index.vue

@@ -277,7 +277,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().format("yyyy"),
   month: proxy.moment().format("MM"),
@@ -322,7 +322,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().format("MM"),
     companyName: "",

+ 2 - 2
src/views/business/housingFund/declare/index.vue

@@ -258,7 +258,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   year: proxy.moment().format("YYYY"),
@@ -299,7 +299,7 @@ function handleQuery() {
 function resetQuery() {
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyName: "",
     year: proxy.moment().format("YYYY"),
     month: proxy.moment().format("MM"),

+ 1 - 1
src/views/business/paymentEntry/type/index.vue

@@ -176,7 +176,7 @@ const query = ref({
 
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   id: null,
   name: null,
   isAdd: false,

+ 63 - 226
src/views/business/production/IndividualIncomeTaxIs/index.vue

@@ -1,48 +1,19 @@
 <template>
   <div class="page-container list-container">
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:">
-        <el-input
-          v-model="queryParams.companyName"
-          type="text"
-          placeholder="请输入客户名称"
-          :clearable="true"
-          style="width: 220px"
-        />
+        <el-input v-model="queryParams.companyName" type="text" placeholder="请输入客户名称" :clearable="true"
+          style="width: 220px" />
       </el-form-item>
       <el-form-item label="个税所属期:" prop="year">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          style="width: 120px"
-          value-format="YYYY-MM-01"
-          :disabled-date="disabledDateHandler"
-          @change="monthChangeHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" style="width: 120px"
+          value-format="YYYY-MM-01" :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
       </el-form-item>
       <el-form-item label="个税状态:">
-        <el-select
-          v-model="queryParams.status"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" style="width: 130px">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -50,92 +21,42 @@
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="detailList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="detailList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        width="180"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        width="180"
-      />
-      <el-table-column
-        label="纳税性质"
-        align="center"
-        width="100"
-        prop="taxType"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" width="180" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" width="180" />
+      <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
       <el-table-column label="人员信息" align="center">
         <template #default="scope">
-          <el-button
-            v-show="scope.row.detail != null"
-            link
-            type="primary"
-            size="small"
-            @click="showMember(scope.row)"
-            v-hasPermi="['business:tax:wageList']"
-            >查看</el-button
-          >
+          <el-button v-show="scope.row.detail != null" link type="primary" size="small" @click="showMember(scope.row)"
+            v-hasPermi="['business:tax:wageList']">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column label="个税填写" align="center" prop="evidenceFile">
         <template #default="scope">
-          <el-button
-            type="primary"
-            link
-            size="small"
-            v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']"
-            @click="fillIn(scope.row)"
-            >{{
+          <el-button type="primary" link size="small" v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']"
+            @click="fillIn(scope.row)">{{
               scope.row.detail == null
-                ? "填写"
-                : scope.row.detail.status === 1
+              ? "填写"
+              : scope.row.detail.status === 1
                 ? "进行中"
                 : "已填写"
-            }}</el-button
-          >
+            }}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="个税附件" align="center" prop="content">
         <template #default="scope">
-          <el-button
-            type="primary"
-            link
-            size="small"
-            v-hasPermi="['business:individualIncomeTaxDetail:query']"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.evidenceFile === ''
-            "
-            @click="showFiles(scope.row)"
-            >查看文件</el-button
-          >
+          <el-button type="primary" link size="small" v-hasPermi="['business:individualIncomeTaxDetail:query']" :disabled="scope.row.detail == null || scope.row.detail.evidenceFile === ''
+            " @click="showFiles(scope.row)">查看文件</el-button>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="verifyContent">
@@ -144,36 +65,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -183,148 +96,71 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" />
-      <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
-            size="small"
-            type="text"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.status !== 3
-            "
-            @click="turnBack(scope.row.detail)"
-            v-hasPermi="[
-              'business:individualIncomeTaxDetail:deductionTurnBack',
-            ]"
-            >退回</el-button
-          >
+          <el-button size="small" type="text" :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+            " @click="turnBack(scope.row.detail)" v-hasPermi="[
+    'business:individualIncomeTaxDetail:deductionTurnBack',
+  ]">退回</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" />
 
     <!-- 表单 -->
     <MemberDialog ref="memberDialog" :get-list="getList"></MemberDialog>
     <FormDialog ref="fromDialog" :get-list="getList"></FormDialog>
 
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      size="small"
-      draggable
-    >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
       <el-form ref="dictRef" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="报税所属期:" prop="year">
-              <el-date-picker
-                size="small"
-                v-model="currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                value-format="YYYY-MM-01"
-                :disabled-date="disabledDateHandler"
-                @change="monthChangeHandler"
-              />
+              <el-date-picker size="small" v-model="currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM-01"
+                :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="个税状态:">
-              <el-select
-                size="small"
-                v-model="queryParams.status"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.status" type="text" placeholder="状态" :clearable="true">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="关键字:">
-              <el-input
-                size="small"
-                v-model="queryParams.companyName"
-                type="text"
-                placeholder="请输入客户名称"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.companyName" type="text" placeholder="请输入客户名称"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="来源:">
-              <el-input
-                v-model="queryParams.fromCompanyName"
-                size="small"
-                type="text"
-                placeholder="请输入客户来源"
-                :clearable="true"
-              />
+              <el-input v-model="queryParams.fromCompanyName" size="small" type="text" placeholder="请输入客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="税号:">
-              <el-input
-                size="small"
-                v-model="queryParams.socialCreditCode"
-                type="text"
-                placeholder="请输入税号"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.socialCreditCode" type="text" placeholder="请输入税号"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -362,7 +198,7 @@ const currentMonth = ref(
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyId: null,
   year: null,
   month: null,
@@ -494,7 +330,7 @@ function resetQuery() {
 
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyId: null,
     year: null,
     month: null,
@@ -535,3 +371,4 @@ function disabledDateHandler(date) {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 61 - 239
src/views/business/production/IndividualIncomeTaxIsZero/index.vue

@@ -21,46 +21,18 @@
 
   <div class="page-container list-container">
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="80px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="80px">
       <el-form-item label="客户名称:">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          :clearable="true"
-          style="width: 220px"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" :clearable="true" style="width: 220px" />
       </el-form-item>
       <el-form-item label="个税所属期:" prop="year">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          style="width: 120px"
-          value-format="YYYY-MM-01"
-          :disabled-date="disabledDateHandler"
-          @change="monthChangeHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" style="width: 120px"
+          value-format="YYYY-MM-01" :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
       </el-form-item>
       <el-form-item label="个税状态:">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="queryParams.status" placeholder="状态" :clearable="true" style="width: 130px">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -68,102 +40,42 @@
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="detailList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="detailList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        min-width="100"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="180"
-      />
-      <el-table-column
-        label="纳税性质"
-        align="center"
-        width="100"
-        prop="taxType"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
+      <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
       <el-table-column label="人员信息" min-width="60" align="center">
         <template #default="scope">
-          <el-button
-            v-show="scope.row.detail != null"
-            link
-            type="primary"
-            size="small"
-            @click="showMember(scope.row)"
-            v-hasPermi="['business:tax:wageList']"
-            >查看</el-button
-          >
+          <el-button v-show="scope.row.detail != null" link type="primary" size="small" @click="showMember(scope.row)"
+            v-hasPermi="['business:tax:wageList']">查看</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="个税填写"
-        align="center"
-        min-width="80"
-        prop="evidenceFile"
-      >
+      <el-table-column label="个税填写" align="center" min-width="80" prop="evidenceFile">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="fillIn(scope.row)"
-            v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']"
-            >{{
+          <el-button link type="primary" size="small" @click="fillIn(scope.row)"
+            v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']">{{
               scope.row.detail == null
-                ? "填写"
-                : scope.row.detail.status === 1
+              ? "填写"
+              : scope.row.detail.status === 1
                 ? "进行中"
                 : "已填写"
-            }}</el-button
-          >
+            }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="个税附件"
-        align="center"
-        min-width="90"
-        prop="content"
-      >
+      <el-table-column label="个税附件" align="center" min-width="90" prop="content">
         <template #default="scope">
-          <el-button
-            size="small"
-            link
-            type="primary"
-            v-hasPermi="['business:individualIncomeTaxDetail:query']"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.evidenceFile === ''
-            "
-            @click="showFiles(scope.row)"
-            >查看文件</el-button
-          >
+          <el-button size="small" link type="primary" v-hasPermi="['business:individualIncomeTaxDetail:query']" :disabled="scope.row.detail == null || scope.row.detail.evidenceFile === ''
+            " @click="showFiles(scope.row)">查看文件</el-button>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" min-width="80" prop="">
@@ -172,36 +84,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -211,149 +115,66 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        min-width="100"
-        prop="serviceName"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        min-width="80"
-        fixed="right"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="执行人" align="center" min-width="100" prop="serviceName" />
+      <el-table-column label="操作" align="center" min-width="80" fixed="right" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            size="small"
-            link
-            type="primary"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.status !== 3
-            "
-            @click="turnBack(scope.row)"
-            v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']"
-            >退回</el-button
-          >
+          <el-button size="small" link type="primary" :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+            " @click="turnBack(scope.row)"
+            v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']">退回</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" />
 
     <!-- 表单 -->
     <MemberDialog ref="memberDialog" :get-list="getList"></MemberDialog>
     <FormDialog ref="fromDialog" :get-list="getList"></FormDialog>
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      size="small"
-      append-to-body
-      draggable
-    >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" size="small" append-to-body draggable>
       <el-form ref="dictRef" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="个税所属期:" prop="year">
-              <el-date-picker
-                size="small"
-                v-model="currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                value-format="YYYY-MM-01"
-                :disabled-date="disabledDateHandler"
-                @change="monthChangeHandler"
-              />
+              <el-date-picker size="small" v-model="currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM-01"
+                :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="个税状态:">
-              <el-select
-                size="small"
-                v-model="queryParams.status"
-                placeholder="状态"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.status" placeholder="状态" :clearable="true">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="关键字:">
-              <el-input
-                size="small"
-                v-model="queryParams.companyName"
-                placeholder="请输入客户名称"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.companyName" placeholder="请输入客户名称" :clearable="true" />
             </el-form-item>
             <el-form-item label="来源:">
-              <el-input
-                v-model="queryParams.fromCompanyName"
-                size="small"
-                placeholder="请输入客户来源"
-                :clearable="true"
-              />
+              <el-input v-model="queryParams.fromCompanyName" size="small" placeholder="请输入客户来源" :clearable="true" />
             </el-form-item>
             <el-form-item label="税号:">
-              <el-input
-                size="small"
-                v-model="queryParams.socialCreditCode"
-                placeholder="请输入税号"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.socialCreditCode" placeholder="请输入税号" :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button @click="moreSearch = false" icon="close" size="small"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button @click="moreSearch = false" icon="close" size="small">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -414,7 +235,7 @@ const { selectStatus } = toRefs(data);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyId: null,
   year: null,
   month: null,
@@ -552,7 +373,7 @@ function resetQuery() {
 
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: null,
     month: null,
     taxType: null,
@@ -582,3 +403,4 @@ function disabledDateHandler(date) {
 
 getList();
 </script>
+pageSize: 20

+ 2 - 2
src/views/business/production/accountAdjustment/index.vue

@@ -148,7 +148,7 @@ const data = reactive({
   // 查询请求携带的参数
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
   },
   visible: false,
   custom: {},
@@ -215,7 +215,7 @@ function formCancel() {
 function radioChangeHandler(arg) {
   const query = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyName: ''
   }
   switch (arg) {

+ 33 - 145
src/views/business/production/archiveTicket/index.vue

@@ -15,109 +15,41 @@
       </el-dropdown> -->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:">
-        <el-input
-          v-model.trim="queryParams.companyName"
-          size="small"
-          type="text"
-          placeholder="客户名称"
-          :clearable="true"
-          style="width: 140px"
-        />
+        <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称" :clearable="true"
+          style="width: 140px" />
       </el-form-item>
       <el-form-item label="所属月:">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          :clearable="false"
-          value-format="YYYY-MM-01"
-          @change="currentMonthChange"
-          :disabled-date="disabledDateHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false" value-format="YYYY-MM-01"
+          @change="currentMonthChange" :disabled-date="disabledDateHandler" />
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        label="客户名称"
-        prop="companyName"
-        min-width="150"
-        align="center"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        min-width="80"
-        prop="fromCompanyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        prop="taxType"
-        min-width="110"
-        align="center"
-      />
-      <el-table-column
-        label="操作"
-        width="130"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column label="客户名称" prop="companyName" min-width="150" align="center" />
+      <el-table-column label="来源" align="center" min-width="80" prop="fromCompanyName" />
+      <el-table-column label="纳税性质" prop="taxType" min-width="110" align="center" />
+      <el-table-column label="操作" width="130" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            size="small"
-            link
-            type="primary"
-            v-hasPermi="['business:archiveReceiveTicket:upload']"
-            circle
-            @click="uploadHandle(scope.row)"
-            >上传</el-button
-          >
-          <el-button
-            link
-            size="small"
-            type="primary"
-            v-hasPermi="['business:archiveReceiveTicket:query']"
-            circle
-            @click="viewHandle(scope.row)"
-            >查看</el-button
-          >
+          <el-button size="small" link type="primary" v-hasPermi="['business:archiveReceiveTicket:upload']" circle
+            @click="uploadHandle(scope.row)">上传</el-button>
+          <el-button link size="small" type="primary" v-hasPermi="['business:archiveReceiveTicket:query']" circle
+            @click="viewHandle(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
-    <el-dialog
-      title="扣款信息"
-      v-model="formOpen"
-      width="500px"
-      append-to-body
-      draggable
-      @close="formCancel"
-    >
+    <el-dialog title="扣款信息" v-model="formOpen" width="500px" append-to-body draggable @close="formCancel">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-row :gutter="30">
           <el-col :span="24">
@@ -128,55 +60,21 @@
           <el-col :span="24">
             <el-form-item label="凭证附件:">
               <div class="details-btns-container" style="display: flex">
-                <el-upload
-                  action="#"
-                  :http-request="upload"
-                  :with-credentials="true"
-                  :show-file-list="false"
-                  multiple
-                >
-                  <el-button size="small" type="primary" icon="Upload"
-                    >点击上传</el-button
-                  >
+                <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
+                  <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
                 </el-upload>
               </div>
-              <el-table
-                ref="filesTable"
-                :data="form.files"
-                size="small"
-                height="200px"
-                border
-                header-row-class-name="list-header-row"
-              >
+              <el-table ref="filesTable" :data="form.files" size="small" height="200px" border
+                header-row-class-name="list-header-row">
                 <el-table-column label="操作" width="47" align="center">
                   <template #default="scope">
-                    <el-button
-                      icon="Minus"
-                      size="small"
-                      circle
-                      type="danger"
-                      @click="handleDelFile(scope.$index)"
-                    />
+                    <el-button icon="Minus" size="small" circle type="danger" @click="handleDelFile(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column
-                  type="index"
-                  label="序号"
-                  width="47"
-                  align="center"
-                />
-                <el-table-column
-                  label="文件名"
-                  prop="originalFileName"
-                  align="center"
-                >
+                <el-table-column type="index" label="序号" width="47" align="center" />
+                <el-table-column label="文件名" prop="originalFileName" align="center">
                   <template #default="scope">
-                    <el-link
-                      :href="`${baseUrl}${scope.row.fileUrl}`"
-                      :underline="false"
-                      target="_blank"
-                      type="primary"
-                    >
+                    <el-link :href="`${baseUrl}${scope.row.fileUrl}`" :underline="false" target="_blank" type="primary">
                       {{ scope.row.originalFileName }}
                     </el-link>
                   </template>
@@ -194,19 +92,9 @@
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-image-viewer
-      v-if="showViewer"
-      :url-list="currentFileList"
-      @close="closeImages"
-      :initial-index="showIndex"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
     <form-dialog ref="formDialogRef" :getList="getList" />
     <view-dialog ref="viewDialogRef" :getList="getList" />
   </div>
@@ -270,7 +158,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().format("YYYY"),
   month: proxy.moment().format("MM"),
@@ -309,7 +197,7 @@ function handleQuery() {
 function resetQuery() {
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("YYYY"),
     month: proxy.moment().format("MM"),
   };
@@ -356,7 +244,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -421,7 +309,7 @@ function openFollowFile(arg) {
   window.open(`${arg.url}`, arg.fileName);
 }
 
-function showFileList(row) {
+funcpageSize: 20eList(row) {
   currentFileList.value = row.files.map((l) => `${baseUrl.value}${l.fileUrl}`);
   showViewer.value = true;
 }

+ 1 - 1
src/views/business/production/deduction/index.vue

@@ -167,7 +167,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   noContract: 1,
 });

+ 66 - 247
src/views/business/production/financialReportTax/index.vue

@@ -3,192 +3,93 @@
     <!-- 功能按钮区 -->
     <div class="list-btns-container"></div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="77px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="77px">
       <el-form-item label="客户名称:">
-        <el-input
-          v-model="queryParams.companyName"
-          type="text"
-          placeholder="请输入客户名称"
-          :clearable="true"
-          style="width: 220px"
-        />
+        <el-input v-model="queryParams.companyName" type="text" placeholder="请输入客户名称" :clearable="true"
+          style="width: 220px" />
       </el-form-item>
       <el-form-item label="报税所属期:" prop="year">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          style="width: 120px"
-          value-format="YYYY-MM-01"
-          :disabled-date="disabledDateHandler"
-          @change="monthChangeHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" style="width: 120px"
+          value-format="YYYY-MM-01" :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
       </el-form-item>
       <el-form-item label="报税状态:">
-        <el-select
-          v-model="queryParams.status"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" style="width: 130px">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="taxList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="taxList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        min-width="100"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="180"
-      />
-      <el-table-column
-        label="纳税性质"
-        align="center"
-        width="100"
-        prop="taxType"
-      />
-      <el-table-column
-        label="是否零申报"
-        align="center"
-        min-width="80"
-        prop="isZero"
-      >
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
+      <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
+      <el-table-column label="是否零申报" align="center" min-width="80" prop="isZero">
         <template #default="scope">
           {{
             scope.row.isZero === 1 ? "是" : scope.row.isZero === 0 ? "否" : ""
           }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="报税填写"
-        align="center"
-        width="80"
-        prop="evidenceFile"
-      >
+      <el-table-column label="报税填写" align="center" width="80" prop="evidenceFile">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="fillIn(scope.row)"
-            v-hasPermi="['business:financialReportTaxNonZero:saveDetail']"
-            >{{
+          <el-button link type="primary" size="small" @click="fillIn(scope.row)"
+            v-hasPermi="['business:financialReportTaxNonZero:saveDetail']">{{
               scope.row.detail == null
-                ? "填写"
-                : scope.row.detail.status === 1
+              ? "填写"
+              : scope.row.detail.status === 1
                 ? "进行中"
                 : "已填写"
-            }}</el-button
-          >
+            }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="报税附件"
-        align="center"
-        width="80"
-        prop="content"
-      >
+      <el-table-column label="报税附件" align="center" width="80" prop="content">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.evidenceFile === ''
-            "
-            size="small"
-            @click="showFiles(scope.row)"
-            v-hasPermi="['business:financialReportTaxNonZero:query']"
-            >查看文件</el-button
-          >
+          <el-button link type="primary" :disabled="scope.row.detail == null || scope.row.detail.evidenceFile === ''
+            " size="small" @click="showFiles(scope.row)"
+            v-hasPermi="['business:financialReportTaxNonZero:query']">查看文件</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="状态"
-        align="center"
-        min-width="80"
-        prop="verifyContent"
-      >
+      <el-table-column label="状态" align="center" min-width="80" prop="verifyContent">
         <template #default="scope">
           <div :style="getStatusStyle(scope.row)">
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -198,152 +99,69 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        min-width="100"
-        prop="serviceName"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        width="80"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="执行人" align="center" min-width="100" prop="serviceName" />
+      <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            size="small"
-            link
-            type="primary"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.status !== 3
-            "
-            @click="turnBack(scope.row.detail)"
-            v-hasPermi="['business:financialReportTaxNonZero:back']"
-            >退回</el-button
-          >
+          <el-button size="small" link type="primary" :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+            " @click="turnBack(scope.row.detail)"
+            v-hasPermi="['business:financialReportTaxNonZero:back']">退回</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" />
 
     <!-- 表单 -->
     <FormDialog ref="formDialog" :get-list="getList"></FormDialog>
 
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      size="small"
-      draggable
-    >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
       <el-form ref="dictRef" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="报税所属期:" prop="year">
-              <el-date-picker
-                size="small"
-                v-model="currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                value-format="YYYY-MM-01"
-                :disabled-date="disabledDateHandler"
-                @change="monthChangeHandler"
-              />
+              <el-date-picker size="small" v-model="currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM-01"
+                :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="报税状态:">
-              <el-select
-                size="small"
-                v-model="queryParams.status"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.status" type="text" placeholder="状态" :clearable="true">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="关键字:">
-              <el-input
-                size="small"
-                v-model="queryParams.companyName"
-                type="text"
-                placeholder="请输入客户名称"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.companyName" type="text" placeholder="请输入客户名称"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="来源:">
-              <el-input
-                v-model="queryParams.fromCompanyName"
-                size="small"
-                type="text"
-                placeholder="请输入客户来源"
-                :clearable="true"
-              />
+              <el-input v-model="queryParams.fromCompanyName" size="small" type="text" placeholder="请输入客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="税号:">
-              <el-input
-                size="small"
-                v-model="queryParams.socialCreditCode"
-                type="text"
-                placeholder="请输入税号"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.socialCreditCode" type="text" placeholder="请输入税号"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -379,7 +197,7 @@ const currentMonth = ref(
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   tenantId: null,
   currentEmployeeId: null,
   employeeIds: null,
@@ -427,7 +245,7 @@ function resetQuery() {
   proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     tenantId: null,
     currentEmployeeId: null,
     employeeIds: null,
@@ -547,3 +365,4 @@ function monthChangeHandler(arg) {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20

+ 59 - 216
src/views/business/production/financialReportTaxIsZero/index.vue

@@ -3,48 +3,19 @@
     <!-- 功能按钮区 -->
     <div class="list-btns-container"></div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:">
-        <el-input
-          v-model="queryParams.companyName"
-          type="text"
-          placeholder="请输入客户名称"
-          :clearable="true"
-          style="width: 220px"
-        />
+        <el-input v-model="queryParams.companyName" type="text" placeholder="请输入客户名称" :clearable="true"
+          style="width: 220px" />
       </el-form-item>
       <el-form-item label="报税所属期:" prop="year">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          value-format="YYYY-MM-01"
-          :disabled-date="disabledDateHandler"
-          style="width: 120px"
-          @change="monthChangeHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM-01"
+          :disabled-date="disabledDateHandler" style="width: 120px" @change="monthChangeHandler" />
       </el-form-item>
       <el-form-item label="报税状态:">
-        <el-select
-          v-model="queryParams.status"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" style="width: 130px">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -52,48 +23,20 @@
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="taxList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="taxList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        width="180"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        width="180"
-      />
-      <el-table-column
-        label="纳税性质"
-        align="center"
-        width="100"
-        prop="taxType"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" width="180" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" width="180" />
+      <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
       <el-table-column label="是否零申报" align="center" prop="isZero">
         <template #default="scope">
           {{
@@ -103,35 +46,21 @@
       </el-table-column>
       <el-table-column label="报税填写" align="center" prop="evidenceFile">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            v-hasPermi="['business:financialReportTax:saveDetail']"
-            @click="fillIn(scope.row)"
-            >{{
+          <el-button link type="primary" size="small" v-hasPermi="['business:financialReportTax:saveDetail']"
+            @click="fillIn(scope.row)">{{
               scope.row.detail == null
-                ? "填写"
-                : scope.row.detail.status === 1
+              ? "填写"
+              : scope.row.detail.status === 1
                 ? "进行中"
                 : "已填写"
-            }}</el-button
-          >
+            }}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="报税附件" align="center" prop="content">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.evidenceFile === ''
-            "
-            size="small"
-            v-hasPermi="['business:financialReportTax:query']"
-            @click="showFiles(scope.row)"
-            >查看文件</el-button
-          >
+          <el-button link type="primary" :disabled="scope.row.detail == null || scope.row.detail.evidenceFile === ''
+            " size="small" v-hasPermi="['business:financialReportTax:query']"
+            @click="showFiles(scope.row)">查看文件</el-button>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="verifyContent">
@@ -140,36 +69,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -179,145 +100,67 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" />
-      <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
-            size="small"
-            link
-            type="primary"
-            :disabled="
-              scope.row.detail == null || scope.row.detail.status !== 3
-            "
-            v-hasPermi="['business:financialReportTax:back']"
-            @click="turnBack(scope.row.detail)"
-            >退回</el-button
-          >
+          <el-button size="small" link type="primary" :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+            " v-hasPermi="['business:financialReportTax:back']" @click="turnBack(scope.row.detail)">退回</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" />
 
     <!-- 表单 -->
     <FormDialog ref="formDialog" :get-list="getList"></FormDialog>
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      size="small"
-      draggable
-    >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
       <el-form ref="dictRef" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="报税所属期:" prop="year">
-              <el-date-picker
-                size="small"
-                v-model="currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                value-format="YYYY-MM-01"
-                :disabled-date="disabledDateHandler"
-                @change="monthChangeHandler"
-              />
+              <el-date-picker size="small" v-model="currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM-01"
+                :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="报税状态:">
-              <el-select
-                size="small"
-                v-model="queryParams.status"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.status" type="text" placeholder="状态" :clearable="true">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="关键字:">
-              <el-input
-                size="small"
-                v-model="queryParams.companyName"
-                type="text"
-                placeholder="请输入客户名称"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.companyName" type="text" placeholder="请输入客户名称"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="来源:">
-              <el-input
-                v-model="queryParams.fromCompanyName"
-                size="small"
-                type="text"
-                placeholder="请输入客户来源"
-                :clearable="true"
-              />
+              <el-input v-model="queryParams.fromCompanyName" size="small" type="text" placeholder="请输入客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="税号:">
-              <el-input
-                size="small"
-                v-model="queryParams.socialCreditCode"
-                type="text"
-                placeholder="请输入税号"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.socialCreditCode" type="text" placeholder="请输入税号"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -356,7 +199,7 @@ const currentMonth = ref(
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   tenantId: null,
   currentEmployeeId: null,
   employeeIds: null,
@@ -404,7 +247,7 @@ function resetQuery() {
   proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     tenantId: null,
     currentEmployeeId: null,
     employeeIds: null,

+ 72 - 243
src/views/business/production/keepAccount/index.vue

@@ -8,69 +8,29 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          :clearable="true"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -78,48 +38,20 @@
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        min-width="100"
-      />
-      <el-table-column
-        label="纳税性质"
-        min-width="100"
-        align="center"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="200"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
+      <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="当前期间" width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -129,198 +61,94 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="openDetail(scope.row, item)"
-              style="width: 12px; height: 12px"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="serviceName"
-        width="100"
-      >
+      <el-table-column label="执行人" align="center" prop="serviceName" width="100">
       </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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        size="small"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="月份:">
-              <el-select
-                v-model.trim="queryParams.month"
-                size="small"
-                placeholder="月份"
-                :clearable="true"
-                @change="handleQuery"
-              >
-                <el-option
-                  v-for="item in selectMonths"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true"
+                @change="handleQuery">
+                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -451,7 +279,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().subtract(1, "month").format("yyyy"),
   month: proxy.moment().subtract(1, "month").format("MM"),
@@ -496,7 +324,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().subtract(1, "month").format("MM"),
     companyName: "",
@@ -623,20 +451,20 @@ function nextYear() {
 function monthStatusStyle(row, month) {
   const index = row.details.findIndex((v) => v.month === month);
   if (index >= 0) {
-    return {
-      backgroundColor: getStatusColor(row.details[index].status),
+    pageSize: 20
+    backgroundColor: getStatusColor(row.details[index].status),
       verticalAlign: "middle",
-      width: "14px",
-      height: "14px",
+        width: "14px",
+          height: "14px",
     };
-  } else {
-    return {
-      backgroundColor: getStatusColor(0),
-      verticalAlign: "middle",
-      width: "14px",
-      height: "14px",
-    };
-  }
+} else {
+  return {
+    backgroundColor: getStatusColor(0),
+    verticalAlign: "middle",
+    width: "14px",
+    height: "14px",
+  };
+}
 }
 
 function getStatusColor(status) {
@@ -650,3 +478,4 @@ function clearStatus() {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 41 - 101
src/views/business/production/onceWork/index.vue

@@ -8,87 +8,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:entrust:workOrder:current:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport"
+              v-hasPermi="['business:entrust:workOrder:current:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column
-        label="客户名称"
-        align="center"
-        min-width="250"
-        prop="companyName"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="150"
-      />
+      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="150" />
       <el-table-column label="工单类型" align="center" prop="amount" width="80">
         <template #default="scope">
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="项目"
-        align="center"
-        prop="taskTypeName"
-        width="200"
-      >
+      <el-table-column label="项目" align="center" prop="taskTypeName" width="200">
         <template #default="scope">
           {{ scope.row.noContract === 1 ? scope.row.remark : "" }}
           {{ scope.row.taskTypeName }}
           {{
             scope.row.taskTypeDetailName
-              ? `-${scope.row.taskTypeDetailName}`
-              : ""
+            ? `-${scope.row.taskTypeDetailName}`
+            : ""
           }}
         </template>
       </el-table-column>
@@ -96,8 +58,8 @@
         <template #default="scope">
           {{
             scope.row.entrust != null
-              ? scope.row.entrust.toAccountName
-              : scope.row.serviceName
+            ? scope.row.entrust.toAccountName
+            : scope.row.serviceName
           }}
         </template>
       </el-table-column>
@@ -107,36 +69,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -146,9 +100,7 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
@@ -156,27 +108,15 @@
       </el-table-column>
       <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
-          <el-button
-            v-show="scope.row.record == null || scope.row.record.status !== 3"
-            size="small"
-            type="primary"
-            link
-            v-hasPermi="['business:production:onceWork:finished']"
-            @click="finishedHandle(scope.row)"
-            >完成</el-button
-          >
+          <el-button v-show="scope.row.record == null || scope.row.record.status !== 3" size="small" type="primary" link
+            v-hasPermi="['business:production:onceWork:finished']" @click="finishedHandle(scope.row)">完成</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- <contract-form ref="contractRef" :get-list="getList" /> -->
     <!-- 分页 -->
-    <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" />
   </div>
 </template>
 
@@ -226,7 +166,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   companyName: "",
   type: 2,
@@ -313,11 +253,11 @@ function finishedHandle(row) {
         row.record != null
           ? row.record
           : {
-              companyId: row.companyId,
-              workOrderId: row.id,
-              tenantId: row.tenantId,
-              status: 3,
-            };
+            companyId: row.companyId,
+            workOrderId: row.id,
+            tenantId: row.tenantId,
+            status: 3,
+          };
       saveDetail(finishedValue).then((res) => getList());
     })
     .catch((_) => {

+ 22 - 97
src/views/business/production/productionCompany/index.vue

@@ -3,83 +3,33 @@
     <!-- 功能按钮区 -->
     <div class="list-btns-container"></div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-    >
-      <el-form
-        class="list-search-container"
-        size="small"
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-      >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true">
+      <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item label="客户名称:" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入客户名称"
-            style="width: 150px"
-            clearable
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.name" placeholder="请输入客户名称" style="width: 150px" clearable
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="税号:" prop="socialCreditCode">
-          <el-input
-            v-model="queryParams.socialCreditCode"
-            style="width: 150px"
-            placeholder="请输入税号"
-            clearable
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.socialCreditCode" style="width: 150px" placeholder="请输入税号" clearable
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="客户负责人:" prop="leaderName">
-          <el-input
-            v-model="queryParams.leaderName"
-            placeholder="请输入客户负责人"
-            style="width: 150px"
-            clearable
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.leaderName" placeholder="请输入客户负责人" style="width: 150px" clearable
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="Search" @click="handleQuery"
-            >搜索</el-button
-          >
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="companyList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        label="客户名称"
-        min-width="230"
-        align="center"
-        prop="name"
-      />
-      <el-table-column
-        label="税号"
-        min-width="200"
-        align="center"
-        prop="socialCreditCode"
-      />
-      <el-table-column
-        label="注册省-市-区"
-        min-width="200"
-        align="center"
-        prop="province"
-      >
+    <el-table v-loading="loading" :data="companyList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column label="客户名称" min-width="230" align="center" prop="name" />
+      <el-table-column label="税号" min-width="200" align="center" prop="socialCreditCode" />
+      <el-table-column label="注册省-市-区" min-width="200" align="center" prop="province">
         <template #default="scope">
           <span>{{
             scope.row.province + "-" + scope.row.city + "-" + scope.row.district
@@ -87,46 +37,21 @@
         </template>
       </el-table-column>
       <el-table-column label="年收入" align="center" prop="annualIncome" />
-      <el-table-column
-        label="纳税类型"
-        align="center"
-        min-width="120"
-        prop="taxType"
-      />
-      <el-table-column
-        label="是否零申报"
-        width="80"
-        align="center"
-        prop="isZero"
-      >
+      <el-table-column label="纳税类型" align="center" min-width="120" prop="taxType" />
+      <el-table-column label="是否零申报" width="80" align="center" prop="isZero">
         <template #default="scope">
           <span>{{
             scope.row.isZero === 1 ? "是" : scope.row.isZero === 0 ? "否" : ""
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="客服"
-        align="center"
-        min-width="110"
-        prop="adviserName"
-      />
-      <el-table-column
-        label="负责人"
-        align="center"
-        min-width="110"
-        prop="leaderName"
-      />
+      <el-table-column label="客服" align="center" min-width="110" prop="adviserName" />
+      <el-table-column label="负责人" align="center" min-width="110" prop="leaderName" />
     </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" />
 
     <!-- 表单 -->
   </div>
@@ -150,7 +75,7 @@ const total = ref(0);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   category: null,
   code: null,
@@ -267,7 +192,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 80 - 341
src/views/business/production/receiveTicket/index.vue

@@ -8,117 +8,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="77px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="77px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          :clearable="true"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        min-width="90"
-      />
-      <el-table-column
-        label="纳税性质"
-        min-width="90"
-        align="center"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="150"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="90" />
+      <el-table-column label="纳税性质" min-width="90" align="center" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="150" />
       <el-table-column label="当前期间" width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -128,321 +60,135 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          min-width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="openDetail(scope.row, item)"
-              style="width: 12px; height: 12px"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="serviceName"
-        min-width="100"
-      >
+      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        size="small"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                size="small"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="月份:">
-              <el-select
-                v-model.trim="queryParams.month"
-                size="small"
-                placeholder="月份"
-              >
-                <el-option
-                  v-for="item in selectMonths"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份">
+                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="收票状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="收入票:">
-              <el-select
-                size="small"
-                v-model="queryParams.hasIncomeTicket"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.hasIncomeTicket" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="费用票:">
-              <el-select
-                size="small"
-                v-model="queryParams.feeTicket"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.feeTicket" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="银行回单:">
-              <el-select
-                size="small"
-                v-model="queryParams.bankSlips"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.bankSlips" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="社保公积金:">
-              <el-select
-                size="small"
-                v-model="queryParams.hasSsafTicket"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.hasSsafTicket" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="有票据:">
-              <el-select
-                size="small"
-                v-model="queryParams.sumNumber"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.sumNumber" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="来源:">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="纳税性质:">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="送达方式:">
-              <el-select
-                size="small"
-                v-model="queryParams.saveStatus"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in delivery"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.saveStatus" placeholder="请选择纳税性质" :clearable="true">
+                <el-option v-for="item in delivery" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="成本票:">
-              <el-select
-                size="small"
-                v-model="queryParams.hasCostTicket"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.hasCostTicket" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="票工表:">
-              <el-select
-                size="small"
-                v-model="queryParams.payroll"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.payroll" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="银行对账单:">
-              <el-select
-                size="small"
-                v-model="queryParams.bankCopy"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.bankCopy" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="其它票:">
-              <el-select
-                size="small"
-                v-model="queryParams.others"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in haveOrNot"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.others" :clearable="true">
+                <el-option v-for="item in haveOrNot" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -450,16 +196,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -604,7 +342,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().subtract(1, "month").format("yyyy"),
   month: proxy.moment().subtract(1, "month").format("MM"),
@@ -649,7 +387,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().subtract(1, "month").format("MM"),
     companyName: "",
@@ -803,3 +541,4 @@ function clearStatus() {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 42 - 186
src/views/business/production/receiveTicketFeedback/index.vue

@@ -8,13 +8,8 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:deposit:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
+              导出</el-dropdown-item>
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
@@ -25,55 +20,32 @@
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item>
-        <el-radio-group
-          v-model="queryRadio"
-          size="small"
-          @change="radioChangeHandler"
-        >
+        <el-radio-group v-model="queryRadio" size="small" @change="radioChangeHandler">
           <el-radio-button label="全部" />
           <el-radio-button label="流转反馈" />
           <el-radio-button label="驳回反馈" />
         </el-radio-group>
       </el-form-item>
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column
         align="center"
@@ -81,90 +53,33 @@
         label="序号"
         width="50"
       ></el-table-column> -->
-      <el-table-column
-        label="客户名称"
-        prop="companyName"
-        min-width="250"
-        align="center"
-      />
-      <el-table-column
-        label="来源"
-        min-width="90"
-        align="center"
-        prop="fromCompanyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        prop="taxType"
-        align="center"
-        min-width="90"
-      />
-      <el-table-column
-        label="收票月份"
-        prop="provinceCode"
-        min-width="80"
-        align="center"
-      >
+      <el-table-column label="客户名称" prop="companyName" min-width="250" align="center" />
+      <el-table-column label="来源" min-width="90" align="center" prop="fromCompanyName" />
+      <el-table-column label="纳税性质" prop="taxType" align="center" min-width="90" />
+      <el-table-column label="收票月份" prop="provinceCode" min-width="80" align="center">
         <template #default="scope">
           <span>{{ scope.row.year + "-" + scope.row.month }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="反馈信息"
-        prop="remark"
-        min-width="150"
-        align="center"
-      />
-      <el-table-column
-        label="回复信息"
-        prop="feedbackContent"
-        min-width="150"
-        align="center"
-      />
-      <el-table-column
-        label="回复时间"
-        prop="feedbackTime"
-        min-width="80"
-        align="center"
-      />
+      <el-table-column label="反馈信息" prop="remark" min-width="150" align="center" />
+      <el-table-column label="回复信息" prop="feedbackContent" min-width="150" align="center" />
+      <el-table-column label="回复时间" prop="feedbackTime" min-width="80" align="center" />
       <el-table-column label="操作" fixed="right" width="80" align="center">
         <template #default="scope">
-          <el-button
-            v-show="scope.row.status === 1"
-            link
-            type="warning"
-            size="small"
-            v-hasPermi="['business:archiveReceiveTicket:edit']"
-            @click="handleInfo(scope.row)"
-            >回复</el-button
-          >
+          <el-button v-show="scope.row.status === 1" link type="warning" size="small"
+            v-hasPermi="['business:archiveReceiveTicket:edit']" @click="handleInfo(scope.row)">回复</el-button>
           <span v-if="scope.row.status !== 1">--</span>
         </template>
       </el-table-column>
     </el-table>
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
-    <el-dialog
-      title="反馈回复"
-      width="500px"
-      v-model="formOpen"
-      append-to-body
-      draggable
-      @close="formCancel"
-    >
+    <el-dialog title="反馈回复" width="500px" v-model="formOpen" append-to-body draggable @close="formCancel">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="回复信息:">
-              <el-input
-                v-if="form.status === 1"
-                v-model.trim="form.feedbackContent"
-                size="small"
-                type="textarea"
-                maxlength="200"
-                show-word-limit
-                placeholder="请输入回复信息"
-                :clearable="true"
-              />
+              <el-input v-if="form.status === 1" v-model.trim="form.feedbackContent" size="small" type="textarea"
+                maxlength="200" show-word-limit placeholder="请输入回复信息" :clearable="true" />
               <div v-else>{{ form.feedbackContent }}</div>
             </el-form-item>
           </el-col>
@@ -172,102 +87,43 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="saveHandler"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="formCancel"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="saveHandler">确 定</el-button>
+          <el-button icon="close" size="small" @click="formCancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-image-viewer
-      v-if="showViewer"
-      :url-list="currentFileList"
-      @close="closeImages"
-      :initial-index="showIndex"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      size="small"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" size="small" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="反馈月份:" prop="feedbackMonth">
-              <el-date-picker
-                v-model="feedbackMonth"
-                size="small"
-                :clearable="true"
-                value-format="YYYY-MM"
-                format="YYYY-MM"
-                type="month"
-              />
+              <el-date-picker v-model="feedbackMonth" size="small" :clearable="true" value-format="YYYY-MM"
+                format="YYYY-MM" type="month" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -335,7 +191,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   fromCompanyName: "",
   orderByColumn: "create_time",
   companyName: "",
@@ -380,7 +236,7 @@ function handleQuery() {
 function resetQuery() {
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     orderByColumn: "create_time",
     companyName: "",
     noContract: 1,
@@ -423,7 +279,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -523,7 +379,7 @@ function radioChangeHandler(arg) {
   handleQuery();
 }
 
-function edit(row) {}
+function edit(row) { }
 
 getList();
 </script>

+ 73 - 253
src/views/business/production/salary/index.vue

@@ -8,116 +8,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="77px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="77px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
         <el-form-item label="是否自己负责:">
           <el-switch v-model="oneself" @change="handleOneself" />
         </el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        min-width="80"
-        prop="fromCompanyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        min-width="100"
-        align="center"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="200"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" min-width="80" prop="fromCompanyName" />
+      <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="当前期间" min-width="90" align="center">
         <template #default="scope">
           <!-- {{
@@ -131,197 +64,91 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          min-width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="openDetail(scope.row, item)"
-              style="width: 12px; height: 12px"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="serviceName"
-        min-width="100"
-      >
+      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        size="small"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                size="small"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="月份:">
-              <el-select
-                v-model.trim="queryParams.month"
-                size="small"
-                placeholder="月份"
-                @change="handleQuery"
-              >
-                <el-option
-                  v-for="item in selectMonths"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" @change="handleQuery">
+                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="来源:">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="纳税性质:">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否有个税:">
-              <el-select
-                v-model.trim="queryParams.hasIndividualIncomeTax"
-                placeholder="请选择"
-                size="small"
-                style="width: 100%"
-                @change="changeIndividual"
-              >
-                <el-option
-                  v-for="item in confirmChoices"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.hasIndividualIncomeTax" placeholder="请选择" size="small"
+                style="width: 100%" @change="changeIndividual">
+                <el-option v-for="item in confirmChoices" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -329,16 +156,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -481,7 +300,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().subtract(1, "month").format("yyyy"),
   month: proxy.moment().subtract(1, "month").format("MM"),
@@ -527,7 +346,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().subtract(1, "month").format("MM"),
     companyName: "",
@@ -662,18 +481,19 @@ function monthStatusStyle(row, month) {
       verticalAlign: "middle",
       width: "14px",
       height: "14px",
-    };
+      pageSize: 20
+    }
   }
-}
 
-function getStatusColor(status) {
-  const index = selectStatus.value.findIndex((v) => v.value === status);
-  return index >= 0 ? selectStatus.value[index].color : "#fff";
-}
+  function getStatusColor(status) {
+    const index = selectStatus.value.findIndex((v) => v.value === status);
+    return index >= 0 ? selectStatus.value[index].color : "#fff";
+  }
 
-function clearStatus() {
-  queryParams.value.status = null;
-}
+  function clearStatus() {
+    queryParams.value.status = null;
+  }
 
-getList();
+  getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 60 - 230
src/views/business/production/salaryZero/index.vue

@@ -8,116 +8,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          clearable
-          style="width: 150px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable style="width: 150px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        min-width="100"
-      />
-      <el-table-column
-        label="纳税性质"
-        align="center"
-        min-width="130"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="200"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
+      <el-table-column label="纳税性质" align="center" min-width="130" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="当前期间" min-width="90" align="center">
         <template>
           {{ moment().subtract(1, "month").format("YYYY年MM月") }}
@@ -125,181 +58,85 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          min-width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="openDetail(scope.row, item)"
-              style="width: 12px; height: 12px"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="serviceName"
-        min-width="100"
-      >
+      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        size="small"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                size="small"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="月份:">
-              <el-select
-                v-model.trim="queryParams.month"
-                size="small"
-                placeholder="月份"
-                @change="handleQuery"
-              >
-                <el-option
-                  v-for="item in selectMonths"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" @change="handleQuery">
+                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="来源:">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
             <el-form-item label="纳税性质:">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -307,16 +144,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -447,7 +276,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().subtract(1, "month").format("yyyy"),
   month: proxy.moment().subtract(1, "month").format("MM"),
@@ -493,7 +322,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().subtract(1, "month").format("MM"),
     companyName: "",
@@ -643,3 +472,4 @@ function clearStatus() {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20pageSize: 20

+ 2 - 2
src/views/business/production/urgent/index.vue

@@ -149,7 +149,7 @@ const data = reactive({
   // 查询请求携带的参数
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
   },
   visible: false,
   custom: {},
@@ -216,7 +216,7 @@ function formCancel() {
 function radioChangeHandler(arg) {
   const query = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     companyName: ''
   }
   switch (arg) {

+ 2 - 3
src/views/business/project/index.vue

@@ -81,7 +81,7 @@ const total = ref(0)
 /** 查询 对象 */
 const queryParams = ref({
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     name: null,
     standard: null,
     num: null,
@@ -152,5 +152,4 @@ function handleExport() {
 getList()
 
 </script>
-<style scope>
-</style>
+<style scope></style>

+ 61 - 186
src/views/business/service/loop/index.vue

@@ -10,119 +10,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:customer:service:loop:export']"
-            >
-              导出</el-dropdown-item
-            >
-            <el-dropdown-item
-              icon="Operation"
-              @click="setServiceHandler"
-              v-hasPermi="['business:customer:service:loop:transactor']"
-            >
-              设置执行人</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport"
+              v-hasPermi="['business:customer:service:loop:export']">
+              导出</el-dropdown-item>
+            <el-dropdown-item icon="Operation" @click="setServiceHandler"
+              v-hasPermi="['business:customer:service:loop:transactor']">
+              设置执行人</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          style="width: 150px"
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input style="width: 150px" v-model="queryParams.companyName" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:" prop="month">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          :clearable="true"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:" prop="status">
-        <el-select
-          v-model.trim="queryParams.status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" size="small" type="text" placeholder="状态" :clearable="true"
+          style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="serviceList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="serviceList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        min-width="250"
-        prop="companyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        min-width="100"
-        align="center"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="180"
-      />
-      <el-table-column
-        label="项目"
-        align="center"
-        prop="taskTypeName"
-        min-width="90"
-      >
+      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" />
+      <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
+      <el-table-column label="项目" align="center" prop="taskTypeName" min-width="90">
         <template #default="scope">
           {{ scope.row.taskTypeName }}
         </template>
@@ -134,82 +64,51 @@
 
           {{
             scope.row.taskTypeId === "1"
-              ? moment().subtract(1, "month").format("YYYY年MM月")
-              : moment().format("YYYY年MM月")
+            ? moment().subtract(1, "month").format("YYYY年MM月")
+            : moment().format("YYYY年MM月")
           }}
         </template>
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          min-width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="handleByRow(scope.row, item.value)"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="handleByRow(scope.row, item.value)" />
           </template>
         </el-table-column>
       </el-table-column>
@@ -220,33 +119,20 @@
     <!-- </div>
     </div> -->
     <!-- <workorder-form ref="workOrderRef" :get-list="getList" /> -->
-    <el-dialog
-      title="新增工单"
-      v-model="formOpen"
-      width="500px"
-      append-to-body
-      draggable
-    >
+    <el-dialog title="新增工单" v-model="formOpen" width="500px" append-to-body draggable>
       <el-form ref="dictRef" :model="form" label-width="100">
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="客户名称" prop="companyName">
-              <el-autocomplete
-                :fetch-suggestions="querySearchCompanyAsync"
-                :trigger-on-focus="true"
-                v-model="form.companyName"
-                placeholder="请输入客户名称"
-                popper-class="my-autocomplete"
-                @select="handleSelectCompany"
-              >
+              <el-autocomplete :fetch-suggestions="querySearchCompanyAsync" :trigger-on-focus="true"
+                v-model="form.companyName" placeholder="请输入客户名称" popper-class="my-autocomplete"
+                @select="handleSelectCompany">
                 <template #default="{ item }">
-                  <div
-                    style="
+                  <div style="
                       display: flex;
                       flex-direction: row;
                       justify-content: space-between;
-                    "
-                  >
+                    ">
                     <div class="name" style="font-size: 12px">
                       {{ item.name }}
                     </div>
@@ -258,14 +144,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注:">
-              <el-input
-                v-model.trim="form.remark"
-                type="textarea"
-                width="100%"
-                size="small"
-                placeholder="备注"
-                :clearable="true"
-              />
+              <el-input v-model.trim="form.remark" type="textarea" width="100%" size="small" placeholder="备注"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -278,13 +158,8 @@
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <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" />
     <service-form ref="serviceRef" :get-list="getList" />
     <housing-fund-form ref="housingFundFormRef" :get-list="getList" />
     <housing-fund-view ref="housingFundViewRef" :get-list="getList" />
@@ -423,7 +298,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().format("YYYY"),
   companyName: "",
@@ -505,11 +380,11 @@ function querySearchCompanyAsync(queryString, cb) {
   const query =
     queryString.length > 0
       ? {
-          keyword: queryString,
-          pageSize: 20,
-          pageNum: 1,
-          orderByColumn: "create_time",
-        }
+        keyword: queryString,
+        pageSize: 20,
+        pageNum: 1,
+        orderByColumn: "create_time",
+      }
       : { pageSize: 20, pageNum: 1, orderByColumn: "create_time" };
   listCompany(query).then((res) => {
     cb(res.rows);
@@ -548,7 +423,7 @@ function monthStatusStyle(row, month) {
     return {
       backgroundColor: getStatusColor(0),
       verticalAlign: "middle",
-      width: "14px",
+      pageSize: 20: 2014px",
       height: "14px",
     };
   }

+ 160 - 237
src/views/business/service/once/index.vue

@@ -13,107 +13,52 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:customer:service:once:export']"
-            >
-              导出</el-dropdown-item
-            >
-            <el-dropdown-item
-              icon="Operation"
-              @click="setServiceHandler"
-              v-hasPermi="['business:customer:service:once:transactor']"
-            >
-              设置执行人</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport"
+              v-hasPermi="['business:customer:service:once:export']">
+              导出</el-dropdown-item>
+            <el-dropdown-item icon="Operation" @click="setServiceHandler"
+              v-hasPermi="['business:customer:service:once:transactor']">
+              设置执行人</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          style="width: 150px"
-          v-model="queryParams.companyName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input style="width: 150px" v-model="queryParams.companyName" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态:" prop="status">
-        <el-select
-          v-model.trim="queryParams.status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" size="small" type="text" placeholder="状态" :clearable="true"
+          style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="180"
-      />
-      <el-table-column
-        label="服务内容"
-        align="center"
-        min-width="480"
-        prop="remark"
-      >
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
+      <el-table-column label="服务内容" align="center" min-width="480" prop="remark">
         <template #default="scope">
           <div>
             {{
               scope.row.noContract === 1
-                ? scope.row.remark
-                : `${scope.row.taskTypeName}${
-                    scope.row.taskTypeDetailName
-                      ? `-${scope.row.taskTypeDetailName}`
-                      : ""
-                  }`
+              ? scope.row.remark
+              : `${scope.row.taskTypeName}${scope.row.taskTypeDetailName
+                ? `-${scope.row.taskTypeDetailName}`
+                : ""
+                }`
             }}
           </div>
         </template>
@@ -124,36 +69,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -163,9 +100,7 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
@@ -173,17 +108,10 @@
       </el-table-column>
       <el-table-column label="操作" align="center" min-width="60">
         <template #default="scope">
-          <el-button
-            size="small"
-            link
-            type="primary"
-            v-hasPermi="[
-              'business:customer:service:once:view',
-              'business:customer:service:once:edit',
-            ]"
-            @click="handleByRow(scope.row)"
-            >查看</el-button
-          >
+          <el-button size="small" link type="primary" v-hasPermi="[
+            'business:customer:service:once:view',
+            'business:customer:service:once:edit',
+          ]" @click="handleByRow(scope.row)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column label="工单执行人" align="center" width="110">
@@ -196,13 +124,8 @@
       </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" />
     <service-form ref="serviceRef" :get-list="getList" />
     <form-dialog ref="formRef" :get-list="getList" />
     <view-dialog ref="viewRef" :get-list="getList" />
@@ -282,7 +205,7 @@ const { contract_status } = proxy.useDict("contract_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   type: 2,
@@ -359,137 +282,137 @@ function handleDelete(row) {
     .then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
-    })
-    .catch(() => {});
-}
+      pageSize: 20
+        .catch(() => { });
+    }
 
 /** 导出按钮操作 */
 function handleExport() {
-  // proxy.download(
-  //   "business/archive/order/export",
-  //   {
-  //     ...queryParams.value,
-  //   },
-  //   `合同导出_${new Date().getTime()}.xlsx`
-  // );
-  exportWorkOrder(queryParams.value);
-}
+        // proxy.download(
+        //   "business/archive/order/export",
+        //   {
+        //     ...queryParams.value,
+        //   },
+        //   `合同导出_${new Date().getTime()}.xlsx`
+        // );
+        exportWorkOrder(queryParams.value);
+      }
 
 function startDateChangeHandler(row, startDate) {
-  if (startDate) {
-    // console.log(startDate)
-    row.endMonth = proxy
-      .moment(startDate)
-      .add(row.monthNum - 1, "M")
-      .format("YYYY-MM-DD");
-  } else row.endMonth = null;
-  console.log(row);
-}
+        if (startDate) {
+          // console.log(startDate)
+          row.endMonth = proxy
+            .moment(startDate)
+            .add(row.monthNum - 1, "M")
+            .format("YYYY-MM-DD");
+        } else row.endMonth = null;
+        console.log(row);
+      }
 
 function saveHandler() {
-  if (form.value.id == null) {
-    addWorkOrder(form.value).then((res) => {
-      formCancel();
-      getList();
-    });
-  }
-}
+        if (form.value.id == null) {
+          addWorkOrder(form.value).then((res) => {
+            formCancel();
+            getList();
+          });
+        }
+      }
 
 function setServiceHandler() {
-  if (ids.value.length === 0) {
-    proxy.$modal.msgError("请先选择需要设置的工单!");
-    return;
-  }
-  proxy.$refs["serviceRef"].open({
-    dialogTitle: "设置执行人",
-    dialogContent: "请输入执行人姓名",
-    values: ids.value,
-  });
-}
+        if (ids.value.length === 0) {
+          proxy.$modal.msgError("请先选择需要设置的工单!");
+          return;
+        }
+        proxy.$refs["serviceRef"].open({
+          dialogTitle: "设置执行人",
+          dialogContent: "请输入执行人姓名",
+          values: ids.value,
+        });
+      }
 
 function getStatusStyle(row) {
-  const record = row.records.find((v) => v.fromId === "0");
-  if (record == null) {
-    return { color: getStatusColor(0), verticalAlign: "middle" };
-  } else {
-    return { color: getStatusColor(record.status), verticalAlign: "middle" };
-  }
-}
+        const record = row.records.find((v) => v.fromId === "0");
+        if (record == null) {
+          return { color: getStatusColor(0), verticalAlign: "middle" };
+        } else {
+          return { color: getStatusColor(record.status), verticalAlign: "middle" };
+        }
+      }
 function getStatusColor(status) {
-  const index = selectStatus.value.findIndex((v) => v.value === status);
-  return index >= 0 ? selectStatus.value[index].color : "#fff";
-}
+        const index = selectStatus.value.findIndex((v) => v.value === status);
+        return index >= 0 ? selectStatus.value[index].color : "#fff";
+      }
 function getStatusLabel(row) {
-  const record = row.records.find((v) => v.fromId === "0");
-  const index = selectStatus.value.findIndex(
-    (v) => v.value === (record == null ? 0 : record.status)
-  );
-  return index >= 0 ? selectStatus.value[index].label : "";
-}
+        const record = row.records.find((v) => v.fromId === "0");
+        const index = selectStatus.value.findIndex(
+          (v) => v.value === (record == null ? 0 : record.status)
+        );
+        return index >= 0 ? selectStatus.value[index].label : "";
+      }
 
 function handleByRow(row) {
-  const record = row.records.find((v) => v.fromId === "0");
-  const editable =
-    permissions.includes(all_permission) ||
-    permissions.includes("business:customer:service:loop:edit") >= 0;
-  const viewable =
-    permissions.includes(all_permission) ||
-    permissions.includes("business:customer:service:loop:view") >= 0;
-
-  if (record == null && row.isStop == 1) {
-    proxy.$modal.msg("工单已终止");
-    return;
-  }
-
-  if (
-    record != null &&
-    record.status === 3 &&
-    (editable || viewable) &&
-    row.isStop == 1
-  ) {
-    viewRef.value.open({
-      workOrderId: row.id,
-      companyId: row.companyId,
-      companyName: row.companyName,
-    });
-  } else if (
-    row.entrusts != null &&
-    row.entrusts.length > 0 &&
-    (editable || viewable)
-  ) {
-    if (row.entrusts.length >= 0) {
-      viewRef.value.open({
-        workOrderId: row.id,
-        companyId: row.companyId,
-        companyName: row.companyName,
-      });
-    } else if (editable) {
-      formRef.value.open({
-        workOrderId: row.id,
-        companyId: row.companyId,
-        companyName: row.companyName,
-      });
-    } else {
-      proxy.$modal.msg("没有编辑权限");
-    }
-  } else if (editable) {
-    formRef.value.open({
-      workOrderId: row.id,
-      companyId: row.companyId,
-      companyName: row.companyName,
-    });
-  } else {
-    proxy.$modal.msg("没有编辑权限");
-  }
-}
+        const record = row.records.find((v) => v.fromId === "0");
+        const editable =
+          permissions.includes(all_permission) ||
+          permissions.includes("business:customer:service:loop:edit") >= 0;
+        const viewable =
+          permissions.includes(all_permission) ||
+          permissions.includes("business:customer:service:loop:view") >= 0;
+
+        if (record == null && row.isStop == 1) {
+          proxy.$modal.msg("工单已终止");
+          return;
+        }
+
+        if (
+          record != null &&
+          record.status === 3 &&
+          (editable || viewable) &&
+          row.isStop == 1
+        ) {
+          viewRef.value.open({
+            workOrderId: row.id,
+            companyId: row.companyId,
+            companyName: row.companyName,
+          });
+        } else if (
+          row.entrusts != null &&
+          row.entrusts.length > 0 &&
+          (editable || viewable)
+        ) {
+          if (row.entrusts.length >= 0) {
+            viewRef.value.open({
+              workOrderId: row.id,
+              companyId: row.companyId,
+              companyName: row.companyName,
+            });
+          } else if (editable) {
+            formRef.value.open({
+              workOrderId: row.id,
+              companyId: row.companyId,
+              companyName: row.companyName,
+            });
+          } else {
+            proxy.$modal.msg("没有编辑权限");
+          }
+        } else if (editable) {
+          formRef.value.open({
+            workOrderId: row.id,
+            companyId: row.companyId,
+            companyName: row.companyName,
+          });
+        } else {
+          proxy.$modal.msg("没有编辑权限");
+        }
+      }
 
 function getTransactor(row) {
-  if (row.entrusts != null && row.entrusts.length > 0) {
-    const names = Array.from(new Set(row.entrusts.map((v) => v.toAccountName)));
-    return names.join(",");
-  } else {
-    return row.serviceName;
-  }
-}
+        if (row.entrusts != null && row.entrusts.length > 0) {
+          const names = Array.from(new Set(row.entrusts.map((v) => v.toAccountName)));
+          return names.join(",");
+        } else {
+          return row.serviceName;
+        }
+      }
 getList();
 </script>

+ 49 - 152
src/views/business/setting/account/index.vue

@@ -2,208 +2,105 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['business:account:add']"
-        >新增</el-button
-      >
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['business:account:remove']"
-        >删除</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['business:account:add']">新增</el-button>
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['business:account:remove']">删除</el-button>
       <el-dropdown>
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:account:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:account:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="账户名称:" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入账户名称"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入账户名称" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="账号:" prop="accountNum">
-        <el-input
-          v-model="queryParams.accountNum"
-          placeholder="请输入账号"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.accountNum" placeholder="请输入账号" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开户行:" prop="accountOpen">
-        <el-input
-          v-model="queryParams.accountOpen"
-          placeholder="请输入开户行"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.accountOpen" placeholder="请输入开户行" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="accountList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="accountList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="账户名称" align="center" prop="name">
         <template #default="scope">
-          <el-input
-            v-if="scope.row.isAdd || scope.row.isEdit"
-            v-model="scope.row.name"
-            size="small"
-            placeholder="请输入内容"
-          ></el-input>
+          <el-input v-if="scope.row.isAdd || scope.row.isEdit" v-model="scope.row.name" size="small"
+            placeholder="请输入内容"></el-input>
           <span v-else>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="账号" align="center" prop="accountNum">
         <template #default="scope">
-          <el-input
-            v-if="scope.row.isAdd || scope.row.isEdit"
-            size="small"
-            v-model="scope.row.accountNum"
-            placeholder="请输入内容"
-          ></el-input>
+          <el-input v-if="scope.row.isAdd || scope.row.isEdit" size="small" v-model="scope.row.accountNum"
+            placeholder="请输入内容"></el-input>
           <span v-else>{{ scope.row.accountNum }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开户行" align="center" prop="accountOpen">
         <template #default="scope">
-          <el-input
-            v-if="scope.row.isAdd || scope.row.isEdit"
-            size="small"
-            v-model="scope.row.accountOpen"
-            placeholder="请输入内容"
-          ></el-input>
+          <el-input v-if="scope.row.isAdd || scope.row.isEdit" size="small" v-model="scope.row.accountOpen"
+            placeholder="请输入内容"></el-input>
           <span v-else>{{ scope.row.accountOpen }}</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">
-          <template
-            v-if="
-              !scope.row.isAdd &&
+          <template v-if="!scope.row.isAdd &&
+            !scope.row.isEdit &&
+            scope.row.referrerDataSource == isReferrerDataSource
+            ">
+            <el-button v-show="!scope.row.isAdd &&
               !scope.row.isEdit &&
               scope.row.referrerDataSource == isReferrerDataSource
-            "
-          >
-            <el-button
-              v-show="
-                !scope.row.isAdd &&
-                !scope.row.isEdit &&
-                scope.row.referrerDataSource == isReferrerDataSource
-              "
-              link
-              type="warning"
-              size="small"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['business:account:edit']"
-              >修改</el-button
-            >
-            <el-button
-              v-show="
-                !scope.row.isAdd &&
-                !scope.row.isEdit &&
-                scope.row.referrerDataSource == isReferrerDataSource
-              "
-              link
-              type="danger"
-              size="small"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['business:account:remove']"
-              >删除</el-button
-            >
+              " link type="warning" size="small" @click="handleUpdate(scope.row)"
+              v-hasPermi="['business:account:edit']">修改</el-button>
+            <el-button v-show="!scope.row.isAdd &&
+              !scope.row.isEdit &&
+              scope.row.referrerDataSource == isReferrerDataSource
+              " link type="danger" size="small" @click="handleDelete(scope.row)"
+              v-hasPermi="['business:account:remove']">删除</el-button>
           </template>
-          <template
-            v-if="
-              scope.row.isAdd ||
+          <template v-if="scope.row.isAdd ||
+            (scope.row.isEdit &&
+              scope.row.referrerDataSource == isReferrerDataSource)
+            ">
+            <el-button v-show="scope.row.isAdd ||
               (scope.row.isEdit &&
                 scope.row.referrerDataSource == isReferrerDataSource)
-            "
-          >
-            <el-button
-              v-show="
-                scope.row.isAdd ||
-                (scope.row.isEdit &&
-                  scope.row.referrerDataSource == isReferrerDataSource)
-              "
-              link
-              type="primary"
-              size="small"
-              v-hasPermi="['business:account:edit', 'business:account:add']"
-              @click="handleSave(scope.row)"
-              >保存</el-button
-            >
-            <el-button
-              v-show="scope.row.isEdit || scope.row.isAdd"
-              link
-              size="small"
-              @click="handCancel(scope.row)"
-              >取消</el-button
-            >
+              " link type="primary" size="small" v-hasPermi="['business:account:edit', 'business:account:add']"
+              @click="handleSave(scope.row)">保存</el-button>
+            <el-button v-show="scope.row.isEdit || scope.row.isAdd" link size="small"
+              @click="handCancel(scope.row)">取消</el-button>
           </template>
         </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" />
 
     <!-- 表单 -->
     <account-form ref="accountRef" :get-list="getList"></account-form>
@@ -231,7 +128,7 @@ const total = ref(0);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   tenantId: null,
   orderByColumn: "create_time",
   name: null,
@@ -344,7 +241,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 71 - 242
src/views/business/socialSecurity/confirm/index.vue

@@ -8,116 +8,49 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:workOrder:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
-        <el-select
-          v-model.trim="queryParams.month"
-          size="small"
-          placeholder="月份"
-          style="width: 130px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in selectMonths"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
+          @change="handleQuery">
+          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        align="center"
-        prop="companyName"
-        min-width="250"
-      />
-      <el-table-column
-        label="来源"
-        align="center"
-        prop="fromCompanyName"
-        width="100"
-      />
-      <el-table-column
-        label="纳税性质"
-        width="100"
-        align="center"
-        prop="taxType"
-      />
-      <el-table-column
-        label="税号"
-        align="center"
-        prop="socialCreditCode"
-        min-width="200"
-      />
+      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
+      <el-table-column label="来源" align="center" prop="fromCompanyName" width="100" />
+      <el-table-column label="纳税性质" width="100" align="center" prop="taxType" />
+      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="当前期间" min-width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -127,198 +60,93 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            "
-          >
+            ">
             <div style="display: flex; flex-direction: row">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                icon="ArrowLeft"
-                @click="prevYear"
-              />
+              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
               }}</el-link>
-              <el-button
-                link
-                type="primary"
-                icon="ArrowRight"
-                size="small"
-                @click="nextYear"
-              />
+              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div
-                v-for="item in selectStatus"
-                :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px"
-              >
-                <div
-                  :style="{
-                    backgroundColor: item.color,
-                    width: '14px',
-                    height: '14px',
-                    margin: 'auto',
-                    borderRadius: '50%',
-                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                  }"
-                />
-                <div
-                  style="
+              <div v-for="item in selectStatus" :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px">
+                <div :style="{
+                  backgroundColor: item.color,
+                  width: '14px',
+                  height: '14px',
+                  margin: 'auto',
+                  borderRadius: '50%',
+                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                }" />
+                <div style="
                     display: inline-block;
                     margin-left: 10px;
                     line-height: 36px;
-                  "
-                >
+                  ">
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column
-          v-for="item in selectMonths"
-          :key="item.value"
-          min-width="50"
-          :label="item.label"
-          align="center"
-        >
+        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
           <template #default="scope">
-            <el-button
-              size="small"
-              :style="monthStatusStyle(scope.row, item.value)"
-              circle
-              @click="openDetail(scope.row, item)"
-              style="width: 12px; height: 12px"
-            />
+            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
+              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="serviceName"
-        min-width="100"
-      >
+      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      size="small"
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :rules="rules"
-        size="small"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
+      <el-form :model="queryParams" ref="queryRef" :rules="rules" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="月份:">
-              <el-select
-                v-model.trim="queryParams.month"
-                size="small"
-                placeholder="月份"
-                :clearable="true"
-              >
-                <el-option
-                  v-for="item in selectMonths"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true">
+                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -449,7 +277,7 @@ const emptyForm = {
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   year: proxy.moment().format("yyyy"),
   month: proxy.moment().format("MM"),
@@ -495,7 +323,7 @@ function resetQuery() {
   // proxy.resetForm("queryRef");
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     year: proxy.moment().format("yyyy"),
     month: proxy.moment().format("MM"),
     companyName: "",
@@ -621,20 +449,20 @@ function nextYear() {
 function monthStatusStyle(row, month) {
   const index = row.details.findIndex((v) => v.month === month);
   if (index >= 0) {
-    return {
-      backgroundColor: getStatusColor(row.details[index].status),
+    pageSize: 20
+    backgroundColor: getStatusColor(row.details[index].status),
       verticalAlign: "middle",
-      width: "14px",
-      height: "14px",
+        width: "14px",
+          height: "14px",
     };
-  } else {
-    return {
-      backgroundColor: getStatusColor(0),
-      verticalAlign: "middle",
-      width: "14px",
-      height: "14px",
-    };
-  }
+} else {
+  return {
+    backgroundColor: getStatusColor(0),
+    verticalAlign: "middle",
+    width: "14px",
+    height: "14px",
+  };
+}
 }
 
 function getStatusColor(status) {
@@ -648,3 +476,4 @@ function clearStatus() {
 
 getList();
 </script>
+pageSize: 20pageSize: 20pageSize: 20

+ 64 - 229
src/views/business/socialSecurity/declare/index.vue

@@ -8,144 +8,67 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:deposit:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="所属月:">
-        <el-date-picker
-          v-model="currentMonth"
-          type="month"
-          format="YYYY年MM月"
-          :clearable="false"
-          value-format="YYYY-MM-01"
-          @change="currentMonthChange"
-          :disabled-date="disabledDateHandler"
-        />
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false" value-format="YYYY-MM-01"
+          @change="currentMonthChange" :disabled-date="disabledDateHandler" />
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select
-          v-model.trim="queryParams.status"
-          prop="status"
-          size="small"
-          type="text"
-          placeholder="状态"
-          :clearable="true"
-          style="width: 130px"
-          @clear="clearStatus"
-        >
-          <el-option
-            v-for="item in selectStatus"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+          :clearable="true" style="width: 130px" @clear="clearStatus">
+          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="orderList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="客户名称"
-        min-width="250"
-        align="center"
-        prop="companyName"
-      />
-      <el-table-column
-        label="来源"
-        min-width="100"
-        align="center"
-        prop="fromCompanyName"
-      />
-      <el-table-column
-        label="纳税性质"
-        min-width="100"
-        align="center"
-        prop="taxType"
-      />
+      <el-table-column label="客户名称" min-width="250" align="center" prop="companyName" />
+      <el-table-column label="来源" min-width="100" align="center" prop="fromCompanyName" />
+      <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
       <el-table-column label="人员信息" min-width="60" align="center" prop="">
         <template #default="scope">
-          <el-button
-            v-if="scope.row.detail != null"
-            link
-            type="primary"
-            size="small"
-            @click="showMember(scope.row)"
-            >查看</el-button
-          >
+          <el-button v-if="scope.row.detail != null" link type="primary" size="small"
+            @click="showMember(scope.row)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column label="申报填写" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="fillIn(scope.row)"
-            >{{
-              scope.row.detail == null
-                ? "填写"
-                : scope.row.detail.status === 1
-                ? "进行中"
-                : "已填写"
-            }}</el-button
-          >
+          <el-button link type="primary" size="small" @click="fillIn(scope.row)">{{
+            scope.row.detail == null
+            ? "填写"
+            : scope.row.detail.status === 1
+              ? "进行中"
+              : "已填写"
+          }}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="申报附件" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
-            @click="showFiles(scope.row)"
-            >查看文件</el-button
-          >
+          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
+            @click="showFiles(scope.row)">查看文件</el-button>
         </template>
       </el-table-column>
       <el-table-column label="状态" width="110" align="center" prop="">
@@ -154,36 +77,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
-                      backgroundColor: item.color,
-                      width: '14px',
-                      height: '14px',
-                      margin: 'auto',
-                      borderRadius: '50%',
-                      border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -193,144 +108,64 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="执行人"
-        width="80"
-        align="center"
-        prop="serviceName"
-      />
+      <el-table-column label="执行人" width="80" align="center" prop="serviceName" />
       <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            :disabled="
-              scope.row.detail == null || scope.row.detail.status !== 3
-            "
-            @click="turnBack(scope.row.detail)"
-            >退回</el-button
-          >
+          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+            " @click="turnBack(scope.row.detail)">退回</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" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <member-dialog ref="memeberDialogRef" :get-list="getList" />
     <FileListDialog ref="fileListDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog
-      title="更多搜索"
-      v-model="moreSearch"
-      width="620px"
-      append-to-body
-      size="small"
-      draggable
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        size="small"
-        :rules="rules"
-        label-width="100"
-      >
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
+      <el-form :model="queryParams" ref="queryRef" size="small" :rules="rules" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input
-                v-model="queryParams.companyName"
-                placeholder="请输入客户名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
+              <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="所属月:">
-              <el-date-picker
-                v-model="currentMonth"
-                type="month"
-                format="YYYY年MM月"
-                :clearable="false"
-                value-format="YYYY-MM-01"
-                @change="currentMonthChange"
-                :disabled-date="disabledDateHandler"
-              />
+              <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false"
+                value-format="YYYY-MM-01" @change="currentMonthChange" :disabled-date="disabledDateHandler" />
             </el-form-item>
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select
-                size="small"
-                v-model="queryParams.taxType"
-                placeholder="请选择纳税性质"
-                :clearable="true"
-                @change="taxTypeChange"
-              >
-                <el-option
-                  v-for="item in taxTypes"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
+                @change="taxTypeChange">
+                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态:">
-              <el-select
-                v-model.trim="queryParams.status"
-                prop="status"
-                size="small"
-                type="text"
-                placeholder="状态"
-                :clearable="true"
-                @clear="clearStatus"
-              >
-                <el-option
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+                :clearable="true" @clear="clearStatus">
+                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input
-                size="small"
-                v-model="queryParams.fromCompanyName"
-                type="text"
-                placeholder="客户来源"
-                :clearable="true"
-              />
+              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
+                :clearable="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="Finished"
-            size="small"
-            @click="handleQuery"
-            >确 定</el-button
-          >
-          <el-button icon="close" size="small" @click="moreSearch = false"
-            >取 消</el-button
-          >
+          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -423,7 +258,7 @@ const { verify_status } = proxy.useDict("verify_status");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
   year: proxy.moment().format("YYYY"),
@@ -619,7 +454,7 @@ function currentMonthChange(arg) {
   handleQuery();
 }
 
-function clearStatus() {
+funcpageSize: 20atus() {
   queryParams.value.status = null;
 }
 

+ 25 - 85
src/views/business/source/bin/index.vue

@@ -2,109 +2,49 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Finished"
-        :disabled="multiple"
-        @click="handleUpdate"
-        v-hasPermi="['business:bin:restore']"
-        >还原</el-button
-      >
-
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['business:bin:remove']"
-        >删除</el-button
-      >
-
-      <el-button
-        type="info"
-        size="small"
-        icon="Download"
-        @click="handleExport"
-        v-hasPermi="['business:bin:export']"
-        >导出</el-button
-      >
+      <el-button type="primary" size="small" icon="Finished" :disabled="multiple" @click="handleUpdate"
+        v-hasPermi="['business:bin:restore']">还原</el-button>
+
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['business:bin:remove']">删除</el-button>
+
+      <el-button type="info" size="small" icon="Download" @click="handleExport"
+        v-hasPermi="['business:bin:export']">导出</el-button>
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="客户名称:" prop="sourceTableName">
-        <el-input
-          v-model="queryParams.sourceValue"
-          placeholder="请输入客户名称"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.sourceValue" placeholder="请输入客户名称" style="width: 150px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="binList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="binList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" type="index" /> -->
       <el-table-column label="客户名称" align="center" prop="sourceValue" />
       <!-- <el-table-column label="来源表" align="center" prop="sourceTableName" /> -->
-      <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="handleUpdate(scope.row)"
-            v-hasPermi="['business:bin:restore']"
-            >还原</el-button
-          >
-          <el-button
-            link
-            type="danger"
-            size="small"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:bin:remove']"
-            >删除</el-button
-          >
+          <el-button link type="primary" size="small" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:bin:restore']">还原</el-button>
+          <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
+            v-hasPermi="['business:bin: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" />
 
     <!-- 表单 -->
     <bin-form ref="binRef" :get-list="getList"></bin-form>
@@ -127,7 +67,7 @@ const total = ref(0);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   sourceTableName: null,
   sourceValue: null,
@@ -184,7 +124,7 @@ function handleUpdate(row) {
       getList();
       proxy.$modal.msgSuccess("还原成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 删除按钮操作 */
@@ -199,7 +139,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 34 - 128
src/views/business/source/channel/index.vue

@@ -2,168 +2,74 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['business:channel:add']"
-        >新增</el-button
-      >
-
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['business:channel:remove']"
-        >删除</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['business:channel:add']">新增</el-button>
+
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['business:channel:remove']">删除</el-button>
 
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="渠道名称:" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入渠道名称"
-          style="width: 150px"
-          size="small"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入渠道名称" style="width: 150px" size="small" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="channelList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="channelList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" type="index" /> -->
       <el-table-column label="渠道名称" align="center" prop="name">
         <template #default="scope">
-          <el-input
-            v-if="scope.row.isAdd"
-            v-model="scope.row.name"
-            size="small"
-            placeholder="请输入渠道"
-          ></el-input>
-          <el-input
-            v-else-if="scope.row.isEdit"
-            size="small"
-            v-model="scope.row.name"
-          ></el-input>
+          <el-input v-if="scope.row.isAdd" v-model="scope.row.name" size="small" placeholder="请输入渠道"></el-input>
+          <el-input v-else-if="scope.row.isEdit" size="small" v-model="scope.row.name"></el-input>
           <span v-else>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="categoryShow"
-        label="渠道类别"
-        align="center"
-        prop="channelCategoryName"
-      />
+      <el-table-column v-if="categoryShow" label="渠道类别" align="center" prop="channelCategoryName" />
       <el-table-column label="负责人" align="center" prop="creatorName">
         <template #default="scope">
-          <el-autocomplete
-            size="small"
-            v-if="scope.row.isEdit || scope.row.isAdd"
-            v-model="scope.row.creatorName"
-            :fetch-suggestions="querySearchAsync"
-            style="width: 100%"
-            :trigger-on-focus="true"
-            placeholder="请输入负责人"
-            @select="handleSelect"
-          />
+          <el-autocomplete size="small" v-if="scope.row.isEdit || scope.row.isAdd" v-model="scope.row.creatorName"
+            :fetch-suggestions="querySearchAsync" style="width: 100%" :trigger-on-focus="true" placeholder="请输入负责人"
+            @select="handleSelect" />
           <span v-else>{{ scope.row.creatorName }}</span>
         </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="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="120"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
         <template #default="scope">
           <template v-if="!scope.row.isEdit && !scope.row.isAdd">
-            <el-button
-              v-show="!scope.row.isEdit && !scope.row.isAdd"
-              link
-              type="warning"
-              size="small"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['business:channel:edit']"
-              >修改</el-button
-            >
-            <el-button
-              v-show="!scope.row.isEdit && !scope.row.isAdd"
-              link
-              type="danger"
-              size="small"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['business:channel:remove']"
-              >删除</el-button
-            >
+            <el-button v-show="!scope.row.isEdit && !scope.row.isAdd" link type="warning" size="small"
+              @click="handleUpdate(scope.row)" v-hasPermi="['business:channel:edit']">修改</el-button>
+            <el-button v-show="!scope.row.isEdit && !scope.row.isAdd" link type="danger" size="small"
+              @click="handleDelete(scope.row)" v-hasPermi="['business:channel:remove']">删除</el-button>
           </template>
           <template v-if="scope.row.isEdit || scope.row.isAdd">
-            <el-button
-              v-show="scope.row.isEdit || scope.row.isAdd"
-              link
-              type="primary"
-              size="small"
-              @click="handleSave(scope.row)"
-              >保存</el-button
-            >
-            <el-button
-              v-show="scope.row.isEdit || scope.row.isAdd"
-              link
-              size="small"
-              @click="handCancel(scope.row)"
-              >取消</el-button
-            >
+            <el-button v-show="scope.row.isEdit || scope.row.isAdd" link type="primary" size="small"
+              @click="handleSave(scope.row)">保存</el-button>
+            <el-button v-show="scope.row.isEdit || scope.row.isAdd" link size="small"
+              @click="handCancel(scope.row)">取消</el-button>
           </template>
         </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" />
   </div>
 </template>
 
@@ -196,7 +102,7 @@ const categoryShow = ref(false);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   code: null,
   name: null,
   contact: null,
@@ -221,7 +127,7 @@ const queryNickName = ref({
 /** 渠道类型对象 */
 const queryCategory = {
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
   id: null,
   name: null,
@@ -230,7 +136,7 @@ const queryCategory = {
 /** 用户对象 */
 const queryUser = {
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   userName: null,
   phonenumber: null,
   status: null,
@@ -400,7 +306,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 36 - 127
src/views/business/source/index.vue

@@ -2,162 +2,71 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['settings:source:add']"
-        >新增</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['settings:source:add']">新增</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['settings:source:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['settings:source:remove']">删除</el-button>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="来源:" prop="referrerDataSource">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入来源"
-          style="width: 150px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.title" placeholder="请输入来源" style="width: 150px" 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(queryParams)"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery(queryParams)">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="sourceList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="sourceList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" type="index" /> -->
       <el-table-column label="来源" align="center" prop="title">
         <template #default="scope">
-          <el-input
-            v-if="scope.row.isAdd"
-            v-model="scope.row.title"
-            size="small"
-            placeholder="请输入内容"
-          ></el-input>
-          <el-input
-            v-else-if="scope.row.isEdit"
-            size="small"
-            v-model="scope.row.title"
-            placeholder="请输入内容"
-          ></el-input>
+          <el-input v-if="scope.row.isAdd" v-model="scope.row.title" size="small" placeholder="请输入内容"></el-input>
+          <el-input v-else-if="scope.row.isEdit" size="small" v-model="scope.row.title" placeholder="请输入内容"></el-input>
           <span v-else>{{ scope.row.title }}</span>
         </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="操作"
-        align="center"
-        width="150"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template #default="scope">
-          <template
-            v-if="
-              !scope.row.isAdd &&
-              !scope.row.isEdit &&
-              scope.row.referrerDataSource == isReferrerDataSource
-            "
-          >
-            <el-button
-              link
-              type="warning"
-              size="small"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['settings:source:edit']"
-              >修改</el-button
-            >
-            <el-button
-              link
-              type="danger"
-              size="small"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['settings:source:remove']"
-              >删除</el-button
-            >
+          <template v-if="!scope.row.isAdd &&
+            !scope.row.isEdit &&
+            scope.row.referrerDataSource == isReferrerDataSource
+            ">
+            <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
+              v-hasPermi="['settings:source:edit']">修改</el-button>
+            <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
+              v-hasPermi="['settings:source:remove']">删除</el-button>
           </template>
-          <template
-            v-if="
-              scope.row.isAdd ||
+          <template v-if="scope.row.isAdd ||
+            (scope.row.isEdit &&
+              scope.row.referrerDataSource == isReferrerDataSource)
+            ">
+            <el-button v-show="scope.row.isAdd ||
               (scope.row.isEdit &&
                 scope.row.referrerDataSource == isReferrerDataSource)
-            "
-          >
-            <el-button
-              v-show="
-                scope.row.isAdd ||
-                (scope.row.isEdit &&
-                  scope.row.referrerDataSource == isReferrerDataSource)
-              "
-              link
-              type="primary"
-              size="small"
-              @click="handleSave(scope.row)"
-              >保存</el-button
-            >
-            <el-button
-              v-show="scope.row.isEdit || scope.row.isAdd"
-              link
-              type="infeo"
-              size="small"
-              @click="handCancel(scope.row)"
-              >取消</el-button
-            >
+              " link type="primary" size="small" @click="handleSave(scope.row)">保存</el-button>
+            <el-button v-show="scope.row.isEdit || scope.row.isAdd" link type="infeo" size="small"
+              @click="handCancel(scope.row)">取消</el-button>
           </template>
         </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" />
 
     <!-- 表单 -->
     <source-form ref="sourceRef" :get-list="getList"></source-form>
@@ -188,7 +97,7 @@ const isReferrerDataSource = ref("");
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   title: null,
   referrerDataSource: null,
   orderByColumn: "create_time",
@@ -296,7 +205,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 22 - 87
src/views/business/tenant/index.vue

@@ -2,70 +2,33 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['business:tenant:add']"
-        >新增</el-button
-      >
-      <el-button
-        type="warning"
-        size="small"
-        icon="Edit"
-        :disabled="single"
-        @click="handleUpdate"
-        v-hasPermi="['business:tenant:edit']"
-        >修改</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['business:tenant:add']">新增</el-button>
+      <el-button type="warning" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
+        v-hasPermi="['business:tenant:edit']">修改</el-button>
       <!-- <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
                 v-hasPermi="['business:tenant:remove']">删除</el-button>
             <el-button type="warning" size="small" icon="Download" @click="handleExport"
                 v-hasPermi="['business:tenant:export']">导出</el-button> -->
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="公司名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="企业名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" placeholder="企业名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="tenantList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="tenantList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
-      <el-table-column
-        label="系统简称"
-        align="center"
-        prop="accountName"
-        width="180"
-      />
+      <el-table-column label="系统简称" align="center" prop="accountName" width="180" />
       <el-table-column label="状态" align="center" prop="status" width="100">
         <template #default="scope">
           <el-tag size="small" :type="checkStatusType(scope.row.status)">{{
@@ -73,49 +36,21 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <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
-            type="primary"
-            size="small"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:tenant:edit']"
-            >查看</el-button
-          >
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="handleInit(scope.row, 2)"
-            v-hasPermi="['business:tenant:edit']"
-            >初始化系统</el-button
-          >
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="handleGetIn(scope.row)"
-            v-hasPermi="['business:tenant:getIn']"
-            >进入系统</el-button
-          >
+          <el-button link type="primary" size="small" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:tenant:edit']">查看</el-button>
+          <el-button link type="primary" size="small" @click="handleInit(scope.row, 2)"
+            v-hasPermi="['business:tenant:edit']">初始化系统</el-button>
+          <el-button link type="primary" size="small" @click="handleGetIn(scope.row)"
+            v-hasPermi="['business:tenant:getIn']">进入系统</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" />
 
     <!-- 表单 -->
     <tenant-form ref="tenantRef" :get-list="getList"></tenant-form>
@@ -145,7 +80,7 @@ const tenantInitRef = ref(null);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   orderByColumn: "create_time",
 });
 
@@ -203,7 +138,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 26 - 133
src/views/dialog/Person.vue

@@ -1,160 +1,52 @@
 <template>
-  <el-dialog
-    draggable
-    v-model="visible"
-    :width="width"
-    :modal="true"
-    :append-to-body="true"
-    :show-close="false"
-  >
+  <el-dialog draggable v-model="visible" :width="width" :modal="true" :append-to-body="true" :show-close="false">
     <template #header>
       <div>
         <span>员工选择</span>
-        <el-button
-          style="float: right"
-          type="danger"
-          size="small"
-          icon="CloseBold"
-          circle
-          @click="close"
-        />
+        <el-button style="float: right" type="danger" size="small" icon="CloseBold" circle @click="close" />
       </div>
     </template>
     <div class="page-container list-container">
       <div class="list-btns-container">
-        <el-button
-          type="success"
-          icon="Search"
-          size="small"
-          @click="handleSearch"
-          >搜索</el-button
-        >
-        <el-button
-          type="primary"
-          icon="Delete"
-          size="small"
-          plain
-          @click="handleSearch('clear')"
-          >清空</el-button
-        >
-        <el-button
-          v-if="multiple"
-          type="primary"
-          :disabled="selections.length === 0"
-          size="small"
-          icon="Back"
-          @click="handleMultipleSelected"
-          >带回选中</el-button
-        >
+        <el-button type="success" icon="Search" size="small" @click="handleSearch">搜索</el-button>
+        <el-button type="primary" icon="Delete" size="small" plain @click="handleSearch('clear')">清空</el-button>
+        <el-button v-if="multiple" type="primary" :disabled="selections.length === 0" size="small" icon="Back"
+          @click="handleMultipleSelected">带回选中</el-button>
       </div>
       <el-form class="list-search-container" size="small" :inline="true">
         <el-form-item label="员工名称:">
-          <el-input
-            v-model.trim="queryParams.name"
-            size="small"
-            type="text"
-            placeholder="员工名称"
-            :clearable="true"
-          />
+          <el-input v-model.trim="queryParams.name" size="small" type="text" placeholder="员工名称" :clearable="true" />
         </el-form-item>
         <el-form-item label="员工工号:">
-          <el-input
-            v-model.trim="queryParams.code"
-            size="small"
-            type="text"
-            placeholder="员工工号"
-            :clearable="true"
-          />
+          <el-input v-model.trim="queryParams.code" size="small" type="text" placeholder="员工工号" :clearable="true" />
         </el-form-item>
         <el-form-item label="部门:">
-          <el-input
-            v-model.trim="queryParams.deptName"
-            size="small"
-            type="text"
-            placeholder="部门名称"
-            :clearable="true"
-          />
+          <el-input v-model.trim="queryParams.deptName" size="small" type="text" placeholder="部门名称" :clearable="true" />
         </el-form-item>
         <el-form-item label="岗位:">
-          <el-input
-            v-model.trim="queryParams.position"
-            size="small"
-            type="text"
-            placeholder="岗位名称"
-            :clearable="true"
-          />
+          <el-input v-model.trim="queryParams.position" size="small" type="text" placeholder="岗位名称" :clearable="true" />
         </el-form-item>
       </el-form>
-      <el-table
-        :data="list"
-        row-key="code"
-        size="small"
-        border
-        height="400px"
-        header-row-class-name="list-header-row"
-        row-class-name="list-row"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="multiple"
-          type="selection"
-          :selectable="selectable"
-          :reserve-selection="true"
-          width="40"
-          align="center"
-        />
+      <el-table :data="list" row-key="code" size="small" border height="400px" header-row-class-name="list-header-row"
+        row-class-name="list-row" @selection-change="handleSelectionChange">
+        <el-table-column v-if="multiple" type="selection" :selectable="selectable" :reserve-selection="true" width="40"
+          align="center" />
         <el-table-column type="index" label="行号" width="46" align="center" />
-        <el-table-column
-          label="员工号"
-          prop="code"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          label="员工姓名"
-          prop="name"
-          width="100"
-          align="center"
-        />
+        <el-table-column label="员工号" prop="code" width="200" align="center" />
+        <el-table-column label="员工姓名" prop="name" width="100" align="center" />
         <el-table-column label="性别" prop="gender" width="50" align="center" />
-        <el-table-column
-          label="岗位"
-          prop="position"
-          width="150"
-          align="center"
-        />
-        <el-table-column
-          label="部门"
-          prop="deptName"
-          width="150"
-          align="center"
-        />
+        <el-table-column label="岗位" prop="position" width="150" align="center" />
+        <el-table-column label="部门" prop="deptName" width="150" align="center" />
         <el-table-column label="备注" prop="remark" header-align="center" />
-        <el-table-column
-          v-if="!multiple"
-          label="操作"
-          width="50"
-          align="center"
-        >
+        <el-table-column v-if="!multiple" label="操作" width="50" align="center">
           <template #default="scope">
-            <el-button
-              type="success"
-              size="small"
-              icon="finished"
-              link
-              @click="handleSingleSelected(scope.row)"
-              >选择</el-button
-            >
+            <el-button type="success" size="small" icon="finished" link
+              @click="handleSingleSelected(scope.row)">选择</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" />
     </div>
   </el-dialog>
 </template>
@@ -190,7 +82,7 @@ const visible = ref(false);
 const data = reactive({
   queryParams: {
     name: "",
-    pageSize: 10,
+    pageSize: 20,
     pageNum: 1,
   },
 });
@@ -245,7 +137,7 @@ function handleSearch(type) {
       subject: "",
       name: "",
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNum: 1,
     };
   }
@@ -273,3 +165,4 @@ defineExpose({
   open,
 });
 </script>
+pageSize: 20

+ 1 - 1
src/views/index.vue

@@ -96,7 +96,7 @@ const total = ref(0);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   companyName: "",
   orderByColumn: "create_time",
 });

+ 50 - 221
src/views/monitor/job/index.vue

@@ -1,238 +1,93 @@
 <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="['monitor:job:add']"
-        >新增</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['monitor:job:add']">新增</el-button>
 
-      <el-button
-        type="warning"
-        size="small"
-        icon="Edit"
-        :disabled="single"
-        @click="handleUpdate"
-        v-hasPermi="['monitor:job:edit']"
-        >修改</el-button
-      >
+      <el-button type="warning" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
+        v-hasPermi="['monitor:job:edit']">修改</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['monitor:job:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['monitor:job:remove']">删除</el-button>
 
-      <el-button
-        type="info"
-        size="small"
-        icon="Download"
-        @click="handleExport"
-        v-hasPermi="['monitor:job:export']"
-        >导出</el-button
-      >
+      <el-button type="info" size="small" icon="Download" @click="handleExport"
+        v-hasPermi="['monitor:job:export']">导出</el-button>
 
-      <el-button
-        size="small"
-        icon="Operation"
-        @click="handleJobLog"
-        v-hasPermi="['monitor:job:query']"
-        >日志</el-button
-      >
+      <el-button size="small" icon="Operation" @click="handleJobLog" v-hasPermi="['monitor:job:query']">日志</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="jobName">
-        <el-input
-          size="small"
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input size="small" v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="任务组名:" prop="jobGroup">
-        <el-select
-          size="small"
-          v-model="queryParams.jobGroup"
-          placeholder="请选择任务组名"
-          clearable
-          style="width: 200px"
-        >
-          <el-option
-            v-for="dict in sys_job_group"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select size="small" v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 200px">
+          <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </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_job_status"
-            :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_job_status" :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"
-      v-loading="loading"
-      border
-      height="100%"
-      :data="jobList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table size="small" v-loading="loading" border height="100%" :data="jobList"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="任务编号"
-        width="100"
-        align="center"
-        prop="jobId"
-      />
-      <el-table-column
-        label="任务名称"
-        align="center"
-        prop="jobName"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
+      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
       <el-table-column label="任务组名" align="center" prop="jobGroup">
         <template #default="scope">
           <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="调用目标字符串"
-        align="center"
-        prop="invokeTarget"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="cron执行表达式"
-        align="center"
-        prop="cronExpression"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center">
         <template #default="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+          <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"
-        width="200"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-tooltip content="修改" placement="top">
-            <el-button
-              link
-              type="warning"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['monitor:job:edit']"
-            ></el-button>
+            <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['monitor:job:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="删除" placement="top">
-            <el-button
-              link
-              type="danger"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['monitor:job:remove']"
-            ></el-button>
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['monitor:job:remove']"></el-button>
           </el-tooltip>
           <el-tooltip content="执行一次" placement="top">
-            <el-button
-              link
-              type="success"
-              icon="CaretRight"
-              @click="handleRun(scope.row)"
-              v-hasPermi="['monitor:job:changeStatus']"
-            ></el-button>
+            <el-button link type="success" icon="CaretRight" @click="handleRun(scope.row)"
+              v-hasPermi="['monitor:job:changeStatus']"></el-button>
           </el-tooltip>
           <el-tooltip content="任务详细" placement="top">
-            <el-button
-              link
-              type="primary"
-              icon="View"
-              @click="handleView(scope.row)"
-              v-hasPermi="['monitor:job:query']"
-            ></el-button>
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+              v-hasPermi="['monitor:job:query']"></el-button>
           </el-tooltip>
           <el-tooltip content="调度日志" placement="top">
-            <el-button
-              link
-              type="info"
-              icon="Operation"
-              @click="handleJobLog(scope.row)"
-              v-hasPermi="['monitor:job:query']"
-            ></el-button>
+            <el-button link type="info" icon="Operation" @click="handleJobLog(scope.row)"
+              v-hasPermi="['monitor:job:query']"></el-button>
           </el-tooltip>
         </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="800px"
-      append-to-body
-      draggable
-    >
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -243,12 +98,8 @@
           <el-col :span="12">
             <el-form-item label="任务分组" prop="jobGroup">
               <el-select v-model="form.jobGroup" placeholder="请选择">
-                <el-option
-                  v-for="dict in sys_job_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -269,18 +120,12 @@
                   </el-tooltip>
                 </span>
               </template>
-              <el-input
-                v-model="form.invokeTarget"
-                placeholder="请输入调用目标字符串"
-              />
+              <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
-              <el-input
-                v-model="form.cronExpression"
-                placeholder="请输入cron执行表达式"
-              >
+              <el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
                 <template #append>
                   <el-button type="primary" @click="handleShowCron">
                     生成表达式
@@ -310,12 +155,7 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in sys_job_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                  >{{ dict.label }}</el-radio
-                >
+                <el-radio v-for="dict in sys_job_status" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -329,19 +169,8 @@
       </template>
     </el-dialog>
 
-    <el-dialog
-      title="Cron表达式生成器"
-      v-model="openCron"
-      append-to-body
-      destroy-on-close
-      draggable
-    >
-      <crontab
-        ref="crontabRef"
-        @hide="openCron = false"
-        @fill="crontabFill"
-        :expression="expression"
-      ></crontab>
+    <el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close draggable>
+      <crontab ref="crontabRef" @hide="openCron = false" @fill="crontabFill" :expression="expression"></crontab>
     </el-dialog>
 
     <!-- 任务日志详细 -->
@@ -441,7 +270,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     jobName: undefined,
     jobGroup: undefined,
     status: undefined,
@@ -548,7 +377,7 @@ function handleRun(row) {
     .then(() => {
       proxy.$modal.msgSuccess("执行成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 任务详细信息 */
 function handleView(row) {
@@ -619,7 +448,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 1 - 1
src/views/monitor/job/log.vue

@@ -126,7 +126,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined

+ 35 - 149
src/views/monitor/logininfor/index.vue

@@ -1,185 +1,71 @@
 <template>
   <div class="page-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['monitor:logininfor:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['monitor:logininfor:remove']">删除</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        @click="handleClean"
-        v-hasPermi="['monitor:logininfor:remove']"
-        >清空</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" @click="handleClean"
+        v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
 
-      <el-button
-        type="primary"
-        size="small"
-        icon="Unlock"
-        :disabled="single"
-        @click="handleUnlock"
-        v-hasPermi="['monitor:logininfor:unlock']"
-        >解锁</el-button
-      >
+      <el-button type="primary" size="small" icon="Unlock" :disabled="single" @click="handleUnlock"
+        v-hasPermi="['monitor:logininfor:unlock']">解锁</el-button>
 
-      <el-button
-        type="info"
-        size="small"
-        icon="Download"
-        @click="handleExport"
-        v-hasPermi="['monitor:logininfor:export']"
-        >导出</el-button
-      >
+      <el-button type="info" size="small" icon="Download" @click="handleExport"
+        v-hasPermi="['monitor:logininfor: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"
-      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="ipaddr" style="width: 220px">
-        <el-input
-          size="small"
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input size="small" v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="用户名称:" prop="userName" style="width: 220px">
-        <el-input
-          size="small"
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input size="small" v-model="queryParams.userName" 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_common_status"
-            :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_common_status" :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"
-      ref="logininforRef"
-      height="100%"
-      border
-      v-loading="loading"
-      :data="logininforList"
-      @selection-change="handleSelectionChange"
-      :default-sort="defaultSort"
-      @sort-change="handleSortChange"
-    >
+    <el-table size="small" ref="logininforRef" height="100%" border v-loading="loading" :data="logininforList"
+      @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
-      <el-table-column
-        label="用户名称"
-        align="center"
-        prop="userName"
-        :show-overflow-tooltip="true"
-        sortable="custom"
-        :sort-orders="['descending', 'ascending']"
-      />
-      <el-table-column
-        label="地址"
-        align="center"
-        prop="ipaddr"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="登录地点"
-        align="center"
-        prop="loginLocation"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="操作系统"
-        align="center"
-        prop="os"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="浏览器"
-        align="center"
-        prop="browser"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
+        :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
+      <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
       <el-table-column label="登录状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_common_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="描述" align="center" prop="msg" />
-      <el-table-column
-        label="访问时间"
-        align="center"
-        prop="loginTime"
-        sortable="custom"
-        :sort-orders="['descending', 'ascending']"
-        width="180"
-      >
+      <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom"
+        :sort-orders="['descending', 'ascending']" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </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" />
   </div>
 </template>
 
@@ -208,7 +94,7 @@ const defaultSort = ref({ prop: "loginTime", order: "descending" });
 // 查询参数
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   ipaddr: undefined,
   userName: undefined,
   status: undefined,
@@ -267,7 +153,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 清空按钮操作 */
 function handleClean() {
@@ -280,7 +166,7 @@ function handleClean() {
       getList();
       proxy.$modal.msgSuccess("清空成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 解锁按钮操作 */
 function handleUnlock() {
@@ -293,7 +179,7 @@ function handleUnlock() {
     .then(() => {
       proxy.$modal.msgSuccess("用户" + username + "解锁成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 1 - 1
src/views/monitor/operlog/index.vue

@@ -157,7 +157,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     title: undefined,
     operName: undefined,
     businessType: undefined,

+ 26 - 14
src/views/system/config/index.vue

@@ -2,25 +2,33 @@
   <div class="page-container list-container">
     <div :gutter="10" class="list-btns-container">
 
-      <el-button size="small" type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['system:config:add']">新增</el-button>
+      <el-button size="small" type="primary" icon="Plus" @click="handleAdd"
+        v-hasPermi="['system:config:add']">新增</el-button>
 
-      <el-button size="small" type="success" icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:config:edit']">修改</el-button>
+      <el-button size="small" type="success" icon="Edit" :disabled="single" @click="handleUpdate"
+        v-hasPermi="['system:config:edit']">修改</el-button>
 
-      <el-button size="small" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:config:remove']">删除</el-button>
+      <el-button size="small" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['system:config:remove']">删除</el-button>
 
-      <el-button size="small" type="warning" icon="Download" @click="handleExport" v-hasPermi="['system:config:export']">导出</el-button>
+      <el-button size="small" type="warning" icon="Download" @click="handleExport"
+        v-hasPermi="['system:config:export']">导出</el-button>
 
-      <el-button size="small" type="danger" icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:config:remove']">刷新缓存</el-button>
+      <el-button size="small" type="danger" icon="Refresh" @click="handleRefreshCache"
+        v-hasPermi="['system:config: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="configName" style="width: 220px">
-        <el-input size="small" v-model="queryParams.configName" placeholder="请输入参数名称" clearable @keyup.enter="handleQuery" />
+        <el-input size="small" v-model="queryParams.configName" placeholder="请输入参数名称" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="参数键名:" prop="configKey" style="width: 220px">
-        <el-input size="small" v-model="queryParams.configKey" placeholder="请输入参数键名" clearable @keyup.enter="handleQuery" />
+        <el-input size="small" v-model="queryParams.configKey" placeholder="请输入参数键名" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="系统内置:" prop="configType" style="width: 220px">
         <el-select size="small" v-model="queryParams.configType" placeholder="系统内置" clearable>
@@ -28,7 +36,8 @@
         </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 type="primary" size="small" icon="Search" @click="handleQuery">搜索</el-button>
@@ -55,13 +64,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:config:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:config: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>
@@ -115,7 +127,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     configName: undefined,
     configKey: undefined,
     configType: undefined
@@ -220,7 +232,7 @@ function handleDelete(row) {
       getList()
       proxy.$modal.msgSuccess('删除成功')
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 1 - 1
src/views/system/dict/data.vue

@@ -158,7 +158,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined

+ 37 - 162
src/views/system/dict/index.vue

@@ -1,133 +1,55 @@
 <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>
@@ -138,65 +60,27 @@
         </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="请输入字典名称" />
@@ -206,20 +90,11 @@
         </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>
@@ -263,7 +138,7 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     module: "system",
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined,
@@ -372,7 +247,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 27 - 115
src/views/system/inItRole/authUser.vue

@@ -2,143 +2,55 @@
 <template>
   <div class="page-container list-container">
     <div class="list-btns-container">
-      <el-button
-        size="small"
-        type="primary"
-        icon="Plus"
-        @click="openSelectUser"
-        v-hasPermi="['system:role:add']"
-        >添加用户</el-button
-      >
-      <el-button
-        size="small"
-        type="danger"
-        icon="CircleClose"
-        :disabled="multiple"
-        @click="cancelAuthUserAll"
-        v-hasPermi="['system:role:remove']"
-        >批量取消授权</el-button
-      >
-      <el-button size="small" type="warning" icon="Close" @click="handleClose"
-        >关闭</el-button
-      >
+      <el-button size="small" type="primary" icon="Plus" @click="openSelectUser"
+        v-hasPermi="['system:role:add']">添加用户</el-button>
+      <el-button size="small" type="danger" icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll"
+        v-hasPermi="['system:role:remove']">批量取消授权</el-button>
+      <el-button size="small" type="warning" icon="Close" @click="handleClose">关闭</el-button>
     </div>
 
-    <el-form
-      class="list-search-container"
-      :model="queryParams"
-      ref="queryRef"
-      v-show="showSearch"
-      :inline="true"
-    >
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
       <el-form-item label="用户名称:" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          size="small"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" size="small" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="手机号码:" prop="phonenumber">
-        <el-input
-          v-model="queryParams.phonenumber"
-          placeholder="请输入手机号码"
-          size="small"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" size="small" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          size="small"
-          icon="Search"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="Refresh" size="small" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" size="small" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      size="small"
-      border
-      :data="userList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" size="small" border :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="用户名称"
-        prop="userName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="用户昵称"
-        prop="nickName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="邮箱"
-        prop="email"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="手机"
-        prop="phonenumber"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+      <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <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="操作"
-        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="danger"
-            size="small"
-            icon="CircleClose"
-            @click="cancelAuthUser(scope.row)"
-            v-hasPermi="['system:role:remove']"
-            >取消授权</el-button
-          >
+          <el-button link type="danger" size="small" icon="CircleClose" @click="cancelAuthUser(scope.row)"
+            v-hasPermi="['system:role: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"
-    />
-    <select-user
-      ref="selectRef"
-      :roleId="queryParams.roleId"
-      @ok="handleQuery"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+    <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
   </div>
 </template>
 
@@ -163,7 +75,7 @@ const userIds = ref([]);
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   roleId: route.params.roleId,
   userName: undefined,
   phonenumber: undefined,
@@ -213,7 +125,7 @@ function cancelAuthUser(row) {
       getList();
       proxy.$modal.msgSuccess("取消授权成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 批量取消授权按钮操作 */
 function cancelAuthUserAll(row) {
@@ -228,7 +140,7 @@ function cancelAuthUserAll(row) {
       getList();
       proxy.$modal.msgSuccess("取消授权成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 getList();

+ 45 - 193
src/views/system/inItRole/index.vue

@@ -1,34 +1,14 @@
 <template>
   <div class="page-container list-sontainer">
     <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="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> -->
@@ -36,22 +16,11 @@
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </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" />
@@ -66,82 +35,34 @@
           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"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table size="small" v-loading="loading" border :data="roleList" @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" 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="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-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)"
@@ -159,22 +80,11 @@
       </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="请输入角色名称" />
@@ -182,10 +92,7 @@
         <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>
               权限字符
@@ -194,11 +101,7 @@
           <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">
@@ -206,38 +109,16 @@
           </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>
@@ -249,13 +130,7 @@
     </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" />
@@ -265,41 +140,18 @@
         </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>
@@ -371,7 +223,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     roleName: undefined,
     roleKey: undefined,
     status: undefined,
@@ -423,7 +275,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 18 - 79
src/views/system/inItRole/selectUser.vue

@@ -1,107 +1,46 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog
-    title="选择用户"
-    v-model="visible"
-    width="1200px"
-    top="5vh"
-    append-to-body
-    draggable
-  >
+  <el-dialog title="选择用户" v-model="visible" width="1200px" top="5vh" append-to-body draggable>
     <el-form :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="手机号码" prop="phonenumber">
-        <el-input
-          v-model="queryParams.phonenumber"
-          placeholder="请输入手机号码"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          size="small"
-          icon="Search"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="Refresh" size="small" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" size="small" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table
-        @row-click="clickRow"
-        ref="refTable"
-        :data="userList"
-        @selection-change="handleSelectionChange"
-        height="260px"
-      >
+      <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange"
+        height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column
-          label="用户名称"
-          prop="userName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="用户昵称"
-          prop="nickName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="邮箱"
-          prop="email"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="手机"
-          prop="phonenumber"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column> -->
-        <el-table-column
-          label="身份"
-          align="center"
-          prop="tenantAdmin"
-          width="100"
-        >
+        <el-table-column label="身份" align="center" prop="tenantAdmin" width="100">
           <template #default="scope">
             <dict-tag :options="user_tenant" :value="scope.row.tenantAdmin" />
           </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>
-      <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-row>
     <template #footer>
       <div class="dialog-footer">
@@ -131,7 +70,7 @@ const userIds = ref([]);
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   roleId: undefined,
   userName: undefined,
   phonenumber: undefined,

+ 22 - 12
src/views/system/notice/index.vue

@@ -3,21 +3,26 @@
 
     <div :gutter="10" class="list-btns-container">
 
-      <el-button size="small" type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['system:notice:add']">新增</el-button>
+      <el-button size="small" type="primary" icon="Plus" @click="handleAdd"
+        v-hasPermi="['system:notice:add']">新增</el-button>
 
-      <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:notice:edit']">修改</el-button>
+      <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
+        v-hasPermi="['system:notice:edit']">修改</el-button>
 
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:notice:remove']">删除</el-button>
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['system:notice: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">
       <el-form-item label="公告标题:" prop="noticeTitle">
-        <el-input size="small" v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable style="width: 200px" @keyup.enter="handleQuery" />
+        <el-input size="small" v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="操作人员:" prop="createBy">
-        <el-input size="small" v-model="queryParams.createBy" placeholder="请输入操作人员" clearable style="width: 200px" @keyup.enter="handleQuery" />
+        <el-input size="small" v-model="queryParams.createBy" placeholder="请输入操作人员" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="类型:" prop="noticeType">
         <el-select size="small" v-model="queryParams.noticeType" placeholder="公告类型" clearable style="width: 200px">
@@ -52,13 +57,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:notice:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:notice: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="780px" append-to-body draggable>
@@ -72,14 +80,16 @@
           <el-col :span="12">
             <el-form-item label="公告类型" prop="noticeType">
               <el-select v-model="form.noticeType" placeholder="请选择">
-                <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_notice_status" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in sys_notice_status" :key="dict.value" :label="dict.value">{{ dict.label
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -120,7 +130,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     noticeTitle: undefined,
     createBy: undefined,
     status: undefined
@@ -222,7 +232,7 @@ function handleDelete(row) {
       getList()
       proxy.$modal.msgSuccess('删除成功')
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
 getList()

+ 33 - 148
src/views/system/post/index.vue

@@ -3,108 +3,39 @@
 <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" />
@@ -115,59 +46,26 @@
           <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="请输入岗位名称" />
@@ -176,28 +74,15 @@
           <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>
@@ -236,7 +121,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     postCode: undefined,
     postName: undefined,
     status: undefined,
@@ -346,7 +231,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 41 - 178
src/views/system/reconciliation/oncePrice/index.vue

@@ -2,222 +2,85 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['oncePrice:oncePrice:save']"
-        >新增</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['oncePrice:oncePrice:save']">新增</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['oncePrice:oncePrice:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['oncePrice:oncePrice:remove']">删除</el-button>
 
-      <el-button
-        type="info"
-        size="small"
-        icon="Download"
-        @click="handleExport"
-        v-hasPermi="['oncePrice:oncePrice:export']"
-        >导出</el-button
-      >
+      <el-button type="info" size="small" icon="Download" @click="handleExport"
+        v-hasPermi="['oncePrice:oncePrice:export']">导出</el-button>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="60px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="60px">
       <el-form-item label="任务类型:" prop="taskTypeId">
-        <el-select
-          v-model="queryParams.taskTypeId"
-          type="text"
-          placeholder="选择任务"
-          :clearable="true"
-          width="100px"
-          @change="handleTaskChange"
-          @clear="handleTaskClear"
-        >
-          <el-option
-            v-for="item in taskType"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+        <el-select v-model="queryParams.taskTypeId" type="text" placeholder="选择任务" :clearable="true" width="100px"
+          @change="handleTaskChange" @clear="handleTaskClear">
+          <el-option v-for="item in taskType" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
 
       <el-form-item label="任务明细:" prop="fromAccountName">
-        <el-select
-          v-model="queryParams.taskTypeDetailId"
-          type="text"
-          placeholder="先选择任务类型"
-          :clearable="true"
-          width="100px"
-          @clear="handleTaskDetaiClear"
-        >
-          <el-option
-            v-for="item in taskTypeDetail"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+        <el-select v-model="queryParams.taskTypeDetailId" type="text" placeholder="先选择任务类型" :clearable="true"
+          width="100px" @clear="handleTaskDetaiClear">
+          <el-option v-for="item in taskTypeDetail" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="省市区:" prop="provinceCode" style="width: 300px">
-        <el-select
-          v-model="queryParams.provinceCode"
-          placeholder="省份"
-          style="width: 33%"
-          @change="handleSelectProvince"
-        >
-          <el-option
-            v-for="item in provinces"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
+        <el-select v-model="queryParams.provinceCode" placeholder="省份" style="width: 33%" @change="handleSelectProvince">
+          <el-option v-for="item in provinces" :key="item.code" :label="item.name" :value="item.code" />
         </el-select>
-        <el-select
-          v-model="queryParams.cityCode"
-          placeholder="城市"
-          style="width: 33%"
-          @change="handleSelectCity"
-        >
-          <el-option
-            v-for="item in cities"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
+        <el-select v-model="queryParams.cityCode" placeholder="城市" style="width: 33%" @change="handleSelectCity">
+          <el-option v-for="item in cities" :key="item.code" :label="item.name" :value="item.code" />
         </el-select>
-        <el-select
-          v-model="queryParams.districtCode"
-          placeholder="行政区"
-          style="width: 33%"
-          @change="handleSelectDistrict"
-        >
-          <el-option
-            v-for="item in districts"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
+        <el-select v-model="queryParams.districtCode" placeholder="行政区" style="width: 33%" @change="handleSelectDistrict">
+          <el-option v-for="item in districts" :key="item.code" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="priceListList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="priceListList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" type="index">
       </el-table-column> -->
-      <el-table-column
-        label="地区"
-        min-width="250"
-        align="center"
-        prop="taskTypeName"
-      >
+      <el-table-column label="地区" min-width="250" align="center" prop="taskTypeName">
         <template #default="scope">
-          <span
-            >{{ scope.row.province }}-{{ scope.row.city }}-{{
-              scope.row.district
-            }}</span
-          >
+          <span>{{ scope.row.province }}-{{ scope.row.city }}-{{
+            scope.row.district
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="任务类型"
-        align="center"
-        min-width="100"
-        prop="taskTypeName"
-      >
+      <el-table-column label="任务类型" align="center" min-width="100" prop="taskTypeName">
       </el-table-column>
-      <el-table-column
-        label="任务明细"
-        min-width="100"
-        align="center"
-        prop="taskTypeDetailName"
-      >
+      <el-table-column label="任务明细" min-width="100" align="center" prop="taskTypeDetailName">
         <template #default="scope">
-          <span v-if="scope.row.taskTypeId == 6"
-            >{{ scope.row.alterType }}-{{ scope.row.taskTypeDetailName }}
+          <span v-if="scope.row.taskTypeId == 6">{{ scope.row.alterType }}-{{ scope.row.taskTypeDetailName }}
           </span>
           <span v-else>{{ scope.row.taskTypeDetailName }} </span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="金额"
-        header-align="center"
-        align="right"
-        min-width="80"
-        prop="price"
-      />
-      <el-table-column
-        label="备注"
-        align="center"
-        min-width="100"
-        prop="remark"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        min-width="100"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="金额" header-align="center" align="right" min-width="80" prop="price" />
+      <el-table-column label="备注" align="center" min-width="100" prop="remark" />
+      <el-table-column label="操作" align="center" min-width="100" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            link
-            type="warning"
-            size="small"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oncePrice:oncePrice:save']"
-            >修改</el-button
-          >
-          <el-button
-            link
-            type="danger"
-            size="small"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oncePrice:oncePrice:remove']"
-            >删除</el-button
-          >
+          <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oncePrice:oncePrice:save']">修改</el-button>
+          <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
+            v-hasPermi="['oncePrice:oncePrice: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" />
 
     <!-- 表单 -->
     <priceList-form ref="priceListRef" :get-list="getList"></priceList-form>
@@ -254,7 +117,7 @@ const taskTypeDetail = ref({});
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   price: null,
   annualIncome: null,
   isChanged: null,
@@ -349,7 +212,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 28 - 120
src/views/system/reconciliation/priceList/index.vue

@@ -2,98 +2,38 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['priceList:priceList:save']"
-        >新增</el-button
-      >
+      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+        v-hasPermi="['priceList:priceList:save']">新增</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['priceList:priceList:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['priceList:priceList:remove']">删除</el-button>
 
-      <el-button
-        type="info"
-        size="small"
-        icon="Download"
-        @click="handleExport"
-        v-hasPermi="['priceList:priceList:export']"
-        >导出</el-button
-      >
+      <el-button type="info" size="small" icon="Download" @click="handleExport"
+        v-hasPermi="['priceList:priceList:export']">导出</el-button>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="68px">
       <el-form-item label="任务类型:" prop="taskTypeId">
-        <el-select
-          v-model="queryParams.taskTypeId"
-          type="text"
-          placeholder="选择任务"
-          :clearable="true"
-          width="100px"
-          @clear="handleTaskClear"
-        >
-          <el-option
-            v-for="item in taskType"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+        <el-select v-model="queryParams.taskTypeId" type="text" placeholder="选择任务" :clearable="true" width="100px"
+          @clear="handleTaskClear">
+          <el-option v-for="item in taskType" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="priceListList"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="priceListList" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" type="index" /> -->
-      <el-table-column
-        label="任务类型"
-        align="center"
-        min-width="120"
-        prop="taskTypeName"
-      />
-      <el-table-column
-        label="单价"
-        header-align="center"
-        align="right"
-        min-width="80"
-        prop="price"
-      />
-      <el-table-column
-        label="年收入"
-        align="center"
-        min-width="120"
-        prop="annualIncome"
-      >
+      <el-table-column label="任务类型" align="center" min-width="120" prop="taskTypeName" />
+      <el-table-column label="单价" header-align="center" align="right" min-width="80" prop="price" />
+      <el-table-column label="年收入" align="center" min-width="120" prop="annualIncome">
         <template #default="scope">
           <span v-if="scope.row.taskTypeId == 1">{{
             scope.row.annualIncome
@@ -102,12 +42,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="(社保/公积金)是否变更"
-        align="center"
-        min-width="80"
-        prop="isChanged"
-      >
+      <el-table-column label="(社保/公积金)是否变更" align="center" min-width="80" prop="isChanged">
         <template #default="scope">
           <span v-if="scope.row.taskTypeId == 2 || scope.row.taskTypeId == 3">{{
             scope.row.isChanged ? "是" : "否"
@@ -115,47 +50,20 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="备注"
-        align="center"
-        min-width="150"
-        prop="remark"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        width="100"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="备注" align="center" min-width="150" prop="remark" />
+      <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button
-            link
-            type="warning"
-            size="small"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['priceList:priceList:save']"
-            >修改</el-button
-          >
-          <el-button
-            link
-            type="danger"
-            size="small"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['priceList:priceList:remove']"
-            >删除</el-button
-          >
+          <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
+            v-hasPermi="['priceList:priceList:save']">修改</el-button>
+          <el-button link type="danger" size="small" @click="handleDelete(scope.row)"
+            v-hasPermi="['priceList:priceList: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" />
 
     <!-- 表单 -->
     <priceList-form ref="priceListRef" :get-list="getList"></priceList-form>
@@ -185,7 +93,7 @@ const taskType = ref([]);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   price: null,
   annualIncome: null,
   isChanged: null,
@@ -254,7 +162,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功!");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */

+ 1 - 1
src/views/system/role/authUser.vue

@@ -71,7 +71,7 @@ const userIds = ref([]);
 
 const queryParams = reactive({
    pageNum: 1,
-   pageSize: 10,
+   pageSize: 20,
    roleId: route.params.roleId,
    userName: undefined,
    phonenumber: undefined,

+ 1 - 1
src/views/system/role/index.vue

@@ -223,7 +223,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     roleName: undefined,
     roleKey: undefined,
     status: undefined,

+ 1 - 1
src/views/system/role/selectUser.vue

@@ -70,7 +70,7 @@ const userIds = ref([])
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   roleId: undefined,
   userName: undefined,
   phonenumber: undefined

+ 65 - 259
src/views/system/user/index.vue

@@ -16,80 +16,35 @@
       <el-col :span="24" :xs="24">
         <!-- 功能按钮区 -->
         <div :gutter="10" class="list-btns-container">
-          <el-button
-            type="primary"
-            size="small"
-            icon="Plus"
-            @click="handleAdd"
-            v-hasPermi="['system:user:add']"
-            >新增</el-button
-          >
+          <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+            v-hasPermi="['system:user:add']">新增</el-button>
 
           <!-- <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
             v-hasPermi="['system:user:edit']">修改</el-button> -->
 
-          <el-button
-            type="danger"
-            size="small"
-            icon="Delete"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:user:remove']"
-            >删除</el-button
-          >
+          <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['system:user:remove']">删除</el-button>
 
-          <el-button
-            type="info"
-            size="small"
-            icon="Upload"
-            @click="handleImport"
-            v-hasPermi="['system:user:import']"
-            >导入</el-button
-          >
+          <el-button type="info" size="small" icon="Upload" @click="handleImport"
+            v-hasPermi="['system:user:import']">导入</el-button>
 
-          <el-button
-            type="info"
-            size="small"
-            icon="Download"
-            @click="handleExport"
-            v-hasPermi="['system:user:export']"
-            >导出</el-button
-          >
+          <el-button type="info" size="small" icon="Download" @click="handleExport"
+            v-hasPermi="['system:user:export']">导出</el-button>
           <!--
           <el-button type="info" size="small" icon="Download" @click="handleExportQc" v-hasPermi="['business:workpiece:export']">导出二维码</el-button>
           -->
           <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
         </div>
         <!-- 搜索区 -->
-        <el-form
-          :model="queryParams"
-          size="small"
-          ref="queryRef"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-          class="list-search-container"
-          style="padding-bottom: 10px; padding-top: 10px"
-        >
+        <el-form :model="queryParams" size="small" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"
+          class="list-search-container" style="padding-bottom: 10px; padding-top: 10px">
           <el-form-item label="用户名称:" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              size="small"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 130px"
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.userName" size="small" placeholder="请输入用户名称" clearable style="width: 130px"
+              @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item label="手机号码:" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              size="small"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 130px"
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.phonenumber" size="small" placeholder="请输入手机号码" clearable style="width: 130px"
+              @keyup.enter="handleQuery" />
           </el-form-item>
           <!-- <el-form-item label="状态:" prop="status">
             <el-select v-model="queryParams.status" size="small" placeholder="用户状态" clearable style="width: 130px">
@@ -108,61 +63,23 @@
           -->
           <el-form-item>
             <span>&emsp;&emsp;</span>
-            <el-button
-              type="primary"
-              size="small"
-              icon="Search"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="Refresh" size="small" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button type="primary" size="small" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
         <!-- 渲染数据区 -->
-        <el-table
-          v-loading="loading"
-          size="small"
-          :data="userList"
-          border
-          height="100%"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table v-loading="loading" size="small" :data="userList" border height="100%"
+          @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <!--<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />-->
-          <el-table-column
-            label="用户名称"
-            align="center"
-            key="userName"
-            prop="userName"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户昵称"
-            align="center"
-            key="nickName"
-            prop="nickName"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="部门"
-            align="center"
-            key="deptName"
-            prop="dept.deptName"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="手机号码"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            v-if="columns[4].visible"
-            width="120"
-          />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
           <!-- <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template #default="scope">
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@@ -176,50 +93,21 @@
             </template>
           </el-table-column>
           -->
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            v-if="columns[6].visible"
-            width="160"
-          >
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="200"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-button
-                link
-                type="warning"
-                size="small"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-                >修改</el-button
-              >
+              <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']">修改</el-button>
 
-              <el-button
-                link
-                size="small"
-                type="danger"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-                >删除</el-button
-              >
+              <el-button link size="small" type="danger" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']">删除</el-button>
 
-              <el-button
-                link
-                type="success"
-                size="small"
-                @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"
-                >重置密码</el-button
-              >
+              <el-button link type="success" size="small" @click="handleResetPwd(scope.row)"
+                v-hasPermi="['system:user:resetPwd']">重置密码</el-button>
 
               <!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                 <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
@@ -230,94 +118,47 @@
         </el-table>
       </el-col>
     </el-row>
-    <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="600px"
-      append-to-body
-      draggable
-    >
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body draggable>
       <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input
-                v-model="form.nickName"
-                placeholder="请输入用户昵称"
-                maxlength="30"
-              />
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select
-                v-model="form.deptId"
-                :data="deptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }"
-                value-key="id"
-                placeholder="请选择归属部门"
-                check-strictly
-                :render-after-expand="false"
-              />
+              <el-tree-select v-model="form.deptId" :data="deptOptions"
+                :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
+                check-strictly :render-after-expand="false" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input
-                v-model="form.phonenumber"
-                placeholder="请输入手机号码"
-                maxlength="11"
-              />
+              <el-input v-model="form.phonenumber" 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-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户名称"
-              prop="userName"
-            >
-              <el-input
-                v-model="form.userName"
-                placeholder="请输入用户名称"
-                maxlength="30"
-              />
+            <el-form-item v-if="form.userId == undefined" 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.userId == undefined"
-              label="用户密码"
-              prop="password"
-            >
-              <el-input
-                v-model="form.password"
-                placeholder="请输入用户密码"
-                type="password"
-                maxlength="20"
-                show-password
-              />
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -325,12 +166,8 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option
-                  v-for="dict in sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -345,13 +182,8 @@
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                  :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -369,11 +201,7 @@
         <el-row>
           <el-col :span="24">
             <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-col>
         </el-row>
@@ -387,26 +215,11 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog
-      :title="upload.title"
-      v-model="upload.open"
-      width="400px"
-      append-to-body
-      draggable
-    >
-      <el-upload
-        ref="uploadRef"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :fileList="fileList"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body draggable>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :fileList="fileList" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+        drag>
         <el-icon class="el-icon--upload">
           <upload-filled />
         </el-icon>
@@ -414,18 +227,11 @@
         <template #tip>
           <div class="el-upload__tip text-center">
             <div class="el-upload__tip">
-              <el-checkbox
-                v-model="upload.updateSupport"
-              />是否更新已经存在的用户数据
+              <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
             </div>
             <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link
-              type="primary"
-              :underline="false"
-              style="font-size: 12px; vertical-align: baseline"
-              @click="importTemplate"
-              >下载模板</el-link
-            >
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
           </div>
         </template>
       </el-upload>
@@ -509,7 +315,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     userName: undefined,
     phonenumber: undefined,
     status: undefined,
@@ -613,7 +419,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -674,7 +480,7 @@ function handleResetPwd(row) {
         proxy.$modal.msgSuccess("修改成功,新密码是:" + value);
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 选择条数  */
 function handleSelectionChange(selection) {
@@ -706,8 +512,8 @@ const handleFileSuccess = (response, file, fileList) => {
   proxy.$refs["uploadRef"].handleRemove(file);
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-      response.msg +
-      "</div>",
+    response.msg +
+    "</div>",
     "导入结果",
     { dangerouslyUseHTMLString: true }
   );

+ 1 - 1
src/views/tool/file/index.vue

@@ -107,7 +107,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 20
   },
   rules: {
     deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],

+ 8 - 22
src/views/tool/gen/importTable.vue

@@ -1,22 +1,12 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body draggable> 
+  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body draggable>
     <el-form :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="表名称" prop="tableName">
-        <el-input
-          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="表描述" prop="tableComment">
-        <el-input
-          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -24,20 +14,16 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange"
+        height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column prop="updateTime" label="更新时间"></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-row>
     <template #footer>
       <div class="dialog-footer">
@@ -59,7 +45,7 @@ const { proxy } = getCurrentInstance();
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   tableName: undefined,
   tableComment: undefined
 });

+ 47 - 192
src/views/tool/gen/index.vue

@@ -1,112 +1,43 @@
 <template>
   <div class="page-container list-container">
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        size="small"
-        icon="Download"
-        @click="handleGenTable"
-        v-hasPermi="['tool:gen:code']"
-        >生成</el-button
-      >
+      <el-button type="primary" size="small" icon="Download" @click="handleGenTable"
+        v-hasPermi="['tool:gen:code']">生成</el-button>
 
-      <el-button
-        type="info"
-        size="small"
-        icon="Upload"
-        @click="openImportTable"
-        v-hasPermi="['tool:gen:import']"
-        >导入</el-button
-      >
+      <el-button type="info" size="small" icon="Upload" @click="openImportTable"
+        v-hasPermi="['tool:gen:import']">导入</el-button>
 
-      <el-button
-        type="warning"
-        size="small"
-        icon="Edit"
-        :disabled="single"
-        @click="handleEditTable"
-        v-hasPermi="['tool:gen:edit']"
-        >修改</el-button
-      >
+      <el-button type="warning" size="small" icon="Edit" :disabled="single" @click="handleEditTable"
+        v-hasPermi="['tool:gen:edit']">修改</el-button>
 
-      <el-button
-        type="danger"
-        size="small"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['tool:gen:remove']"
-        >删除</el-button
-      >
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['tool:gen: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"
-    >
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="表名称:" prop="tableName">
-        <el-input
-          size="small"
-          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input size="small" v-model="queryParams.tableName" placeholder="请输入表名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="表描述:" prop="tableComment">
-        <el-input
-          size="small"
-          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input size="small" v-model="queryParams.tableComment" placeholder="请输入表描述" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="创建时间:" style="width: 308px">
-        <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"
-      v-loading="loading"
-      border
-      :data="tableList"
-      @selection-change="handleSelectionChange"
-      height="100%"
-    >
-      <el-table-column
-        type="selection"
-        align="center"
-        width="55"
-      ></el-table-column>
+    <el-table size="small" v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange"
+      height="100%">
+      <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template #default="scope">
           <span>{{
@@ -114,123 +45,47 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="表名称"
-        align="center"
-        prop="tableName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="表描述"
-        align="center"
-        prop="tableComment"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="实体"
-        align="center"
-        prop="className"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        width="160"
-      />
-      <el-table-column
-        label="更新时间"
-        align="center"
-        prop="updateTime"
-        width="160"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        width="330"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" />
+      <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" />
+      <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
+      <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-tooltip content="预览" placement="top">
-            <el-button
-              link
-              type="primary"
-              icon="View"
-              @click="handlePreview(scope.row)"
-              v-hasPermi="['tool:gen:preview']"
-            ></el-button>
+            <el-button link type="primary" icon="View" @click="handlePreview(scope.row)"
+              v-hasPermi="['tool:gen:preview']"></el-button>
           </el-tooltip>
           <el-tooltip content="编辑" placement="top">
-            <el-button
-              link
-              type="warning"
-              icon="Edit"
-              @click="handleEditTable(scope.row)"
-              v-hasPermi="['tool:gen:edit']"
-            ></el-button>
+            <el-button link type="warning" icon="Edit" @click="handleEditTable(scope.row)"
+              v-hasPermi="['tool:gen:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="删除" placement="top">
-            <el-button
-              link
-              type="danger"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['tool:gen:remove']"
-            ></el-button>
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['tool:gen:remove']"></el-button>
           </el-tooltip>
           <el-tooltip content="同步" placement="top">
-            <el-button
-              link
-              type="success"
-              icon="Refresh"
-              @click="handleSynchDb(scope.row)"
-              v-hasPermi="['tool:gen:edit']"
-            ></el-button>
+            <el-button link type="success" icon="Refresh" @click="handleSynchDb(scope.row)"
+              v-hasPermi="['tool:gen:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="生成代码" placement="top">
-            <el-button
-              link
-              type="info"
-              icon="Download"
-              @click="handleGenTable(scope.row)"
-              v-hasPermi="['tool:gen:code']"
-            ></el-button>
+            <el-button link type="info" icon="Download" @click="handleGenTable(scope.row)"
+              v-hasPermi="['tool:gen:code']"></el-button>
           </el-tooltip>
         </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="preview.title"
-      v-model="preview.open"
-      width="80%"
-      top="5vh"
-      append-to-body
-      class="scrollbar"
-      draggable
-    >
+    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar"
+      draggable>
       <el-tabs v-model="preview.activeName">
-        <el-tab-pane
-          v-for="(value, key) in preview.data"
+        <el-tab-pane v-for="(value, key) in preview.data"
           :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))"
-          :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))"
-          :key="value"
-        >
-          <el-link
-            :underline="false"
-            icon="DocumentCopy"
-            v-copyText="value"
-            v-copyText:callback="copyTextSuccess"
-            style="float: right"
-            >&nbsp;复制</el-link
-          >
+          :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))" :key="value">
+          <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess"
+            style="float: right">&nbsp;复制</el-link>
           <pre>{{ value }}</pre>
         </el-tab-pane>
       </el-tabs>
@@ -267,7 +122,7 @@ const uniqueId = ref("");
 const data = reactive({
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     tableName: undefined,
     tableComment: undefined,
   },
@@ -337,7 +192,7 @@ function handleSynchDb(row) {
     .then(() => {
       proxy.$modal.msgSuccess("同步成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 打开导入表弹窗 */
 function openImportTable() {
@@ -388,7 +243,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 getList();