细节优化

ac187ee5 · 许珑标 · 8e72331c · ac187ee5 · ac187ee5 · ac187ee5
Commit ac187ee5 authored Jan 03, 2025 by 许珑标
4 changed files
--- a/src/views/business/outContract/index.vue
+++ b/src/views/business/outContract/index.vue
@@ -59,28 +59,28 @@
        </template>
      </el-table-column>
      <el-table-column label="保险缴纳基数">
-        <el-table-column label="失业保险缴费基数" align="center" prop="sybxBase" />
-        <el-table-column label="养老保险缴费基数" align="center" prop="ylbxBase" />
-        <el-table-column label="工伤保险缴费基数" align="center" prop="gsbxBase" />
-        <el-table-column label="医疗保险缴费基数" align="center" prop="ysbxBase" />
-        <el-table-column label="生育保险缴费基数" align="center" prop="syubxBase" />
-        <el-table-column label="公积金缴费基数" align="center" prop="providentFundBase" />
+        <el-table-column label="失业保险(￥)" align="center" prop="sybxBase" />
+        <el-table-column label="养老保险(￥)" align="center" prop="ylbxBase" />
+        <el-table-column label="工伤保险(￥)" align="center" prop="gsbxBase" />
+        <el-table-column label="医疗保险(￥)" align="center" prop="ysbxBase" />
+        <el-table-column label="生育保险(￥)" align="center" prop="syubxBase" />
+        <el-table-column label="公积金(￥)" align="center" prop="providentFundBase" />
      </el-table-column>
-      <el-table-column label="单位缴纳保险">
-        <el-table-column label="失业保险公司承担比例" align="center" prop="sybxCompanyRate" />
-        <el-table-column label="养老保险公司承担比例" align="center" prop="ylbxCompanyRate" />
-        <el-table-column label="工伤保险公司承担比例" align="center" prop="gsbxCompanyRate" />
-        <el-table-column label="医疗保险公司承担比例" align="center" prop="ysbxCompanyRate" />
-        <el-table-column label="生育保险公司承担比例" align="center" prop="syubxCompanyRate" />
-        <el-table-column label="公积金企业承担比例" align="center" prop="providentFundCompanyRate" />
+      <el-table-column label="单位缴纳保险比例">
+        <el-table-column label="失业保险(%)" align="center" prop="sybxCompanyRate" />
+        <el-table-column label="养老保险(%)" align="center" prop="ylbxCompanyRate" />
+        <el-table-column label="工伤保险(%)" align="center" prop="gsbxCompanyRate" />
+        <el-table-column label="医疗保险(%)" align="center" prop="ysbxCompanyRate" />
+        <el-table-column label="生育保险(%)" align="center" prop="syubxCompanyRate" />
+        <el-table-column label="公积金(%)" align="center" prop="providentFundCompanyRate" />
      </el-table-column>
-      <el-table-column label="个人缴纳保险">
-        <el-table-column label="失业保险个人承担比例" align="center" prop="sybxPersonalRate" />
-        <el-table-column label="养老保险个人承担比例" align="center" prop="ylbxPersonalRate" />
-        <el-table-column label="工伤保险个人承担比例" align="center" prop="gsbxPersonalRate" />
-        <el-table-column label="医疗保险个人承担比例" align="center" prop="ysbxPersonalRate" />
-        <el-table-column label="生育保险个人承担比例" align="center" prop="syubxPersonalRate" />
-        <el-table-column label="公积金个人承担比例" align="center" prop="providentFundPersonalRate" />
+      <el-table-column label="个人缴纳保险比例">
+        <el-table-column label="失业保险(%)" align="center" prop="sybxPersonalRate" />
+        <el-table-column label="养老保险(%)" align="center" prop="ylbxPersonalRate" />
+        <el-table-column label="工伤保险(%)" align="center" prop="gsbxPersonalRate" />
+        <el-table-column label="医疗保险(%)" align="center" prop="ysbxPersonalRate" />
+        <el-table-column label="生育保险(%)" align="center" prop="syubxPersonalRate" />
+        <el-table-column label="公积金(%)" align="center" prop="providentFundPersonalRate" />
      </el-table-column>
      <el-table-column label="管理费" align="center" prop="operationCost" />
      <el-table-column label="操作" align="center" width="120px" class-name="small-padding fixed-width" fixed="right">

