stage：发薪批次结束

src/api/business/payOrder.js

@@ -102,3 +102,56 @@ export function getDetailHistory(query) {
     params: query
   })
 }
+// 新版批量支付
+export function newBatchPay(data) {
+  return request({
+    url: '/business/taskBatch/create',
+    method: 'post',
+    data: data
+  })
+}
+// 查询发薪批次信息
+export function getBatchInfoAPI(id) {
+  return request({
+    url: `/business/taskBatch/getInfo/${id}`,
+    method: 'get'
+  })
+}
+// 查询发薪批次人员-分页查询
+export function listBatchInfoAPI(query) {
+  return request({
+    url: '/business/taskStaff/list',
+    method: 'get',
+    params: query
+  })
+}
+// 新增发薪批次人员
+export function addBatchInfoAPI(data) {
+  return request({
+    url: '/business/taskBatch/staff/add',
+    method: 'post',
+    data: data
+  })
+}
+// 删除发薪批次人员
+export function delBatchInfoAPI(ids) {
+  return request({
+    url: `/business/taskBatch/staff/remove/${ids}`,
+    method: 'get'
+  })
+}
+// 修改发薪批次人员
+export function updateBatchInfoAPI(data) {
+  return request({
+    url: '/business/taskBatch/staff/edit',
+    method: 'post',
+    data: data
+  })
+}
+// 结算预览
+export function previewSettleAPI(id) {
+  return request({
+    url: `/business/taskBatch/settlement/preview/${id}`,
+    method: 'get'
+  })
+}

src/views/business/onlineTaskInfo/index.vue

@@ -59,7 +59,7 @@
 
     <el-table :data="onlineTaskInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskNo" fixed="left"/>
+      <el-table-column label="任务编号" align="center" prop="taskNo" fixed="left" />
       <el-table-column label="任务名称" align="center" prop="taskName" fixed="left" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -69,16 +69,16 @@
       <el-table-column label="所属行业" align="center" prop="industry" />
       <el-table-column label="发起企业名称" align="center" prop="companyName" />
       <el-table-column label="代发企业名称" align="center" prop="taxCompanyName" />
-      <el-table-column label="任务金额" align="center" prop="amount"/>
-      <el-table-column label="税率" align="center" prop="taxRate"/>
-      <el-table-column label="税费" align="center" prop="taxAmount"/>
-<!--      <el-table-column label="结算金额" align="center" prop="amount"/>-->
+      <el-table-column label="任务金额" align="center" prop="amount" />
+      <el-table-column label="税率" align="center" prop="taxRate" />
+      <el-table-column label="税费" align="center" prop="taxAmount" />
+      <!--      <el-table-column label="结算金额" align="center" prop="amount"/>-->
       <el-table-column label="所在区域" align="center" prop="area" />
       <!--      <el-table-column label="详细地址" align="center" prop="address" />-->
       <el-table-column label="服务时间" align="center" prop="serviceTime" />
       <el-table-column label="零工人数" align="center" prop="needNum" />
-<!--      <el-table-column label="计费说明" align="center" prop="billDesc" />-->
-<!--      <el-table-column label="任务详情" align="center" prop="billDetail" />-->
+      <!--      <el-table-column label="计费说明" align="center" prop="billDesc" />-->
+      <!--      <el-table-column label="任务详情" align="center" prop="billDetail" />-->
       <el-table-column label="发布时间" align="center" prop="releaseTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -86,13 +86,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.status == 0 && checkPermi(['business:onlineTaskInfo:recived'])"
-             size="mini" type="text" icon="el-icon-s-order" @click="setTaxRate(scope.row)">设置税率</el-button>
-          <el-button v-if="scope.row.status == 1 && checkPermi(['business:onlineTaskInfo:add'])"
-             size="mini" type="text" icon="el-icon-s-check" @click="sealContract(scope.row)">确认任务</el-button>
+          <el-button v-if="scope.row.status == 0 && checkPermi(['business:onlineTaskInfo:recived'])" size="mini"
+            type="text" icon="el-icon-s-order" @click="setTaxRate(scope.row)">设置税率</el-button>
+          <el-button v-if="scope.row.status == 1 && checkPermi(['business:onlineTaskInfo:add'])" size="mini" type="text"
+            icon="el-icon-s-check" @click="sealContract(scope.row)">确认任务</el-button>
 
-          <el-button v-if="scope.row.status == 10 || scope.row.status == 11 || scope.row.status == 21"
-             size="mini" type="text" icon="el-icon-view" @click="prviewPdfUrl(scope.row)">查看合同</el-button>
+          <el-button v-if="scope.row.status == 10 || scope.row.status == 11 || scope.row.status == 21" size="mini"
+            type="text" icon="el-icon-view" @click="prviewPdfUrl(scope.row)">查看合同</el-button>
           <el-button v-if="scope.row.status == 10 && checkPermi(['business:onlineTaskInfo:release'])" size="mini"
             type="text" icon="el-icon-s-promotion" @click="handleRelease(scope.row)">发布任务</el-button>
           <el-button v-if="scope.row.status == 11 && checkPermi(['business:onlineTaskInfo:recived'])" size="mini"
@@ -135,7 +135,8 @@
           </el-form-item>
           <el-form-item label="发起企业" prop="companyId">
             <el-select v-model="form.companyId" placeholder="请选择发起企业" @change="applyCompanyChange">
