批次优化

src/views/business/onlineTaskBatch/index.vue

@@ -50,7 +50,7 @@
           <div style="color: #1890ff">{{ scope.row.importBatchNo }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="业务名称" align="center" prop="batchName">
+      <el-table-column label="批次名称" align="center" prop="batchName">
         <template slot-scope="scope">
           {{ scope.row.taskName }}
           <div>{{ scope.row.batchName }}</div>
@@ -74,15 +74,20 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column label="详情预览" align="center">
-        <template slot-scope="scope" v-if="scope.row.batchStatus && scope.row.batchStatus !== 8">
-          <p style="margin: 0px;padding: 0px;">发放总笔数：{{ scope.row.totalCount }}</p>
-          <p style="margin: 0px;padding: 0px;">发放总金额：{{ scope.row.totalAmount }}</p>
-          <p style="margin: 0px;padding: 0px;">成功笔数：{{ scope.row.successCount }}</p>
-          <p style="margin: 0px;padding: 0px;">成功金额：{{ scope.row.successAmount }}</p>
-          <p style="margin: 0px;padding: 0px;">失败笔数：{{ scope.row.failCount }}</p>
-          <p style="margin: 0px;padding: 0px;">失败金额：{{ scope.row.failAmount }}</p>
-          <p style="margin: 0px;padding: 0px;">服务费：{{ scope.row.transFee }}</p>
-          <p style="margin: 0px;padding: 0px;">税费：{{ scope.row.taxPrice }}</p>
+        <template slot-scope="scope" >
+          <div>发放总笔数：{{ scope.row.totalCount }}</div>
+          <div>批次总金额：{{ scope.row.totalAmount }}</div>
+          <div>发放金额：{{ scope.row.salaryAmount }}</div>
+          <div v-if="scope.row.batchStatus && scope.row.batchStatus !== 8">
+            成功金额：{{ scope.row.successAmount }}（{{scope.row.successCount}}笔）
+          </div>
+          <div v-if="scope.row.batchStatus && scope.row.batchStatus !== 8">
+            失败金额：{{ scope.row.failAmount }}（{{scope.row.failCount}}笔）
+          </div>
+          <div>税费：{{ scope.row.taxPrice }}（{{ scope.row.taxRate}}）</div>
+          <div v-if="scope.row.batchStatus && scope.row.batchStatus !== 8">
+            服务费：{{ scope.row.transFee }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="完成时间" align="center" prop="transactionTime" width="180">
@@ -93,8 +98,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.batchStatus && scope.row.batchStatus === 8"
-                     size="mini" type="text" icon="el-icon-money"
-                     @click="doPay(scope.row)">确认结算</el-button>
+                     size="mini" type="text" icon="el-icon-s-management"
+                     @click="goSettlement(scope.row)">确认结算</el-button>
           <el-button v-if="scope.row.batchStatus && scope.row.batchStatus === 1"
                      size="mini" type="text" icon="el-icon-money"
                      @click="doPay(scope.row)">确认支付</el-button>
@@ -102,6 +107,7 @@
                      size="mini" type="text" icon="el-icon-circle-close"
                      @click="repeal(scope.row)">订单作废</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-order"
+                     v-if="scope.row.batchStatus && (scope.row.batchStatus === 3 || scope.row.batchStatus === 4 || scope.row.batchStatus === 5)"
                      @click="viewDetail(scope.row)">查看明细</el-button>
           <el-button v-if="scope.row.batchStatus && (scope.row.batchStatus === 4 || scope.row.batchStatus === 5)"
                      size="mini" type="text" icon="el-icon-s-promotion"
@@ -248,7 +254,7 @@ export default {
     },
     doPay(row) {
       if (row && row.payId) {
-        this.$confirm('确定对该任务[' + row.batchNo + ":" + row.batchPayName + ']进行支付操作？', '提示', {
+        this.$confirm('确定对该任务[' + row.batchNo + ":" + row.batchName + ']进行支付操作？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -287,6 +293,10 @@ export default {
     viewDetail(row) {
       this.$router.push({ path: "/business/payDetails", query: { orderId: row.payId, batchNo: row.batchNo } });
     },
+    goSettlement(row) {
+      this.$router.push({ path: "/transfer/payBatchSettlement", query: { id: row.id } });
+    }
+
   }
 };
 </script>

src/views/business/onlineTaskInfo/payBatchSettlement.vue

@@ -2,7 +2,7 @@
     <!-- 发薪批次结算页面 -->
     <div class="app-container payBatchSettlement">
         <div class="card-box">
-            <el-descriptions title="" :column="6">
+            <el-descriptions title="" :column="4">
                 <el-descriptions-item label="任务编号">{{ pageRemark.taskNo }}</el-descriptions-item>
                 <el-descriptions-item label="任务状态" :span="5" :contentStyle="pageRemark.statusClassRuing">
                     {{ pageRemark.taskStatusDesc }}
@@ -85,7 +85,7 @@
                     layout="total, sizes, prev, pager, next, jumper" :total="total">
                 </el-pagination>
                 <el-button type="primary" icon="el-icon-view" size="mini" @click="confirmPay"
-                    :disabled="dataList.length == 0">结算预览</el-button>
+                    :disabled="dataList.length == 0">确认结算</el-button>
             </div>
         </div>
         <!-- 新增编辑对话框 -->
@@ -290,17 +290,22 @@ export default {
             confirmSettleAPI(this.batchInfo.id).then(res => {
                 if (res.code == 200) {
                     this.settlementPreviewDialog = false
-                    this.$modal.msgSuccess('结算成功')
+                    this.$modal.msgSuccess('操作成功')
+                    let obj = { path: "/transfer/taskBatch" };
+                    this.$tab.closeOpenPage(obj)
                 }
             })
         },
         // 点击结算按钮
         confirmPay() {
+          this.$modal.loading()
             previewSettleAPI(this.batchInfo.id).then(res => {
                 if (res.code == 200) {
                     this.settlementPreviewDialog = true
                     this.settlementPreviewData = res.data
                 }
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
         },
         importByExcel() {