--- a/src/views/business/outPersonal/index.vue
+++ b/src/views/business/outPersonal/index.vue
--- a/src/views/business/payOutRecord/index.vue
+++ b/src/views/business/payOutRecord/index.vue
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="发薪批/任务次名称" prop="batchName">
+      <el-form-item label="任务名称" prop="batchName">
        <el-input
          v-model="queryParams.batchName"
-          placeholder="请输入发薪批/任务次名称"
+          placeholder="请输入发薪任务名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发薪完成时间" prop="payTime">
-        <el-date-picker clearable
-          v-model="queryParams.payTime"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择发薪完成时间">
-        </el-date-picker>
-      </el-form-item>
      <el-form-item label="发薪单位" prop="companyName">
        <el-input
          v-model="queryParams.companyName"
@@ -25,85 +17,11 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发薪单位编码(信用代码)" prop="companyCode">
-        <el-input
-          v-model="queryParams.companyCode"
-          placeholder="请输入发薪单位编码(信用代码)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工资批次编号" prop="batchNo">
-        <el-input
-          v-model="queryParams.batchNo"
-          placeholder="请输入工资批次编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工资所属月份" prop="salaryMonth">
-        <el-date-picker clearable
-          v-model="queryParams.salaryMonth"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择工资所属月份">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="发放条数" prop="totalCount">
-        <el-input
-          v-model="queryParams.totalCount"
-          placeholder="请输入发放条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发放总金额" prop="totalAmount">
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入发放总金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="成功条数" prop="successCount">
-        <el-input
-          v-model="queryParams.successCount"
-          placeholder="请输入成功条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="成功金额" prop="successAmount">
-        <el-input
-          v-model="queryParams.successAmount"
-          placeholder="请输入成功金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="失败条数" prop="failCount">
-        <el-input
-          v-model="queryParams.failCount"
-          placeholder="请输入失败条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="失败金额" prop="failAmount">
-        <el-input
-          v-model="queryParams.failAmount"
-          placeholder="请输入失败金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入所属部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="下发状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
+          <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
+                     :value="dict.value" />
+        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -155,29 +73,20 @@

    <el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="发薪批/任务次名称" align="center" prop="batchName" />
-      <el-table-column label="发薪完成时间" align="center" prop="payTime" width="180">
+      <el-table-column label="任务名称" align="center" prop="batchName" />
+      <el-table-column label="发薪单位" align="center" prop="companyName" />
+      <el-table-column label="下发人数" align="center" prop="totalCount" />
+      <el-table-column label="总金额" align="center" prop="totalAmount" />
+      <el-table-column label="生成时间" align="center" prop="createTime" >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="发薪单位" align="center" prop="companyName" />
-      <el-table-column label="发薪单位编码(信用代码)" align="center" prop="companyCode" />
-      <el-table-column label="工资批次编号" align="center" prop="batchNo" />
-      <el-table-column label="工资所属月份" align="center" prop="salaryMonth" width="180">
+      <el-table-column label="下发状态" align="center" prop="payStatus">
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.salaryMonth) }}</span>
+          <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
        </template>
      </el-table-column>
