合并冲突

src/api/business/payOutDetail.js

@@ -44,6 +44,15 @@ export function updatePayOutDetail(data) {
   })
 }
 
+// 调整薪资
+export function adjustSalary(data) {
+  return request({
+    url: '/business/payOutDetail/adjust/salary',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除发薪详情
 export function delPayOutDetail(id) {
   return request({

src/views/business/component/paidUsers.vue

@@ -17,8 +17,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="人员名称" prop="userName">
-                <el-input v-model="formData.userName" placeholder="请输入人员名称"></el-input>
+              <el-form-item label="员工姓名" prop="userName">
+                <el-input v-model="formData.userName" placeholder="请输入员工姓名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -421,7 +421,7 @@ export default {
           { required: true, message: '所属合同不能为空', trigger: 'blur' }
         ],
         userName: [
-          { required: true, message: '人员名称不能为空', trigger: 'blur' }
+          { required: true, message: '员工姓名不能为空', trigger: 'blur' }
         ],
         userCode: [
           { required: true, message: '身份证号不能为空', trigger: 'blur' }

src/views/business/outPersonal/index.vue

@@ -5,8 +5,8 @@
         <el-input v-model="queryParams.contractName" placeholder="请输入所属合同" clearable @keyup.enter.native="handleQuery"
           :disabled="true" />
       </el-form-item>
-      <el-form-item label="人员名称" prop="userName">
-        <el-input v-model="queryParams.userName" placeholder="请输入人员名称" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="员工姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="身份证号" prop="userCode">
         <el-input v-model="queryParams.userCode" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
@@ -47,7 +47,7 @@
     <el-table v-loading="loading" :data="outPersonalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="所属合同" align="center" prop="contractName" fixed />
-      <el-table-column label="人员名称" align="center" prop="userName" fixed />
+      <el-table-column label="员工姓名" align="center" prop="userName" fixed />
       <el-table-column label="身份证号" align="center" prop="userCode" fixed />
       <el-table-column label="收款账号" align="center" prop="payeeAccNo">
         <template slot-scope="scope">
@@ -109,8 +109,8 @@
         <el-form-item label="所属合同" prop="contractId">
           <el-input v-model="form.contractId" placeholder="请输入所属合同" />
         </el-form-item>
-        <el-form-item label="人员名称" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入人员名称" />
+        <el-form-item label="员工姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入员工姓名" />
         </el-form-item>
         <el-form-item label="身份证号" prop="userCode">
           <el-input v-model="form.userCode" placeholder="请输入身份证号" />
@@ -312,7 +312,7 @@ export default {
           { required: true, message: "所属合同不能为空", trigger: "blur" }
         ],
         userName: [
-          { required: true, message: "人员名称不能为空", trigger: "blur" }
+          { required: true, message: "员工姓名不能为空", trigger: "blur" }
         ],
         userCode: [
           { required: true, message: "身份证号不能为空", trigger: "blur" }

src/views/business/payOutDetail/list.vue

@@ -4,18 +4,14 @@
       <el-form-item label="任务名称" v-show="batchName">
         <el-input v-model="batchName" disabled />
       </el-form-item>
-      <el-form-item label="人员名称" prop="userName">
-        <el-input v-model="queryParams.userName" placeholder="请输入人员名称" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="员工姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="身份证号" prop="userCode">
         <el-input v-model="queryParams.userCode" placeholder="请输入人员身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="发放单位" prop="companyName">
-        <el-input v-model="queryParams.companyName" placeholder="请输入发放单位" clearable @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 label="用工单位" prop="companyName">
+        <el-input v-model="queryParams.companyName" placeholder="用工单位" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -49,19 +45,19 @@
 
     <el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工资月份" align="center" prop="salaryMonth">
+      <el-table-column label="工资月份" align="center" prop="salaryMonth" fixed>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.salaryMonth, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="人员姓名" align="center" prop="userName" fixed />
+      <el-table-column label="身份证号" align="center" prop="userCode" fixed />
       <el-table-column label="发放单位" align="center" prop="companyName">
         <template slot-scope="scope">
           {{ scope.row.companyName }}
           <el-tag>{{ scope.row.companyCode }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="人员名称" align="center" prop="userName" />
-      <el-table-column label="身份证号" align="center" prop="userCode" />
       <el-table-column label="性别" align="center" prop="gender" />
       <el-table-column label="收款账号" align="center" prop="payeeAccNo">
         <template slot-scope="scope">
@@ -192,8 +188,8 @@
         <el-form-item label="收薪人员ID" prop="personalId">
           <el-input v-model="form.personalId" placeholder="请输入收薪人员ID" />
         </el-form-item>
-        <el-form-item label="人员名称" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入人员名称" />
+        <el-form-item label="员工姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入员工姓名" />
         </el-form-item>
         <el-form-item label="人员身份证号" prop="userCode">
           <el-input v-model="form.userCode" placeholder="请输入人员身份证号" />
@@ -469,7 +465,7 @@ export default {
           { required: true, message: '收薪人员ID不能为空', trigger: 'blur' }
         ],
         userName: [
-          { required: true, message: '人员名称不能为空', trigger: 'blur' }
+          { required: true, message: '员工姓名不能为空', trigger: 'blur' }
         ],
         userCode: [
           { required: true, message: '人员身份证号不能为空', trigger: 'blur' }

src/views/business/payOutRecord/index.vue

@@ -52,8 +52,18 @@
     <el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务名称" align="center" prop="batchName" />
-      <el-table-column label="发薪单位" align="center" prop="companyName" />
+      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="用工单位" align="center" prop="companyName" />
       <el-table-column label="下发人数" align="center" prop="totalCount" />
+      <el-table-column label="下发情况" align="center" prop="totalCount">
+        <template slot-scope="scope">
+          <p style="margin: 0px;padding: 0px; color: #13ce66">成功笔数：{{ scope.row.successCount }}</p>
+          <p style="margin: 0px;padding: 0px; color: #13ce66">成功金额：{{ scope.row.successAmount }}</p>
+          <p style="margin: 0px;padding: 0px; color: #ffa4a4">失败笔数：{{ scope.row.failCount }}</p>
+          <p style="margin: 0px;padding: 0px; color: #ffa4a4">失败金额：{{ scope.row.failAmount }}</p>
+          <p style="margin: 0px;padding: 0px;">服务费：{{ scope.row.feeAmount }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="总金额" align="center" prop="totalAmount" />
       <el-table-column label="生成时间" align="center" prop="createTime">
         <template slot-scope="scope">