优化、发薪

src/api/business/payAcc.js

+import request from '@/utils/request'
+
+export function listPayAccInfo() {
+  return request({
+    url: '/business/accInfo/listAll',
+    method: 'get',
+  })
+}

src/views/business/component/paidUsers.vue

@@ -132,7 +132,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ ylbxCompanyRateAmount }}</div>
+              <div class="amountMain">{{ ylbxCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="ylbxPersonalRate">
@@ -143,7 +143,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ ylbxPersonalRateAmount }}</div>
+              <div class="amountMain">{{ ylbxPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 工伤保险 -->
@@ -168,7 +168,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ gsbxCompanyRateAmount }}</div>
+              <div class="amountMain">{{ gsbxCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="gsbxPersonalRate">
@@ -179,7 +179,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ gsbxPersonalRateAmount }}</div>
+              <div class="amountMain">{{ gsbxPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 医疗保险 -->
@@ -204,7 +204,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ ysbxCompanyRateAmount }}</div>
+              <div class="amountMain">{{ ysbxCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="ysbxPersonalRate">
@@ -215,7 +215,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ ysbxPersonalRateAmount }}</div>
+              <div class="amountMain">{{ ysbxPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 失业保险 -->
@@ -240,7 +240,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ sybxCompanyRateAmount }}</div>
+              <div class="amountMain">{{ sybxCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="sybxPersonalRate">
@@ -251,7 +251,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ sybxPersonalRateAmount }}</div>
+              <div class="amountMain">{{ sybxPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 生育保险 -->
@@ -276,7 +276,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ syubxCompanyRateAmount }}</div>
+              <div class="amountMain">{{ syubxCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="syubxPersonalRate">
@@ -287,7 +287,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ syubxPersonalRateAmount }}</div>
+              <div class="amountMain">{{ syubxPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 公积金 -->
@@ -313,7 +313,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ providentFundCompanyRateAmount }}</div>
+              <div class="amountMain">{{ providentFundCompanyMoney }}</div>
             </el-col>
             <el-col :span="5">
               <el-form-item label-width="0px" prop="providentFundPersonalRate">
@@ -325,7 +325,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <div class="amountMain">{{ providentFundPersonalRateAmount }}</div>
+              <div class="amountMain">{{ providentFundPersonalMoney }}</div>
             </el-col>
           </el-row>
           <!-- 合计金额 -->
@@ -561,18 +561,18 @@ export default {
         ]
       },
       radio: 1,
-      ylbxCompanyRateAmount: '--',//养老保险单位金额
-      ylbxPersonalRateAmount: '--',//养老保险个人金额
-      gsbxCompanyRateAmount: '--',//工伤保险单位金额
-      gsbxPersonalRateAmount: '--',//工伤保险个人金额
-      ysbxCompanyRateAmount: '--',//医疗保险单位金额
-      ysbxPersonalRateAmount: '--',//医疗保险个人金额
-      sybxCompanyRateAmount: '--',//失业保险单位金额
-      sybxPersonalRateAmount: '--',//个人保险个人金额
-      syubxCompanyRateAmount: '--',//生育保险单位金额
-      syubxPersonalRateAmount: '--',//生育保险个人金额
-      providentFundCompanyRateAmount: '--',//公积金单位金额
-      providentFundPersonalRateAmount: '--',//公积金个人金额
+      ylbxCompanyMoney: '--',//养老保险单位金额
+      ylbxPersonalMoney: '--',//养老保险个人金额
+      gsbxCompanyMoney: '--',//工伤保险单位金额
+      gsbxPersonalMoney: '--',//工伤保险个人金额
+      ysbxCompanyMoney: '--',//医疗保险单位金额
+      ysbxPersonalMoney: '--',//医疗保险个人金额
+      sybxCompanyMoney: '--',//失业保险单位金额
+      sybxPersonalMoney: '--',//个人保险个人金额
+      syubxCompanyMoney: '--',//生育保险单位金额
+      syubxPersonalMoney: '--',//生育保险个人金额
+      providentFundCompanyMoney: '--',//公积金单位金额
+      providentFundPersonalMoney: '--',//公积金个人金额
       companyTotalAmount: '--',//单位总金额
       personTotalAmount: '--',//个人总金额
       // 控制计算按钮是否显示与隐藏