-      <el-table-column label="发放状态" align="center" prop="payStatus" />
-      <el-table-column label="发放条数" align="center" prop="totalCount" />
-      <el-table-column label="发放总金额" align="center" prop="totalAmount" />
-      <el-table-column label="成功条数" align="center" prop="successCount" />
-      <el-table-column label="成功金额" align="center" prop="successAmount" />
-      <el-table-column label="失败条数" align="center" prop="failCount" />
-      <el-table-column label="失败金额" align="center" prop="failAmount" />
-      <el-table-column label="所属部门" align="center" prop="deptId" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up

 export default {
  name: "PayOutRecord",
+  dicts: ['pay_status'],
  data() {
    return {
      // 根路径

--- a/src/views/business/payOutRecord/payOutRecord.vue
+++ b/src/views/business/payOutRecord/payOutRecord.vue
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="发薪批/任务次名称" prop="batchName">
+      <el-form-item label="任务名称" prop="batchName">
        <el-input
          v-model="queryParams.batchName"
-          placeholder="请输入发薪批/任务次名称"
+          placeholder="请输入发薪任务名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发薪完成时间" prop="payTime">
-        <el-date-picker clearable
-                        v-model="queryParams.payTime"
-                        type="date"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择发薪完成时间">
-        </el-date-picker>
-      </el-form-item>
      <el-form-item label="发薪单位" prop="companyName">
        <el-input
          v-model="queryParams.companyName"
@@ -25,85 +17,11 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发薪单位编码(信用代码)" prop="companyCode">
-        <el-input
-          v-model="queryParams.companyCode"
-          placeholder="请输入发薪单位编码(信用代码)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工资批次编号" prop="batchNo">
-        <el-input
-          v-model="queryParams.batchNo"
-          placeholder="请输入工资批次编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工资所属月份" prop="salaryMonth">
-        <el-date-picker clearable
-                        v-model="queryParams.salaryMonth"
-                        type="date"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择工资所属月份">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="发放条数" prop="totalCount">
-        <el-input
-          v-model="queryParams.totalCount"
-          placeholder="请输入发放条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发放总金额" prop="totalAmount">
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入发放总金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="成功条数" prop="successCount">
-        <el-input
-          v-model="queryParams.successCount"
-          placeholder="请输入成功条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="成功金额" prop="successAmount">
-        <el-input
-          v-model="queryParams.successAmount"
-          placeholder="请输入成功金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="失败条数" prop="failCount">
-        <el-input
-          v-model="queryParams.failCount"
-          placeholder="请输入失败条数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="失败金额" prop="failAmount">
-        <el-input
-          v-model="queryParams.failAmount"
-          placeholder="请输入失败金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入所属部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="下发状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
+          <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
+                     :value="dict.value" />
+        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -155,29 +73,20 @@

    <el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="发薪批/任务次名称" align="center" prop="batchName" />
-      <el-table-column label="发薪完成时间" align="center" prop="payTime" width="180">
+      <el-table-column label="任务名称" align="center" prop="batchName" />
+      <el-table-column label="发薪单位" align="center" prop="companyName" />
+      <el-table-column label="下发人数" align="center" prop="totalCount" />
+      <el-table-column label="总金额" align="center" prop="totalAmount" />
+      <el-table-column label="生成时间" align="center" prop="createTime" >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="发薪单位" align="center" prop="companyName" />
-      <el-table-column label="发薪单位编码(信用代码)" align="center" prop="companyCode" />
-      <el-table-column label="工资批次编号" align="center" prop="batchNo" />
-      <el-table-column label="工资所属月份" align="center" prop="salaryMonth" width="180">
+      <el-table-column label="下发状态" align="center" prop="payStatus">
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.salaryMonth) }}</span>
+          <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
        </template>
      </el-table-column>
-      <el-table-column label="发放状态" align="center" prop="payStatus" />
-      <el-table-column label="发放条数" align="center" prop="totalCount" />
-      <el-table-column label="发放总金额" align="center" prop="totalAmount" />
-      <el-table-column label="成功条数" align="center" prop="successCount" />
-      <el-table-column label="成功金额" align="center" prop="successAmount" />
-      <el-table-column label="失败条数" align="center" prop="failCount" />
-      <el-table-column label="失败金额" align="center" prop="failAmount" />
-      <el-table-column label="所属部门" align="center" prop="deptId" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -272,6 +181,7 @@ import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, up

 export default {
  name: "PayOutRecord",
+  dicts: ['pay_status'],
  data() {
    return {
      // 根路径
@@ -464,7 +374,8 @@ export default {
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
    },
    /** 导出按钮操作 */
    handleExport() {