-              <el-option v-for="item in applyCompanyList" :key="item.id" :label="item.companyName" :value="item.id"></el-option>
+              <el-option v-for="item in applyCompanyList" :key="item.id" :label="item.companyName"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="任务名称" prop="taskName">
@@ -146,11 +147,13 @@
           </el-form-item>
           <el-form-item label="代发企业" prop="taxCompanyId">
             <el-select v-model="form.taxCompanyId" placeholder="请选择代发企业" clearable @change="taxCompanyChange">
-              <el-option v-for="item in taxCompanyList" :key="item.id" :label="item.taxUnitName" :value="item.taxUnitId"></el-option>
+              <el-option v-for="item in taxCompanyList" :key="item.id" :label="item.taxUnitName"
+                :value="item.taxUnitId"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="任务金额" prop="amount">
-            <el-input-number v-model="form.amount" :precision="2" :step="1" :min="1" :max="999999999999.99" placeholder="请输入任务金额" style="width: 30%;"/>
+            <el-input-number v-model="form.amount" :precision="2" :step="1" :min="1" :max="999999999999.99"
+              placeholder="请输入任务金额" style="width: 30%;" />
           </el-form-item>
           <el-form-item label="服务时间" prop="serviceTime">
             <el-date-picker clearable placeholder="请选择服务时间" v-model="form.serviceTimeArr" @change="changeServiceTime"
@@ -176,7 +179,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
           <el-button type="primary" @click="handleNext(0)">保存</el-button>
-<!--          <el-button type="primary" @click="handleNext(10)">下一步</el-button>-->
+          <!--          <el-button type="primary" @click="handleNext(10)">下一步</el-button>-->
           <el-button @click="cancel">取 消</el-button>
         </div>
       </div>
@@ -185,7 +188,7 @@
           <iframe :src=this.contractUrl style="width:100%;height:600px;" frameborder="0"></iframe>
         </div>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
-<!--          <el-button type="primary" @click="handlePrev">上一步</el-button>-->
+          <!--          <el-button type="primary" @click="handlePrev">上一步</el-button>-->
           <el-button type="primary" @click.native="confirmSealContractFile">确认签订合同</el-button>
         </div>
       </div>
@@ -244,14 +247,14 @@
           <el-input v-model="formTaxRate.taxCompanyName" placeholder="请输入代发企业" disabled />
         </el-form-item>
         <el-form-item label="任务金额" prop="amount">
-          <el-input-number v-model="formTaxRate.amount"  placeholder="请输入任务金额" style="width: 100%;"/>
+          <el-input-number v-model="formTaxRate.amount" placeholder="请输入任务金额" style="width: 100%;" />
         </el-form-item>
         <el-form-item label="税率" prop="taxRate">
-          <el-input-number v-model="formTaxRate.taxRate" placeholder="请输入税率" style="width: 100%;"
-              :precision="6" :step="0.001" :min="0" :max="1" @change="calcTaxAmount"/>
+          <el-input-number v-model="formTaxRate.taxRate" placeholder="请输入税率" style="width: 100%;" :precision="6"
+            :step="0.001" :min="0" :max="1" @change="calcTaxAmount" />
         </el-form-item>
         <el-form-item label="税费" prop="taxAmount">
-          <el-input-number v-model="formTaxRate.taxAmount" placeholder="请输入税费" disabled style="width: 100%;"/>
+          <el-input-number v-model="formTaxRate.taxAmount" placeholder="请输入税费" disabled style="width: 100%;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center;">
@@ -592,7 +595,7 @@ export default {
           this.open = true;
           this.title = "确认任务合同";
           this.$forceUpdate();
-        }else {
+        } else {
           this.$modal.msgError(response.message);
         }
       });
@@ -786,15 +789,16 @@ export default {
     toLinkAlipay() {
       // this.$router.push({ path: "/transfer/batchToAli", query: { batchPayName: this.batchPayName, onlineTaskId: this.onlineTaskId } });
       // this.payVisible = false
-      this.$router.push({ path: "/transfer/taskPayToAli",
-        query: { taskId: this.onlineTaskId }
+      this.$router.push({
+        path: "/transfer/taskPayToAli",
+        query: { taskId: this.onlineTaskId, payeeType: 2 }
       });
       this.payVisible = false
     },
     // 跳转到批量到银行卡
     toLinkBankCard() {
-      console.log(this.batchPayName)
-      this.$router.push({ path: "/transfer/batchToBank", query: { batchPayName: this.batchPayName, onlineTaskId: this.onlineTaskId } });
+      // console.log(this.batchPayName)
+      this.$router.push({ path: "/transfer/taskPayToAli", query: { taskId: this.onlineTaskId, payeeType: 1 } });
       this.payVisible = false
     },
     generateTimeCodeWithRandom() {
@@ -848,7 +852,7 @@ export default {
           this.title = "确认任务合同";
           this.taxRateVisible = true;
           this.$forceUpdate();
-        }else {
+        } else {
           this.$modal.msgError("获取任务信息失败：" + (response.msg || "未知错误"));
         }
       }).finally(() => {

src/views/business/payOrder/batchToAli.vue

@@ -276,7 +276,7 @@ export default {
     if (this.$route.query.onlineTaskId) {
       this.batchForm.onlineTaskId = this.$route.query.onlineTaskId;
     }
-    console.log(this.batchForm)
+    // console.log(this.batchForm)
   },
   methods: {
     // 新增明细