发薪批次管理;签约优化

src/api/business/taskBatch.js

+import request from '@/utils/request'
+
+// 查询发包任务-发包批次列表
+export function listTaskBatch(query) {
+  return request({
+    url: '/business/taskBatch/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发包任务-发包批次列表
+export function taskBatchTable(query) {
+  return request({
+    url: '/business/taskBatch/table',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发包任务-发包批次所有列表
+export function listAllTaskBatch(query) {
+  return request({
+    url: '/business/taskBatch/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发包任务-发包批次详细
+export function getTaskBatch(id) {
+  return request({
+    url: '/business/taskBatch/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增发包任务-发包批次
+export function addTaskBatch(data) {
+  return request({
+    url: '/business/taskBatch/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发包任务-发包批次
+export function updateTaskBatch(data) {
+  return request({
+    url: '/business/taskBatch/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除发包任务-发包批次
+export function delTaskBatch(id) {
+  return request({
+    url: '/business/taskBatch/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/taskStaff.js

+import request from '@/utils/request'
+
+// 查询发包批次详情列表
+export function listTaskStaff(query) {
+  return request({
+    url: '/business/taskStaff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发包批次详情所有列表
+export function listAllTaskStaff(query) {
+  return request({
+    url: '/business/taskStaff/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发包批次详情详细
+export function getTaskStaff(id) {
+  return request({
+    url: '/business/taskStaff/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增发包批次详情
+export function addTaskStaff(data) {
+  return request({
+    url: '/business/taskStaff/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发包批次详情
+export function updateTaskStaff(data) {
+  return request({
+    url: '/business/taskStaff/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除发包批次详情
+export function delTaskStaff(id) {
+  return request({
+    url: '/business/taskStaff/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/unitRechargeBank.js

@@ -54,8 +54,11 @@ export function delUnitRechargeBank(id) {
 //获取通道参数数据接口
 export const getChannelParamAPI = (id) => {
   return request({
-    url: '/business/company/payChannelParams/menu?companyChannelId=' + id,
-    method: 'get'
+    url: '/business/company/payChannelParams/menu',
+    method: 'get',
+    params: {
+      companyChannelId: id
+    }
   })
 }
 // 修改通道参数数据接口

src/views/business/onlineTaskInfo/createPayTask.vue

 <template>
   <div class="app-container">
-    <el-page-header @back="handleClose"/>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-page-header @back="handleClose" content="发布任务"/>
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="margin-top: 30px">
       <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>
@@ -22,7 +22,10 @@
         <el-input v-model="form.industry" placeholder="请输入所属行业" />
       </el-form-item>
       <el-form-item label="任务时间" prop="serviceTime">
-        <el-date-picker clearable placeholder="请选择服务时间" v-model="form.serviceTimeArr" @change="changeServiceTime"
+        <el-date-picker clearable placeholder="请选择服务时间"
+                        v-model="form.serviceTimeArr"
+                        @change="changeServiceTime"
+                        value-format="yyyy-MM-dd"
                         type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
@@ -118,6 +121,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (!valid) return;
+        this.form.status = 11
         addOnlineTaskInfo(this.form).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.handleClose()

src/views/business/onlineTaskInfo/index.vue

@@ -69,14 +69,14 @@
       <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="amount" />-->
       <el-table-column label="税率" align="center" prop="taxRate" />
-      <el-table-column label="税费" align="center" prop="taxAmount" />
+<!--      <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="needNum" />-->
       <!--      <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">
@@ -86,8 +86,8 @@
       </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 == 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>
 
@@ -96,7 +96,7 @@
           <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"
-            type="text" icon="el-icon-s-promotion" @click="handleRecived(scope.row)">接收任务</el-button>
+            type="text" icon="el-icon-s-promotion" @click="setTaxRate(scope.row)">接收任务</el-button>
           <el-button v-if="scope.row.status == 21 && checkPermi(['business:onlineTaskInfo:importPayInfo'])" size="mini"
             type="text" icon="el-icon-upload" @click="importPayInfo(scope.row)">导入名单</el-button>
           <!--          <el-button-->
@@ -246,19 +246,20 @@
         <el-form-item label="代发企业" prop="taxCompanyName">
           <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-form-item>
+<!--        <el-form-item label="任务金额" prop="amount">-->
+<!--          <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-form-item>
-        <el-form-item label="税费" prop="taxAmount">
-          <el-input-number v-model="formTaxRate.taxAmount" placeholder="请输入税费" disabled style="width: 100%;" />
-        </el-form-item>
+<!--        <el-form-item label="税费" prop="taxAmount">-->
+<!--          <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;">
-        <el-button type="primary" @click.native="saveTaxRate(1)">保存税率</el-button>
+      <div slot="footer" class="dialog-footer" style="text-align: right;">
+        <el-button @click.native="taxRateVisible = false">取 消</el-button>
+        <el-button type="primary" @click.native="saveTaxRate(21)">确认接收</el-button>
       </div>
     </el-dialog>
   </div>

src/views/business/payOrder/index.vue

@@ -108,7 +108,7 @@
                      @click="repeal(scope.row)">订单作废</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-order"
                      @click="viewDetail(scope.row)">查看明细</el-button>
-          <el-button v-if="scope.row.payStatus && scope.row.payStatus === 4 || scope.row.payStatus === 5"
+          <el-button v-if="scope.row.payStatus && (scope.row.payStatus === 4 || scope.row.payStatus === 5)"
                      size="mini" type="text" icon="el-icon-s-promotion"
                      @click="doRepay(scope.row)">失败补发</el-button>
         </template>

src/views/business/salaryAccount/taxSignComponent.vue

@@ -207,6 +207,7 @@ export default {
     // 线下签约-点击确认方法
     onBehalfOfContractSubmitFN() {
       this.signForm.contractUrl = this.contractUrl
+      this.signForm.contractType = 2;
       console.log('新方法传入的数据', this.signForm);
       addLaborSign(this.signForm).then(resp => {
         if (200 === resp.code) {
@@ -411,4 +412,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

src/views/business/taxUnit/signList.vue

@@ -132,8 +132,12 @@ export default {
     },
     doAgree(row) {
       this.doAgreeData = row
-      this.contractUrl = row.contractUrl
-      this.doAgreePanelVisible = true
+      if (row.contractType && 2 === row.contractType) {
+        this.doAgreePanelSubmit();
+      } else {
+        this.contractUrl = row.contractUrl
+        this.doAgreePanelVisible = true
+      }
     },
     async confirmSealContractFile() {
       const confirmResult = await this.$confirm(`确认签订与${this.doAgreeData.inviterName}的合约吗？`, '操作提示', {