字段名称调整

public/chengdu/js/detail.js

@@ -1,6 +1,6 @@
 //var baseUrl = 'http://cgsu81beft.51xd.pub';
 var baseUrl = "http://39.101.167.152:8088/shekecaiji";
-var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport"
+var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport"
 
 var href = window.location.href.split("=");
 var shengFen = unescape(href[1].split("&")[0]);

public/chengdu/js/index.js

@@ -1,6 +1,6 @@
 //var baseUrl = 'http://cgsu81beft.51xd.pub';
 var baseUrl = "http://39.101.167.152:8088/shekecaiji";
-var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport"
+var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport"
 
 console.log(document.cookie)
 // 获取cookie

src/views/manage/company/companyList.vue

@@ -207,7 +207,7 @@ export default {
         dialogFullscreen: true,
         column: [
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
             search: true,
             searchSpan: 5,

src/views/manage/company/companyTree.vue

@@ -4,7 +4,7 @@
       ref="search"
       size="small"
       prefix-icon="el-icon-search"
-      placeholder="搜索公司"
+      placeholder="搜索社区街道"
       v-model="query.companyName"
       clearable
     ></el-input>

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

@@ -47,8 +47,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="联系电话:">
@@ -72,8 +72,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/mission/count/table/detail.vue

@@ -118,7 +118,7 @@ export default {
             display: false,
           },
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
           },
           {

src/views/manage/mission/count/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
           },
           {

src/views/manage/mission/index.vue

@@ -8,10 +8,10 @@
       :inline="true"
     >
       <el-row :span="24">
-        <el-form-item label="公司名称:">
+        <el-form-item label="社区街道名称:">
           <el-input
             v-model="query.companyName"
-            placeholder="公司名称"
+            placeholder="社区街道名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -225,7 +225,7 @@ export default {
         mStatusList: missionState,
         column: [
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
             display: false,
           },

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

@@ -195,6 +195,7 @@ export default {
         education: 7,
         experienceDesc: "不限经验",
         tradeId:null,
+        tradeNames: null,
         userNature:"灵活用工",
       },
       loading: false,
@@ -970,8 +971,11 @@ export default {
       },
       //行业类型
       handleSelect(item) {
+        console.log('11111111111')
+        console.log(item)
         this.tradeBtnState = true;
         this.obj.tradeId = item.id
+        this.obj.tradeNames = item.name
       },
       //工种
       handleSelectWorkType(item){
@@ -1135,6 +1139,7 @@ export default {
               wage: row.wage,
               wageUnitCategory: row.wageUnitCategory,
               tradeId: row.tradeId,
+              tradeNames: this.obj.tradeNames,
               worktypeIds: row.worktypeIds,
               skillIds: skillIds,
               skillNames: skillNames,

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

@@ -195,6 +195,7 @@ export default {
         education: 7,
         experienceDesc: "不限经验",
         tradeId:null,
+        tradeNames: null,
         userNature:"灵活用工",
       },
       loading: false,
@@ -637,7 +638,7 @@ export default {
               // },
               {
                 label: "岗位描述",
-                prop: "missionDesc",
+                prop: "jobDescription",
                 type: "textarea",
                 rules: [
                   {
@@ -965,7 +966,8 @@ export default {
       //行业类型
       handleSelect(item) {
         this.tradeBtnState = true;
-        this.obj.tradeId = item.id
+        this.obj.tradeId = item.id;
+        this.obj.tradeNames = item.name;
       },
       //工种
       handleSelectWorkType(item){
@@ -1129,10 +1131,11 @@ export default {
               wage: row.wage,
               wageUnitCategory: row.wageUnitCategory,
               tradeId: row.tradeId,
+              tradeNames: this.obj.tradeNames,
               worktypeIds: row.worktypeIds,
               skillIds: skillIds,
               skillNames: skillNames,
-              missionDesc: row.missionDesc,
+              jobDescription: row.jobDescription,
               userNature: row.userNature,
               sex: row.sex,
               ageDesc: row.ageDesc,
@@ -1180,10 +1183,11 @@ export default {
           wage: row.wage,
           wageUnitCategory: row.wageUnitCategory,
           tradeId: row.tradeId,
+          tradeNames: this.obj.tradeNames,
           worktypeIds: row.worktypeIds,
           skillIds: skillIds,
           skillNames: skillNames,
-          missionDesc: row.missionDesc,
+          jobDescription: row.jobDescription,
           userNature: row.userNature,
           sex: row.sex,
           ageDesc: row.ageDesc,

src/views/util/work-view.vue

@@ -11,32 +11,31 @@
             <el-row>
               <el-col span="12">
                 <el-form-item label="岗位名称：">{{
-                  model.missionTitle
+                  model.jobName
                 }}</el-form-item>
               </el-col>
               <el-col span="12">
-                <el-form-item label="任务编码：">{{
+                <el-form-item label="岗位编码：">{{
                   model.missionNo
                 }}</el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col span="12">
+              <!-- <el-col span="12">
                 <el-form-item label="报名截止：">{{
                   format(model.etimePub)
                 }}</el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col span="12">
-                <el-form-item label="任务时间：">{{ format(model.stime) }} 至
+                <el-form-item label="发布时间：">{{ format(model.stime) }} </el-form-item>
-                  {{ format(model.etime) }}</el-form-item>
               </el-col>
             </el-row>
           </el-collapse-item>
   
-          <el-collapse-item title="任务要求" name="2" disabled="true">
+          <el-collapse-item title="岗位要求" name="2" disabled="true">
             <template slot="title">
               <div class="avue-group__header">
-                <div class="avue-group__title">任务要求</div>
+                <div class="avue-group__title">岗位要求</div>
               </div>
             </template>
             <el-row>
@@ -70,8 +69,8 @@
             </el-row> -->
             <el-row>
               <el-col span="24">
-                <el-form-item label="任务描述：">{{
+                <el-form-item label="岗位描述：">{{
-                  model.missionDesc
+                  model.jobDescription
                 }}</el-form-item>
               </el-col>
             </el-row>

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://192.168.3.104:8000', // 本地服务接口地址
+        target: 'http://192.168.3.108:8000', // 本地服务接口地址
         // target: "http://39.98.184.58:8000",  // 阿里云后台地址
         // target: "http://192.168.3.111:8000",  // 本地
         ws: true,