@@ -594,7 +594,6 @@ export default {
         this.formData.contractName = this.$route.query.contractName
       }
     }
-
   },
   methods: {
     // 计算方法
@@ -680,46 +679,46 @@ export default {
     TotalAmountFN() {
       // 单位总金额计算
       this.companyTotalAmount = 0
-      if (this.ylbxCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.ylbxCompanyRateAmount)
+      if (this.ylbxCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.ylbxCompanyMoney)
       }
-      if (this.gsbxCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.gsbxCompanyRateAmount)
+      if (this.gsbxCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.gsbxCompanyMoney)
       }
-      if (this.ysbxCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.ysbxCompanyRateAmount)
+      if (this.ysbxCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.ysbxCompanyMoney)
       }
-      if (this.sybxCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.sybxCompanyRateAmount)
+      if (this.sybxCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.sybxCompanyMoney)
       }
-      if (this.syubxCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.syubxCompanyRateAmount)
+      if (this.syubxCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.syubxCompanyMoney)
       }
-      if (this.providentFundCompanyRateAmount != '--') {
-        this.companyTotalAmount += Number(this.providentFundCompanyRateAmount)
+      if (this.providentFundCompanyMoney != '--') {
+        this.companyTotalAmount += Number(this.providentFundCompanyMoney)
       }
       if (this.companyTotalAmount == 0) {
         this.companyTotalAmount = '--'
       }
       // 个人总金额方法
       this.personTotalAmount = 0
-      if (this.ylbxPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.ylbxPersonalRateAmount)
+      if (this.ylbxPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.ylbxPersonalMoney)
       }
-      if (this.gsbxPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.gsbxPersonalRateAmount)
+      if (this.gsbxPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.gsbxPersonalMoney)
       }
-      if (this.ysbxPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.ysbxPersonalRateAmount)
+      if (this.ysbxPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.ysbxPersonalMoney)
       }
-      if (this.sybxPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.sybxPersonalRateAmount)
+      if (this.sybxPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.sybxPersonalMoney)
       }
-      if (this.syubxPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.syubxPersonalRateAmount)
+      if (this.syubxPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.syubxPersonalMoney)
       }
