优化

src/api/business/bank.js

+import request from '@/utils/request'
+
+// 查询商户付款账户列表
+export function pageBanks(bankName) {
+  return request({
+    url: '/business/bank/info/list',
+    method: 'get',
+    params: {
+      bankName: bankName,
+      pageNum: 1,
+      pageSize: 100
+    }
+  })
+}

src/api/business/payOutRecord.js

@@ -35,6 +35,15 @@ export function addPayOutRecord(data) {
   })
 }
 
+// 新增发薪批次信息
+export function buildPayOutRecord(data) {
+  return request({
+    url: '/business/payOutRecord/build',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改发薪批次信息
 export function updatePayOutRecord(data) {
   return request({

src/views/business/outContract/index.vue

@@ -35,6 +35,10 @@
         <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['business:outContract:edit']">修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" icon="el-icon-help" size="mini" :disabled="single" @click="createBatchTask"
+                   v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['business:outContract:remove']">删除</el-button>
@@ -52,10 +56,9 @@
       <el-table-column label="合同编号" align="center" prop="contractCode" fixed />
       <el-table-column label="单位名称" align="center" prop="groupName" fixed />
       <el-table-column label="单位信用代码" align="center" prop="groupCode" />
-      <el-table-column label="五险一金承担方式" align="center" prop="bearType">
+      <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.bearType && 1 == scope.row.bearType">各自承担</el-tag>
-          <el-tag type="success" v-if="scope.row.bearType && 2 == scope.row.bearType">个人承担全部</el-tag>
+          <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType"/>
         </template>
       </el-table-column>
       <el-table-column label="保险缴纳基数">
@@ -91,6 +94,8 @@
             v-hasPermi="['business:outContract:remove']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-user" @click="staffManage(scope.row)"
             v-hasPermi="['business:outContract:manage']">员工管理</el-button>
+          <el-button type="text" icon="el-icon-s-help" size="mini" @click="createBatchTaskOne(scope.row)"
+                     v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -179,16 +184,62 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 生成发薪任务窗口 -->
+    <el-dialog title="生成发薪任务" :visible.sync="bcoOpen" width="500px" append-to-body>
+      <el-form ref="bcoForm" :model="bcoForm" :rules="bcoFormRules" label-width="80px">
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="bcoForm.contractName" disabled placeholder="请输入合同名称" />
+        </el-form-item>
+        <el-form-item label="任务名称" prop="taskName">
+          <el-input v-model="bcoForm.taskName" placeholder="请输入任务名称" />
+        </el-form-item>
+        <el-form-item label="工资月份" prop="salaryMonth">
+          <el-date-picker
+            v-model="bcoForm.salaryMonth"
+            type="month"
+            placeholder="选择月">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitBcoForm">确 定</el-button>
+        <el-button @click="bcoOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listOutContract, getOutContract, delOutContract, addOutContract, updateOutContract } from "@/api/business/outContract";
+import { listOutContract, delOutContract, addOutContract, updateOutContract } from "@/api/business/outContract";
+import { buildPayOutRecord } from '@/api/business/payOutRecord'
 
 export default {
   name: "OutContract",
+  dicts: ['bx_bear_type'],
   data() {
     return {
+      // 生成发薪任务相关字段
+      bcoOpen: false,
+      bcoForm: {
+        targetIds: [],
+        targetType: 1,
+        taskName: null,
+        contractName: null,
+        salaryMonth: null,
+      },
+      bcoFormRules: {
+        salaryMonth: [
+          { required: true, message: "工资月份不能为空", trigger: "blur" }
+        ],
+        taskName: [
+          { required: true, message: "任务名称不能为空", trigger: "blur" }
+        ],
+        targetIds: [
+          { required: true, message: "合同不能为空", trigger: "blur" }
+        ],
+      },
+      // 生成发薪任务字段  --   结束
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -449,6 +500,29 @@ export default {
       this.download('business/outContract/export', {
         ...this.queryParams
       }, `outContract_${new Date().getTime()}.xlsx`)
+    },
+    createBatchTask() {
+      const ids = row.id || this.ids;
+
+    },
+    // 单条生成发薪任务
+    createBatchTaskOne(row) {
+      this.bcoForm.contractName = row.contractName
+      this.bcoForm.targetIds[0] = row.id
+      this.bcoOpen = true
+    },
+    submitBcoForm() {
+      this.$refs["bcoForm"].validate(valid => {
+        if (valid) {
+          console.log(this.bcoForm);
+          buildPayOutRecord(this.bcoForm).then(resp => {
+            if (resp.code == 200) {
+              this.bcoOpen = false
+              this.$modal.alertSuccess("操作成功,请耐心等待任务生成")
+            }
+          })
+        }
+      });
     }
   }
 };

src/views/business/outPersonal/index.vue

@@ -48,18 +48,16 @@
       <el-table-column label="收款账号" align="center" prop="payeeAccNo">
         <template slot-scope="scope">
             {{ scope.row.payeeAccNo }}
-          <el-tag v-if="scope.row.payeeAccType && 2 == scope.row.payeeAccType">支付宝</el-tag>
-          <el-tag type="success" v-if="scope.row.payeeAccType && 1 == scope.row.payeeAccType">银行卡</el-tag>
+          <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.bearType"/>
         </template>
       </el-table-column>
       <el-table-column label="岗位名称" align="center" prop="postName" />
       <el-table-column label="岗位工资(￥)" align="center" prop="postWage" />
       <el-table-column label="应发工资(￥)" align="center" prop="salaryPayable" />
       <el-table-column label="实发金额(￥)" align="center" prop="actualPayable" />
-      <el-table-column label="五险一金承担方式" align="center" prop="bearType">
+      <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.bearType && 1 == scope.row.bearType">各自承担</el-tag>
-          <el-tag type="success" v-if="scope.row.bearType && 2 == scope.row.bearType">个人承担全部</el-tag>
+          <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType"/>
         </template>
       </el-table-column>
       <el-table-column label="保险缴纳基数">
@@ -112,6 +110,24 @@
         <el-form-item label="身份证号" prop="userCode">
           <el-input v-model="form.userCode" placeholder="请输入身份证号" />
         </el-form-item>
+        <el-form-item label="开户行" prop="userCode">
+          <el-select
+            v-model="form.payeeAccBank"
+            multiple
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入关键词"
+            :remote-method="listBanks"
+            :loading="loading">
+            <el-option
+              v-for="item in banks"
+              :key="item.bankName"
+              :label="item.bankName"
+              :value="item.bankName">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="收款账号" prop="payeeAccNo">
           <el-input v-model="form.payeeAccNo" placeholder="请输入收款账号" />
         </el-form-item>
@@ -199,10 +215,13 @@
 <script>
 import { listOutPersonal, getOutPersonal, delOutPersonal, addOutPersonal, updateOutPersonal } from "@/api/business/outPersonal";
 
+
 export default {
   name: "OutPersonal",
+  dicts: ['bx_bear_type', 'payee_acc_type'],
   data() {
     return {
+      banks: [],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层

src/views/business/payOutRecord/index.vue

@@ -94,6 +94,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.payStatus && scope.row.payStatus > 0"
             v-hasPermi="['business:payOutRecord:edit']"
           >修改</el-button>
           <el-button
@@ -101,8 +102,17 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.payStatus && scope.row.payStatus > 0"
             v-hasPermi="['business:payOutRecord:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-grid"
+            @click="batchDetails(scope.row)"
+            v-if="scope.row.payStatus && scope.row.payStatus > 0"
+            v-hasPermi="['business:payOutRecord:list']"
+          >发薪详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -381,6 +391,9 @@ export default {
       this.download('business/payOutRecord/export', {
         ...this.queryParams
       }, `payOutRecord_${new Date().getTime()}.xlsx`)
+    },
+    batchDetails(row) {
+      this.$router.push({ path: "/business/payOutDetail", query: { batchNo: row.batchNo, batchName: row.batchName } });
     }
   }
 };