fat：合并

src/api/tenant/insure.js

@@ -139,7 +139,7 @@ export const importInsureItem =
       data: { fpAddressId,fpTitleId, data }
     })
   }
-  //在商保列表中通过missionNo获取任务名称
+  //在商保列表中通过missionNo获取零工岗位名称
   export const getDetail =
     (missionNo) => {
       return request({

src/page/login/userRegister.vue

@@ -148,7 +148,7 @@ export default {
       },
       rules: {
         companyName: [
-          { required: true, trigger: "blur", message: "请输入企业名称" },
+          { required: true, trigger: "blur", message: "请输入用工单位" },
         ],
         companyTid: [
           {

src/views/company/desc/basicInfo.vue

@@ -18,7 +18,7 @@
               <el-form-item label="法人身份证号：">
                 <span>{{ form.masterIdentity }}</span>
               </el-form-item>
-              <el-form-item label="企业名称：">
+              <el-form-item label="用工单位：">
                 <span>{{ form.companyName }}</span>
               </el-form-item>
               <el-form-item label="统一社会信用代码：">

src/views/manage/company/companyCheck.vue

@@ -159,7 +159,7 @@ export default {
               },
               {
                 type: "input",
-                label: "企业名称",
+                label: "用工单位",
                 span: 12,
                 display: true,
                 size: "small",

src/views/manage/company/companyRecord.vue

@@ -32,7 +32,7 @@ const ignoreKey = {
 };
 const labelDic = {
   stationId: "所属市场",
-  companyName: "企业名称",
+  companyName: "用工单位",
   tradeId: "所属行业",
   masterName: "法人姓名",
   masterIdentity: "法人身份证号",

src/views/manage/company/examineDialog/ExamineDialog.vue

@@ -25,7 +25,7 @@
                         <el-form-item label="社会信用代码:">
                             <el-input v-model="companyInfo.companyTid" :disabled="true" ></el-input>
                         </el-form-item>
-                        <el-form-item label="公司名称:">
+                        <el-form-item label="用工单位:">
                             <el-input v-model="companyInfo.companyName" :disabled="true"></el-input>
                         </el-form-item>
                         <el-form-item label="法人:">

src/views/manage/company/examineDialog/ExamineDialogSus.vue

@@ -26,7 +26,7 @@
                         <el-form-item label="社会信用代码:" prop="companyTid">
                             <el-input v-model="companyInfo.companyTid" :disabled="true"></el-input>
                         </el-form-item>
-                        <el-form-item label="公司名称:" prop="companyName">
+                        <el-form-item label="用工单位:" prop="companyName">
                             <el-input v-model="companyInfo.companyName" :disabled="companyDisabled"></el-input>
                         </el-form-item>
                         <el-form-item label="法人:" prop="masterName">
@@ -285,7 +285,7 @@ export default {
                 { required: true, message: '请输入社会信用代码', trigger: 'blur' },
             ],
             companyName: [
-                { required: true, message: '请输入公司名称', trigger: 'blur' },
+                { required: true, message: '请输入用工单位', trigger: 'blur' },
             ],
             masterName: [
                 { required: true, message: '请输入法人姓名', trigger: 'blur' },

src/views/manage/company/examineDialog/checkDialog.vue

@@ -316,7 +316,7 @@ export default {
             { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
           ],
           companyName: [
-            { required: true, message: '请输入企业名称', trigger: 'blur' },
+            { required: true, message: '请输入用工单位', trigger: 'blur' },
           ],
           trade: [
             { required: true, message: '请选择活动区域', trigger: 'change' }
@@ -379,7 +379,7 @@ export default {
                 filterable: true,
               },
               {
-                label: "企业名称",
+                label: "用工单位",
                 prop: "companyName",
                 span: 12,
                 display: true,
@@ -387,7 +387,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入企业名称",
+                    message: "请输入用工单位",
                     trigger: "blur",
                   },
                 ],

src/views/manage/company/examineList.vue

@@ -17,8 +17,8 @@
             >{{item.label}}</el-radio-button>
           </el-radio-group>
         </el-form-item><br/>
-        <el-form-item label="企业名称:">
+        <el-form-item label="用工单位:">
-          <el-input v-model="search.companyName" placeholder="企业名称" clearable></el-input>
+          <el-input v-model="search.companyName" placeholder="用工单位" clearable></el-input>
         </el-form-item>
         <el-form-item label="注册电话:" v-if="search.status === 3 || search.status === 4 || search.status === 5">
           <el-input v-model="search.phone" placeholder="注册电话" clearable></el-input>

src/views/manage/company/examineTable/failTable.vue

@@ -94,7 +94,7 @@ export default {
           
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             // {

src/views/manage/company/examineTable/ingTable.vue

@@ -94,7 +94,7 @@ export default {
           
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             // {

src/views/manage/company/examineTable/pauseTable.vue

@@ -94,7 +94,7 @@ export default {
           
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             {

src/views/manage/company/examineTable/stopTable.vue

@@ -94,7 +94,7 @@ export default {
           
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             {

src/views/manage/company/examineTable/successTable.vue

@@ -94,7 +94,7 @@ export default {
 
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             {

src/views/manage/company/examineTable/waitTable.vue

@@ -101,7 +101,7 @@ export default {
 
           column:[
              {
-              label:'企业名称',
+              label:'用工单位',
               prop:'companyName'
             },
             {

src/views/manage/company/fpList.vue

@@ -56,7 +56,7 @@ export default {
         dialogType: "drawer",
         column: [
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             type: "input",
             search: true,

src/views/manage/econtract/contentIndex.vue

@@ -310,7 +310,7 @@ export default {
             display: false,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "servicesName",
             display: false,
           },

src/views/manage/econtract/index.vue

@@ -126,8 +126,8 @@
           <el-form-item label="合同编号:">
             <el-input v-model="search.contractNo" placeholder="合同编号" clearable></el-input>
           </el-form-item>
-          <el-form-item label="任务名称:">
+          <el-form-item label="零工岗位名称:">
-            <el-input v-model="search.servicesName" placeholder="任务名称" clearable></el-input>
+            <el-input v-model="search.servicesName" placeholder="零工岗位名称" clearable></el-input>
           </el-form-item>
           <el-form-item label="员工姓名:">
             <el-input v-model="search.userName" placeholder="员工姓名" clearable></el-input>

src/views/manage/mission/index.vue

@@ -266,14 +266,14 @@ export default {
         align: 'center',
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "missionCompanyName",
             display: false,
             fixed: true,
             width: 120,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             display: false,
             fixed: true,

src/views/manage/recruit/count/index.vue

@@ -64,8 +64,8 @@
         </el-row>
         <el-row :span="24" v-if="search.status === 2">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="用工单位:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="用工单位"></el-input>
           </el-form-item>
 
           <el-form-item label="岗位编号:">

src/views/manage/serviceCharge/Dialog/Check.vue

@@ -150,12 +150,12 @@ export default {
             span: 24,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             span: 24,
           },
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             span: 24,
           },
@@ -255,12 +255,12 @@ export default {
             span: 24,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             span: 24,
           },
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             span: 24,
           },

src/views/manage/serviceCharge/Dialog/IncomeTaxCheck.vue

@@ -193,7 +193,7 @@ export default {
             span: 24,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             search: false,
             span: 24,
@@ -209,7 +209,7 @@ export default {
             // ],
           },
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             search: false,
             span: 24,

src/views/manage/serviceCharge/Table/IssueFail.vue

@@ -262,7 +262,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "companyName",
             display: false,
           },

src/views/manage/serviceCharge/Table/WaitIssue.vue

@@ -251,7 +251,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "companyName",
             display: false,
           },

src/views/manage/serviceCharge/Table/econtractmanaindex.vue

@@ -237,7 +237,7 @@ export default {
             display: false,
           },
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "servicesName",
             display: false,
           },

src/views/manage/station/accountDetail.vue

@@ -56,7 +56,7 @@ export default {
         addBtn: false,
         column: [
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             display: false,
             search: true,

src/views/manage/station/inviteCode.vue

@@ -22,13 +22,13 @@
             @click.stop="distributionCodeDialog = true; isEdit = false; inviteCodeForm = {}"
             type="primary"
             v-show="vaildData(permission.manage_station_inviteCode_edituser, false)"
-        >新增用户
+        >绑定用户
         </el-button>
         <el-button
             size="small"
             @click.stop="handleCheck"
             type="primary"
-        >审核
+        >审核用户
         </el-button>
       </template>
       <template slot="menu" slot-scope="{row}">
@@ -48,7 +48,7 @@
 
     </avue-crud>
     <el-drawer
-        title="新增用户"
+        title="绑定用户"
         :visible.sync="distributionCodeDialog"
         append-to-body
         width="40%"
@@ -56,8 +56,8 @@
       <div class="drawer_content">
         <el-form :model="inviteCodeForm" :rules="inviteCodeRules" filterable ref="inviteCode" label-width="100px"
                  class="demo-ruleForm">
-          <el-form-item label="企业名称:" prop="companyId">
+          <el-form-item label="用工单位:" prop="companyId">
-            <el-select v-model="inviteCodeForm.inviteCompanyId" :disabled="isEdit" filterable placeholder="请选择企业"
+            <el-select v-model="inviteCodeForm.inviteCompanyId" :disabled="isEdit" filterable placeholder="请选择"
                        style="width: 260px">
               <el-option
                   v-for="item in enterpriseList"
@@ -107,7 +107,7 @@ import {Auditing} from "@/api/manage/mission";
 
 const inviteCodeRules = {
   stationId: [
-    {required: true, message: '请选择企业', trigger: 'blur'}
+    {required: true, message: '请选择用工单位', trigger: 'blur'}
   ],
   realName: [
     {required: true, message: '请输入名称', trigger: 'blur'}
@@ -144,7 +144,7 @@ const curdOptions = {
     prop: 'companyName',
     search: true,
   }, {
-    label: '企业名称',
+    label: '用工单位',
     prop: 'comname',
     search: true,
   }, {
@@ -218,7 +218,7 @@ export default {
     return {
       distributionCodeDialog: false,
       inviteCodeRules: Object.assign({}, inviteCodeRules),
-      enterpriseList: [], // 企业列表
+      enterpriseList: [], // 用工单位列表
       inviteCodeForm: {},
       inviteCodeList: [],
       selectionList: [],
@@ -230,7 +230,7 @@ export default {
     }
   },
   activated() {
-    this.getList() // 企业
+    this.getList() // 用工单位
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -250,7 +250,7 @@ export default {
       let h = this.$createElement;
       this.$prompt(
           h("p", {style: "color: #F56C6C"}, "一旦驳回无法进行后续操作"),
-          "请核对企业信息后再进行审核通过",
+          "请核对用工单位信息后再进行审核通过",
           {
             distinguishCancelAndClose: true,
             confirmButtonText: "通 过",

src/views/manage/station/mainList.vue

@@ -100,7 +100,7 @@ export default {
             display: false,
           },
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "comname",
             search: true,
             display: false,
@@ -144,7 +144,7 @@ export default {
               },
               {
                 type: "input",
-                label: "企业名称",
+                label: "用工单位",
                 span: 12,
                 display: true,
                 size: "small",
@@ -153,7 +153,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入企业名称",
+                    message: "请输入用工单位",
                   },
                 ],
               },
@@ -263,13 +263,13 @@ export default {
               },
               {
                 type: "select",
-                label: "企业性质",
+                label: "用工单位性质",
                 prop: "nature",
                 dicData: companyEnum,
                 rules: [
                   {
                     required: true,
-                    message: "请输入企业性质",
+                    message: "请输入用工单位性质",
                     trigger: "blur",
                   },
                 ],
@@ -310,7 +310,7 @@ export default {
               },
               {
                 type: "textarea",
-                label: "企业介绍",
+                label: "用工单位介绍",
                 span: 20,
                 display: true,
                 size: "small",
@@ -319,7 +319,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入企业介绍",
+                    message: "请输入用工单位介绍",
                   },
                 ],
               },

src/views/manage/works/count/index.vue

@@ -64,8 +64,8 @@
         </el-row>
         <el-row :span="24" v-if="search.status === 2">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="用工单位:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="用工单位"></el-input>
           </el-form-item>
 
           <el-form-item label="岗位编号:">

src/views/manage/works/index.vue

@@ -235,7 +235,7 @@ export default {
         mStatusList: companyPostState,
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "jobCompanyName",
             display: false,
             fixed: true,

src/views/tenant/main/serve/Dialog/pushService.vue

@@ -128,7 +128,7 @@ let rightPostOptions = {
     label: '岗位名称',
     prop: 'jobName',
   }, {
-    label: '企业名称',
+    label: '用工单位',
     prop: 'companyName',
   }, {
     label: '岗位描述',

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -293,7 +293,7 @@ export default {
         if (flagValue) {
           callback();
         } else {
-          callback(new Error('任务名称不能输入特殊字符'));
+          callback(new Error('零工岗位名称不能输入特殊字符'));
         }
 
 
@@ -308,7 +308,7 @@ export default {
             arrow: false,
             column: [
               {
-                label: "任务名称",
+                label: "零工岗位名称",
                 prop: "missionTitle",
                 search: true,
                 span: 24,
@@ -316,7 +316,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入任务名称",
+                    message: "请输入零工岗位名称",
                     trigger: "blur",
                   },
                   {
@@ -578,12 +578,12 @@ export default {
             arrow: false,
             column: [
               {
-                label: "企业名称",
+                label: "用工单位",
                 prop: "missionCompanyName",
                 rules: [
                   {
                     required: true,
-                    message: "请输入企业名称",
+                    message: "请输入用工单位",
                     trigger: "blur",
                   },
                 ],

src/views/tenant/mission/Dialog/EmployInformation.vue

@@ -7,7 +7,7 @@
   :before-close="drawerClose"
   class="createOrderTable">
     <div class="taskInformation">
-      <p><label>任务名称：{{selectTaskInfo.missionTitle | ellipsis }}</label><label>任务编号：{{selectTaskInfo.missionNo}}</label><label>录用登记：<font style="color:#409eff">{{selectionList.length == 0 ? 1 :selectionList.length}} </font> 人</label></p>
+      <p><label>零工岗位名称：{{selectTaskInfo.missionTitle | ellipsis }}</label><label>任务编号：{{selectTaskInfo.missionNo}}</label><label>录用登记：<font style="color:#409eff">{{selectionList.length == 0 ? 1 :selectionList.length}} </font> 人</label></p>
     </div>
     <div class="create-order-box">
       <div class="create-order-bill">

src/views/tenant/mission/Table/ExpiredMission.vue

@@ -166,7 +166,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             display: false,
             slot: true,

src/views/tenant/mission/Table/FinishedMission.vue

@@ -193,7 +193,7 @@ export default {
         dialogClickModal: false,
         // column: [
         //   {
-        //     label: "任务名称",
+        //     label: "零工岗位名称",
         //     prop: "missionTitle",
         //     display: false,
         //     slot: true,
@@ -256,7 +256,7 @@ export default {
         // ],
         column: [
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             display: false,
             slot: true,

src/views/tenant/mission/Table/OngoingMission.vue

@@ -189,7 +189,7 @@ export default {
         dialogClickModal: false,
         // column: [
         //   {
-        //     label: "任务名称",
+        //     label: "零工岗位名称",
         //     prop: "missionTitle",
         //     display: false,
         //     slot: true,
@@ -235,7 +235,7 @@ export default {
         // ],
         column: [
           {
-            label: "任务名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             display: false,
             slot: true,

src/views/tenant/mission/Table/WaitingMission.vue

@@ -231,14 +231,14 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "missionCompanyName",
             display: false,
             fixed: true,
             width: 120,
           },
           {
-            label: "岗位名称",
+            label: "零工岗位名称",
             prop: "missionTitle",
             display: false,
             fixed: true,

src/views/tenant/works/Dialog/CopyMission.vue

@@ -706,12 +706,12 @@ export default {
             arrow: false,
             column: [
               {
-                label: "企业名称",
+                label: "用工单位",
                 prop: "jobCompanyName",
                 rules: [
                   {
                     required: true,
-                    message: "请输入企业名称",
+                    message: "请输入用工单位",
                     trigger: "blur",
                   },
                 ],

src/views/tenant/works/Table/WaitingMission.vue

@@ -224,7 +224,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "企业名称",
+            label: "用工单位",
             prop: "jobCompanyName",
             display: false,
             fixed: true,

src/views/util/mission-view.vue

@@ -10,7 +10,7 @@
           </template>
           <el-row>
             <el-col span="12">
-              <el-form-item label="任务名称：">{{
+              <el-form-item label="零工岗位名称：">{{
                   model.missionTitle
                 }}
               </el-form-item>
@@ -118,7 +118,7 @@
           </template>
           <el-row>
             <el-col span="12">
-              <el-form-item label="企业名称：">{{
+              <el-form-item label="用工单位：">{{
                   model.missionCompanyName
                 }}
               </el-form-item>

src/views/util/post-view.vue

@@ -109,7 +109,7 @@
           </template>
           <el-row>
             <el-col span="12">
-              <el-form-item label="企业名称：">{{
+              <el-form-item label="用工单位：">{{
                 model.jobCompanyName
               }}</el-form-item>
             </el-col>

src/views/util/work-view.vue

@@ -124,7 +124,7 @@
           </template>
           <el-row>
             <el-col span="12">
-              <el-form-item label="企业名称：">{{
+              <el-form-item label="用工单位：">{{
                   model.jobCompanyName
                 }}
               </el-form-item>

src/views/wel/cards/authSteps/companyInfo.vue

@@ -10,7 +10,7 @@
           label-width="140px"
           :rules="rules"
         >
-          <el-form-item label="企业名称" prop="companyName">
+          <el-form-item label="用工单位" prop="companyName">
             <el-input
               maxlength="50"
               placeholder="请输入"
@@ -109,7 +109,7 @@ export default {
       imageUrl: "/img/license.png",
       rules: {
         companyName: [
-          { required: true, message: "请输入企业名称", trigger: "blur" },
+          { required: true, message: "请输入用工单位", trigger: "blur" },
         ],
         companyTid: [
           {

src/views/workstation/enterprise/index.vue

@@ -33,8 +33,8 @@
 
         <el-row :span="24">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="用工单位:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="用工单位"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">

src/views/workstation/enterprise/table/examine.vue

@@ -73,7 +73,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
             display: false
           },

src/views/workstation/task/index.vue

@@ -55,8 +55,8 @@
       >
         <el-row :span="24" v-if="search.status === 1">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="用工单位:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="用工单位"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">
@@ -80,8 +80,8 @@
         </el-row>
         <el-row :span="24" v-if="search.status === 2">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="用工单位:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="用工单位"></el-input>
           </el-form-item>
 
           <el-form-item label="任务编号:">

src/views/workstation/task/table/detail.vue

@@ -118,7 +118,7 @@ export default {
             display: false,
           },
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
           },
           {

src/views/workstation/task/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "公司名称",
+            label: "用工单位",
             prop: "companyName",
           },
           {