-      if (this.providentFundPersonalRateAmount != '--') {
-        this.personTotalAmount += Number(this.providentFundPersonalRateAmount)
+      if (this.providentFundPersonalMoney != '--') {
+        this.personTotalAmount += Number(this.providentFundPersonalMoney)
       }
       if (this.personTotalAmount == 0) {
         this.personTotalAmount = '--'
@@ -747,65 +746,65 @@ export default {
       this.$refs['formRef'].validate(valid => {
         if (valid) {
           this.formData.bxMoneyTemplate = {}
-          if (this.ylbxCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.ylbxCompanyRateAmount = 0
+          if (this.ylbxCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.ylbxCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.ylbxCompanyRateAmount = Number(this.ylbxCompanyRateAmount)
+            this.formData.bxMoneyTemplate.ylbxCompanyMoney = Number(this.ylbxCompanyMoney)
           }
-          if (this.ylbxPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.ylbxPersonalRateAmount = '--'
+          if (this.ylbxPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.ylbxPersonaleAmount = '--'
           } else {
-            this.formData.bxMoneyTemplate.ylbxPersonalRateAmount = Number(this.ylbxPersonalRateAmount)
+            this.formData.bxMoneyTemplate.ylbxPersonalMoney = Number(this.ylbxPersonalMoney)
           }
-          if (this.gsbxCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.gsbxCompanyRateAmount = 0
+          if (this.gsbxCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.gsbxCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.gsbxCompanyRateAmount = Number(this.gsbxCompanyRateAmount)
+            this.formData.bxMoneyTemplate.gsbxCompanyMoney = Number(this.gsbxCompanyMoney)
           }
-          if (this.gsbxPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.gsbxPersonalRateAmount = 0
+          if (this.gsbxPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.gsbxPersonalMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.gsbxPersonalRateAmount = Number(this.gsbxPersonalRateAmount)
+            this.formData.bxMoneyTemplate.gsbxPersonalMoney = Number(this.gsbxPersonalMoney)
           }
-          if (this.ysbxCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.ysbxCompanyRateAmount = 0
+          if (this.ysbxCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.ysbxCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.ysbxCompanyRateAmount = Number(this.ysbxCompanyRateAmount)
+            this.formData.bxMoneyTemplate.ysbxCompanyMoney = Number(this.ysbxCompanyMoney)
           }
-          if (this.ysbxPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.ysbxPersonalRateAmount = 0
+          if (this.ysbxPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.ysbxPersonalMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.ysbxPersonalRateAmount = Number(this.ysbxPersonalRateAmount)
+            this.formData.bxMoneyTemplate.ysbxPersonalMoney = Number(this.ysbxPersonalMoney)
           }
-          if (this.sybxCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.sybxCompanyRateAmount = 0
+          if (this.sybxCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.sybxCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.sybxCompanyRateAmount = Number(this.sybxCompanyRateAmount)
+            this.formData.bxMoneyTemplate.sybxCompanyMoney = Number(this.sybxCompanyMoney)
           }
-          if (this.sybxPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.sybxPersonalRateAmount = 0
+          if (this.sybxPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.sybxPersonalMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.sybxPersonalRateAmount = Number(this.sybxPersonalRateAmount)
+            this.formData.bxMoneyTemplate.sybxPersonalMoney = Number(this.sybxPersonalMoney)
           }
-          if (this.syubxCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.syubxCompanyRateAmount = 0
+          if (this.syubxCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.syubxCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.syubxCompanyRateAmount = Number(this.syubxCompanyRateAmount)
+            this.formData.bxMoneyTemplate.syubxCompanyMoney = Number(this.syubxCompanyMoney)
           }
-          if (this.syubxPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.syubxPersonalRateAmount = 0
+          if (this.syubxPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.syubxPersonalMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.syubxPersonalRateAmount = Number(this.syubxPersonalRateAmount)
+            this.formData.bxMoneyTemplate.syubxPersonalMoney = Number(this.syubxPersonalMoney)
           }
-          if (this.providentFundCompanyRateAmount == '--') {
-            this.formData.bxMoneyTemplate.providentFundCompanyRateAmount = 0
+          if (this.providentFundCompanyMoney == '--') {
+            this.formData.bxMoneyTemplate.providentFundCompanyMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.providentFundCompanyRateAmount = Number(this.providentFundCompanyRateAmount)
+            this.formData.bxMoneyTemplate.providentFundCompanyMoney = Number(this.providentFundCompanyMoney)
           }
-          if (this.providentFundPersonalRateAmount == '--') {
-            this.formData.bxMoneyTemplate.providentFundPersonalRateAmount = 0
+          if (this.providentFundPersonalMoney == '--') {
+            this.formData.bxMoneyTemplate.providentFundPersonalMoney = 0
           } else {
-            this.formData.bxMoneyTemplate.providentFundPersonalRateAmount = Number(this.providentFundPersonalRateAmount)
+            this.formData.bxMoneyTemplate.providentFundPersonalMoney = Number(this.providentFundPersonalMoney)
           }
           if (this.formData.id != null) {
             updateOutPersonal(this.formData).then(response => {
@@ -887,192 +886,192 @@ export default {
     // 公积金个人比例变化执行
     providentFundPersonalRateChange(e) {
       if (this.formData.providentFundBase > 0 && e > 0) {
-        this.providentFundPersonalRateAmount = (this.formData.providentFundBase * e / 100).toFixed(2)
+        this.providentFundPersonalMoney = (this.formData.providentFundBase * e / 100).toFixed(2)
       } else {
-        this.providentFundPersonalRateAmount = '--'
+        this.providentFundPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 公积金单位比例变化执行
     providentFundCompanyRateChange(e) {
       if (this.formData.providentFundBase > 0 && e > 0) {
-        this.providentFundCompanyRateAmount = (this.formData.providentFundBase * e / 100).toFixed(2)
+        this.providentFundCompanyMoney = (this.formData.providentFundBase * e / 100).toFixed(2)
       } else {
-        this.providentFundCompanyRateAmount = '--'
+        this.providentFundCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 公积金基数变化执行
     providentFundBaseChange(e) {
       if (this.formData.providentFundCompanyRate > 0 && this.formData.providentFundBase > 0) {
-        this.providentFundCompanyRateAmount = (this.formData.providentFundBase * this.formData.providentFundCompanyRate / 100).toFixed(2)
+        this.providentFundCompanyMoney = (this.formData.providentFundBase * this.formData.providentFundCompanyRate / 100).toFixed(2)
       } else {
-        this.providentFundCompanyRateAmount = '--'
+        this.providentFundCompanyMoney = '--'
       }
       if (this.formData.providentFundPersonalRate > 0 && this.formData.providentFundBase > 0) {
-        this.providentFundPersonalRateAmount = (this.formData.providentFundBase * this.formData.providentFundPersonalRate / 100).toFixed(2)
+        this.providentFundPersonalMoney = (this.formData.providentFundBase * this.formData.providentFundPersonalRate / 100).toFixed(2)
       } else {
-        this.providentFundPersonalRateAmount = '--'
+        this.providentFundPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 生育保险个人比例变化执行
     syubxPersonalRateChange(e) {
       if (this.formData.syubxBase > 0 && e > 0) {
-        this.syubxPersonalRateAmount = (this.formData.syubxBase * e / 100).toFixed(2)
+        this.syubxPersonalMoney = (this.formData.syubxBase * e / 100).toFixed(2)
       } else {
-        this.syubxPersonalRateAmount = '--'
+        this.syubxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 生育保险单位比例变化执行
     syubxCompanyRateChange(e) {
       if (this.formData.syubxBase > 0 && e > 0) {
-        this.syubxCompanyRateAmount = (this.formData.syubxBase * e / 100).toFixed(2)
+        this.syubxCompanyMoney = (this.formData.syubxBase * e / 100).toFixed(2)
       } else {
-        this.syubxCompanyRateAmount = '--'
+        this.syubxCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 生育保险基数变化执行
     syubxBaseChange(e) {
       if (this.formData.syubxCompanyRate > 0 && this.formData.syubxBase > 0) {
-        this.syubxCompanyRateAmount = (this.formData.syubxBase * this.formData.syubxCompanyRate / 100).toFixed(2)
+        this.syubxCompanyMoney = (this.formData.syubxBase * this.formData.syubxCompanyRate / 100).toFixed(2)
       } else {
-        this.syubxCompanyRateAmount = '--'
+        this.syubxCompanyMoney = '--'
       }
       if (this.formData.syubxPersonalRate > 0 && this.formData.syubxBase > 0) {
-        this.syubxPersonalRateAmount = (this.formData.syubxBase * this.formData.syubxPersonalRate / 100).toFixed(2)
+        this.syubxPersonalMoney = (this.formData.syubxBase * this.formData.syubxPersonalRate / 100).toFixed(2)
       } else {
-        this.syubxPersonalRateAmount = '--'
+        this.syubxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 失业保险个人比例变化执行
     sybxPersonalRateChange(e) {
       if (this.formData.sybxBase > 0 && e > 0) {
-        this.sybxPersonalRateAmount = (this.formData.sybxBase * e / 100).toFixed(2)
+        this.sybxPersonalMoney = (this.formData.sybxBase * e / 100).toFixed(2)
       } else {
-        this.sybxPersonalRateAmount = '--'
+        this.sybxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 失业保险单位比例变化执行
     sybxCompanyRateChange(e) {
       if (this.formData.sybxBase > 0 && e > 0) {
-        this.sybxCompanyRateAmount = (this.formData.sybxBase * e / 100).toFixed(2)
+        this.sybxCompanyMoney = (this.formData.sybxBase * e / 100).toFixed(2)
       } else {
-        this.sybxCompanyRateAmount = '--'
+        this.sybxCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 失业保险基数金额变化执行
     sybxBaseChange(e) {
       if (this.formData.sybxCompanyRate > 0 && this.formData.sybxBase > 0) {
-        this.sybxCompanyRateAmount = (this.formData.sybxBase * this.formData.sybxCompanyRate / 100).toFixed(2)
+        this.sybxCompanyMoney = (this.formData.sybxBase * this.formData.sybxCompanyRate / 100).toFixed(2)
       } else {
-        this.sybxCompanyRateAmount = '--'
+        this.sybxCompanyMoney = '--'
       }
       if (this.formData.sybxPersonalRate > 0 && this.formData.sybxBase > 0) {
-        this.sybxPersonalRateAmount = (this.formData.sybxBase * this.formData.sybxPersonalRate / 100).toFixed(2)
+        this.sybxPersonalMoney = (this.formData.sybxBase * this.formData.sybxPersonalRate / 100).toFixed(2)
       } else {
-        this.sybxPersonalRateAmount = '--'
+        this.sybxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 医疗保险个人比例变化
     ysbxPersonalRateChange(e) {
       if (this.formData.ysbxBase > 0 && e > 0) {
-        this.ysbxPersonalRateAmount = (this.formData.ysbxBase * e / 100).toFixed(2)
+        this.ysbxPersonalMoney = (this.formData.ysbxBase * e / 100).toFixed(2)
       } else {
-        this.ysbxPersonalRateAmount = '--'
+        this.ysbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 医疗保险单位比例变化
     ysbxCompanyRateChange(e) {
       if (this.formData.ysbxBase > 0 && e > 0) {
-        this.ysbxCompanyRateAmount = (this.formData.ysbxBase * e / 100).toFixed(2)
+        this.ysbxCompanyMoney = (this.formData.ysbxBase * e / 100).toFixed(2)
       } else {
-        this.ysbxCompanyRateAmount = '--'
+        this.ysbxCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 医疗保险基数变化执行
     ysbxBaseChange(e) {
       if (this.formData.ysbxCompanyRate > 0 && this.formData.ysbxBase > 0) {
-        this.ysbxCompanyRateAmount = (this.formData.ysbxBase * this.formData.ysbxCompanyRate / 100).toFixed(2)
+        this.ysbxCompanyMoney = (this.formData.ysbxBase * this.formData.ysbxCompanyRate / 100).toFixed(2)
       } else {
-        this.ysbxCompanyRateAmount = '--'
+        this.ysbxCompanyMoney = '--'
       }
       if (this.formData.ysbxPersonalRate > 0 && this.formData.ysbxBase > 0) {
-        this.ysbxPersonalRateAmount = (this.formData.ysbxBase * this.formData.ysbxPersonalRate / 100).toFixed(2)
+        this.ysbxPersonalMoney = (this.formData.ysbxBase * this.formData.ysbxPersonalRate / 100).toFixed(2)
       } else {
-        this.ysbxPersonalRateAmount = '--'
+        this.ysbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 工伤保险个人比例变化执行
     gsbxPersonalRateChange(e) {
       if (this.formData.gsbxBase > 0 && e > 0) {
-        this.gsbxPersonalRateAmount = (this.formData.gsbxBase * e / 100).toFixed(2)
+        this.gsbxPersonalMoney = (this.formData.gsbxBase * e / 100).toFixed(2)
       } else {
-        this.gsbxPersonalRateAmount = '--'
+        this.gsbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 工伤保险单位比例变化执行
     gsbxCompanyRateChange(e) {
       if (this.formData.gsbxBase > 0 && e > 0) {
-        this.gsbxCompanyRateAmount = (this.formData.gsbxBase * e / 100).toFixed(2)
+        this.gsbxCompanyMoney = (this.formData.gsbxBase * e / 100).toFixed(2)
       } else {
-        this.gsbxCompanyRateAmount = '--'
+        this.gsbxCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 工伤保险基数变化
     gsbxBaseChange(e) {
       if (this.formData.ylbxCompanyRate > 0 && this.formData.gsbxBase > 0) {
-        this.gsbxCompanyRateAmount = (this.formData.gsbxBase * this.formData.gsbxCompanyRate / 100).toFixed(2)
+        this.gsbxCompanyMoney = (this.formData.gsbxBase * this.formData.gsbxCompanyRate / 100).toFixed(2)
       } else {
-        this.gsbxCompanyRateAmount = '--'
+        this.gsbxCompanyMoney = '--'
       }
       if (this.formData.gsbxPersonalRate > 0 && this.formData.gsbxBase > 0) {
-        this.gsbxPersonalRateAmount = (this.formData.gsbxBase * this.formData.gsbxPersonalRate / 100).toFixed(2)
+        this.gsbxPersonalMoney = (this.formData.gsbxBase * this.formData.gsbxPersonalRate / 100).toFixed(2)
       } else {
-        this.gsbxPersonalRateAmount = '--'
+        this.gsbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 个人养老保险百分比变化
     ylbxPersonalRateChange(e) {
       if (this.formData.ylbxBase > 0 && e > 0) {
-        this.ylbxPersonalRateAmount = (this.formData.ylbxBase * e / 100).toFixed(2)
+        this.ylbxPersonalMoney = (this.formData.ylbxBase * e / 100).toFixed(2)
       } else {
-        this.ylbxPersonalRateAmount = '--'
+        this.ylbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 单位养老保险百分比变化
     ylbxCompanyRateChange(e) {
       if (this.formData.ylbxBase > 0 && e > 0) {
-        this.ylbxCompanyRateAmount = (this.formData.ylbxBase * e / 100).toFixed(2)
+        this.ylbxCompanyMoney = (this.formData.ylbxBase * e / 100).toFixed(2)
       } else {
-        this.ylbxCompanyRateAmount = '--'
+        this.ylbxCompanyMoney = '--'
       }
       this.TotalAmountFN()
     },
     // 养老保险基数变化
     ylbxBaseChange(e) {
       if (this.formData.ylbxCompanyRate > 0 && this.formData.ylbxBase > 0) {
-        this.ylbxCompanyRateAmount = (this.formData.ylbxBase * this.formData.ylbxCompanyRate / 100).toFixed(2)
+        this.ylbxCompanyMoney = (this.formData.ylbxBase * this.formData.ylbxCompanyRate / 100).toFixed(2)
       } else {
-        this.ylbxCompanyRateAmount = '--'
+        this.ylbxCompanyMoney = '--'
       }
       if (this.formData.ylbxPersonalRate > 0 && this.formData.ylbxBase > 0) {
-        this.ylbxPersonalRateAmount = (this.formData.ylbxBase * this.formData.ylbxPersonalRate / 100).toFixed(2)
+        this.ylbxPersonalMoney = (this.formData.ylbxBase * this.formData.ylbxPersonalRate / 100).toFixed(2)
       } else {
-        this.ylbxPersonalRateAmount = '--'
+        this.ylbxPersonalMoney = '--'
       }
       this.TotalAmountFN()
     },

src/views/business/outContract/index.vue

@@ -36,7 +36,7 @@
           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"
+        <el-button type="success" icon="el-icon-help" size="mini" :disabled="multiple" @click="createBatchTask"
                    v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -246,6 +246,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      contractNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -447,6 +448,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.contractNames = selection.map(item => item.contractName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -502,8 +504,9 @@ export default {
       }, `outContract_${new Date().getTime()}.xlsx`)
     },
     createBatchTask() {
-      const ids = row.id || this.ids;
-
+      this.bcoForm.contractName = this.contractNames.join(',')
+      this.bcoForm.targetIds = this.ids
+      this.bcoOpen = true
     },
     // 单条生成发薪任务
     createBatchTaskOne(row) {

src/views/business/outPersonal/index.vue

@@ -110,24 +110,6 @@
         <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>

src/views/business/payOutDetail/index.vue

@@ -130,53 +130,77 @@
       <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" width="110">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType"/>
+          <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.standard.bearType"/>
         </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">
+          <template slot-scope="scope">
+            {{scope.row.standard.sybxBase}}
+          </template>
+        </el-table-column>
+        <el-table-column label="养老保险(￥)" align="center">
+          <template slot-scope="scope">
+            {{scope.row.standard.ylbxBase}}
+          </template>
+        </el-table-column>
+        <el-table-column label="工伤保险(￥)" align="center">
+          <template slot-scope="scope">
+            {{scope.row.standard.gsbxBase}}
+          </template>
+        </el-table-column>
+        <el-table-column label="医疗保险(￥)" align="center">
+          <template slot-scope="scope">
+            {{scope.row.standard.ysbxBase}}
+          </template>
+        </el-table-column>
+        <el-table-column label="生育保险(￥)" align="center">
+          <template slot-scope="scope">
+            {{scope.row.standard.syubxBase}}
+          </template>
+        </el-table-column>
+        <el-table-column label="公积金(￥)" align="center">
+          <template slot-scope="scope">
+            {{scope.row.standard.providentFundBase}}
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column label="单位缴纳保险情况">
         <el-table-column label="失业保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.sybxCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.sybxCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.sybxCompanyMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="养老保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.ylbxCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.ylbxCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.ylbxCompanyMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="工伤保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.gsbxCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.gsbxCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.gsbxCompanyMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="医疗保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.ysbxCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.ysbxCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.ysbxCompanyMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="生育保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.syubxCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.syubxCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.syubxCompanyMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="公积金" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.providentFundCompanyRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.providentFundCompanyRate}}%</el-tag>
             <el-tag>￥{{scope.row.providentFundCompanyMoeny}}</el-tag>
           </template>
         </el-table-column>
@@ -184,42 +208,43 @@
       <el-table-column label="个人缴纳保险情况">
         <el-table-column label="失业保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.sybxPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.sybxPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.sybxPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="养老保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.ylbxPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.ylbxPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.ylbxPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="工伤保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.gsbxPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.gsbxPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.gsbxPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="医疗保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.ysbxPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.ysbxPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.ysbxPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="生育保险" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.syubxPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.syubxPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.syubxPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="公积金" align="center">
           <template slot-scope="scope">
-            <el-tag type="warning">{{scope.row.providentFundPersonalRate}}%</el-tag>
+            <el-tag type="warning">{{scope.row.standard.providentFundPersonalRate}}%</el-tag>
             <el-tag>￥{{scope.row.providentFundPersonalMoney}}</el-tag>
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="管理费" align="center" prop="operationCost" />
+      <el-table-column label="考勤扣除" align="center" prop="checkWorkCost" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -229,6 +254,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:payOutDetail:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:payOutDetail:edit']"
+          >考勤核对</el-button>
           <el-button
             size="mini"
             type="text"

src/views/business/payOutRecord/index.vue

@@ -105,6 +105,14 @@
             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-money"
+            @click="paySalary(scope.row)"
+            v-if="scope.row.payStatus && 1 == scope.row.payStatus"
+            v-hasPermi="['business:payOutRecord:list']"
+          >支付</el-button>
           <el-button
             size="mini"
             type="text"
@@ -183,17 +191,53 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="支付薪资" :visible.sync="payOpen" width="500px" append-to-body>
+      <el-form ref="payForm" :model="payForm" :rules="rules" label-width="80px">
+        <el-form-item label="任务名称" prop="batchName">
+          <el-input v-model="payForm.batchName" disabled placeholder="请输入发薪批/任务次名称" />
+        </el-form-item>
+        <el-form-item label="发薪单位" prop="companyName">
+          <el-input v-model="payForm.companyName" disabled placeholder="请输入发薪单位" />
+        </el-form-item>
+        <el-form-item label="下发人数" prop="totalCount">
+          <el-input v-model="payForm.totalCount" disabled placeholder="请输入发放条数" />
+        </el-form-item>
+        <el-form-item label="下发金额" prop="totalAmount">
+          <el-input v-model="payForm.totalAmount" disabled placeholder="请输入发放总金额" />
+        </el-form-item>
+        <el-form-item label="付款账号" prop="payAccNo">
+          <el-select v-model="payForm.payAccNo" placeholder="请选择">
+            <el-option
+              v-for="item in payAccList"
+              :key="item.id"
+              :label="item.payAccNo"
+              :value="item.payAccNo">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmPay">确定支付</el-button>
+        <el-button @click="payOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord } from "@/api/business/payOutRecord";
+import { listPayAccInfo } from '@/api/business/payAcc'
 
 export default {
   name: "PayOutRecord",
   dicts: ['pay_status'],
   data() {
     return {
+      payAccList: [],
+      payForm: {
+        payAccNo: null,
+      },
+      payOpen: false,
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -289,6 +333,15 @@ export default {
     this.getList();
   },
   methods: {
+    getPayAccList() {
+      if (!this.payAccList || this.payAccList.length < 1) {
+        listPayAccInfo().then(resp => {
+          if (resp.code == 200) {
+            this.payAccList = resp.data
+          }
+        })
+      }
+    },
     /** 查询发薪批次信息列表 */
     getList() {
       this.loading = true;
@@ -394,7 +447,19 @@ export default {
     },
     batchDetails(row) {
       this.$router.push({ path: "/business/payOutDetail", query: { batchNo: row.batchNo, batchName: row.batchName } });
+    },
+    paySalary(row) {
+      this.payForm.taskId = row.id;
+      this.payForm.batchName = row.batchName;
+      this.payForm.companyName = row.companyName;
+      this.payForm.totalCount = row.totalCount;
+      this.payForm.totalAmount = row.totalAmount;
+      this.payOpen = true
+      this.getPayAccList();
+    },
+    confirmPay() {
+      console.log(this.payForm)
     }
-  }
+  },
 };
 </script>