Merge remote-tracking branch 'yx/feat/employer' into feat/employer

src/views/business/onlineTaskInfo/createPayTask.vue

 <template>
   <div class="app-container">
-    <el-page-header @back="handleClose" content="发布任务"/>
+    <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-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="taxCompanyId">
+      <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="taskNo">
@@ -22,11 +24,9 @@
         <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"
-                        value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+        <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>
       <el-form-item label="任务详情" prop="billDetail">
@@ -40,9 +40,9 @@
 </template>
 
 <script>
-import {listAllCompanyInfo} from "@/api/business/companyInfo";
-import {laborSign} from "@/api/business/unitInfo";
-import {addOnlineTaskInfo} from "@/api/business/onlineTaskInfo";
+import { listAllCompanyInfo } from "@/api/business/companyInfo";
+import { laborSign } from "@/api/business/unitInfo";
+import { addOnlineTaskInfo } from "@/api/business/onlineTaskInfo";
 
 export default {
   name: "createPayTask",

src/views/business/onlineTaskInfo/payBatchSettlement.vue

@@ -26,6 +26,12 @@
                     </template>
                     {{ enumerationPayerAccNo(batchInfo.payerAccNo) }}
                 </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">
+                        支付类型
+                    </template>
+                    {{ batchInfo.payTitle }}
+                </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">
                         备注
@@ -204,6 +210,12 @@
                                 :label="item.payAccName + ' - ' + item.payAccNo" :value="item.payAccNo"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="支付类型" prop="payTitle">
+                        <el-select v-model="batchInfoForm.payTitle" placeholder="请选择支付类型">
+                            <el-option v-for="dict in dict.type.pay_type_title" :key="dict.value" :label="dict.label"
+                                :value="dict.value" />
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="备注" prop="remark">
                         <el-input v-model="batchInfoForm.remark" placeholder="请输入备注" />
                     </el-form-item>

src/views/business/onlineTaskInfo/taskPayToAli.vue

@@ -30,15 +30,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="支付类型" prop="payTitle">
               <el-select v-model="batchForm.payTitle" placeholder="请选择支付类型">
                 <el-option v-for="dict in dict.type.pay_type_title" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col> -->
-
+          </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="batchForm.remark" placeholder="请输入支付备注" />
@@ -221,6 +220,7 @@ export default {
         payTitle: '',
         payerAccNo: '',
         transferType: '',
+        dataSource: 1
       },
       batchRules: {
         payTitle: [