Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

src/views/base/company-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/company">企业信息管理</a>
@@ -321,9 +321,7 @@ export default {
       this.showProve = true;
     },
     handlePost(record) {
-      this.modalTitle = "职位";
-      this.businessKey = record.id;
-      this.showPost = true;
+      this.$router.push({path:'/job/recruitment/list',query:{companyId : record.id}});
     },
     handleDelete(record) {
       var self = this;

src/views/base/enterpriseCertificationApprove-check.vue

@@ -50,11 +50,11 @@
               {{formModel.industry}}
             </el-form-item>
           </el-col> -->
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="联系人：" prop="contactPerson">
               {{formModel.contactPerson}}
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="联系电话：" prop="tel">
               {{formModel.tel}}
@@ -77,6 +77,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="danger" @click="handleSubmit" :loading="submitting">退 回</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
     </span>
   </el-dialog>

src/views/base/enterpriseCertificationApprove-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">审核管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/enterpriseCertificationApprove">企业信息审核</a>

src/views/base/labourServicesApprove-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">审核管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/labourServicesApprove">劳务对接审核</a>
@@ -55,6 +55,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="approvalStatusName" label="审核状态" width="180"></el-table-column>
       <el-table-column prop="createByName" label="提交人" width="180"></el-table-column>
+      <el-table-column prop="companyName" label="所在公司" width="180"></el-table-column>
       <el-table-column prop="createTime" label="申请时间" width="180"></el-table-column>
       <el-table-column prop="labourServicesName" label="劳务对接" width="400" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="approvePersonName" label="审核人" width="180"></el-table-column>

src/views/base/userAuthenticationApprove-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">审核管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/userAuthenticationApprove">用户实名审核</a>
@@ -70,7 +70,7 @@
       <el-table-column prop="approveTime" label="审核时间" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
-          <el-button v-if="row.approvalStatus==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
+          <el-button v-if="row.approvalStatus==2" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/job/recruitment-detail.vue

@@ -47,8 +47,7 @@
               </tr>
               <tr>
                 <td colspan="2" class="td_tit3" style="padding-bottom:30px">
-                  <el-tag size="medium" type="info">五险一金</el-tag>&nbsp;
-                  <el-tag size="medium" type="info">交通补助</el-tag>&nbsp;
+                  <el-tag v-for="item in formModel.tagList" :key="item" size="medium" type="info" style="margin-right:10px">{{item}}</el-tag>
                 </td>
               </tr>
               <tr>
@@ -90,7 +89,7 @@
               <tr>
                 <td class="td_con">{{formModel.companyIndustryN}} | {{formModel.companyScaleN}}</td>
                 <td rowspan="2" align="right" valign="top">
-                    <el-avatar :size="56" shape="square" :src="formModel.companyLogo+'?x-oss-process=image/resize,m_fill,w_64,h_64'"></el-avatar>
+                    <el-avatar :size="56" shape="square" :src="formModel.companyLogo"></el-avatar>
                 </td>
               </tr>
               <tr>
@@ -141,7 +140,7 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
-          console.log(self.formModel);
+          self.formModel.companyLogo += '?x-oss-process=image/resize,m_fill,w_64,h_64';
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/job/recruitment-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/job/recruitment">招聘岗位管理</a>
@@ -373,6 +373,7 @@ export default {
     },
   },
   mounted: function () {
+    this.queryModel.companyId = this.$route.query.companyId;
     this.changePage(1);
   },
   components: {

src/views/job/recruitmentApprove-detail.vue

@@ -47,8 +47,7 @@
               </tr>
               <tr>
                 <td colspan="2" class="td_tit3" style="padding-bottom:30px">
-                  <el-tag size="medium" type="info">五险一金</el-tag>&nbsp;
-                  <el-tag size="medium" type="info">交通补助</el-tag>&nbsp;
+                  <el-tag v-for="item in formModel.tagList" :key="item" size="medium" type="info" style="margin-right:10px">{{item}}</el-tag>
                 </td>
               </tr>
               <tr>
@@ -90,7 +89,8 @@
               <tr>
                 <td class="td_con">{{formModel.companyIndustryN}} | {{formModel.companyScaleN}}</td>
                 <td rowspan="2" align="right" valign="top">
-                    <el-avatar :size="56" shape="square" :src="formModel.companyLogo+'?x-oss-process=image/resize,m_fill,w_64,h_64'"></el-avatar>
+                    <!-- <el-avatar :size="56" shape="square" src='http://oss.xiaoxinda.com/enterprise/personInfo/2021/8/b16c75d5-2d5c-4236-b8ec-c7ab8ecb6f14/336.jpg?x-oss-process=image/resize,m_fill,w_64,h_64'></el-avatar> -->
+                    <el-avatar :size="56" shape="square" :src="formModel.companyLogo"></el-avatar>
                 </td>
               </tr>
               <tr>
@@ -117,7 +117,7 @@ import Constant from "@/constant";
 import recruitmentApi from "@/api/job/recruitment";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "approveKey", "title"],
   data() {
     return {
       formModel: {},
@@ -136,6 +136,7 @@ export default {
       (function () {
         var formData = new FormData();
         formData.append("id", self.businessKey);
+        formData.append("approveId", self.approveKey);
 
         return recruitmentApi.checked(formData);
       })().then(function (response) {
@@ -171,7 +172,7 @@ export default {
 
       if (jsonData.result) {
         self.formModel = jsonData.data;
-        console.log(self.formModel);
+        self.formModel.companyLogo += '?x-oss-process=image/resize,m_fill,w_64,h_64';
       } else {
         self.$message.error(jsonData.message + "");
       }

src/views/job/recruitmentApprove-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">审核管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/job/recruitmentApprove">岗位信息审核</a>
@@ -76,6 +76,7 @@
     <recruitmentApprove-detail
       v-if="showModal"
       :businessKey="businessKey"
+      :approveKey="approveKey"
       :title="modalTitle"
       @close="onDetailModalClose"
     ></recruitmentApprove-detail>
@@ -110,6 +111,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      approveKey: ""
     };
   },
   methods: {
@@ -177,6 +179,7 @@ export default {
     handleEdit(record) {
       this.modalTitle = "编辑";
       this.businessKey = record.recruitmentId;
+      this.approveKey = record.id;
       this.showModal = true;
     },
     handleDelete(record) {

src/views/job/resume-detail.vue

@@ -57,15 +57,15 @@
           <td class="td_tit3">学历：</td>
           <td class="td_con">{{formModel.educationName}}</td>
           <td class="td_tit3">期望地点：</td>
-          <td class="td_con">{{formModel.dreamAdd}}</td>
+          <td class="td_con">{{formModel.dreamAddName}}</td>
         </tr>
         <tr>
-          <td class="td_tit3">常驻地址：</td>
-          <td class="td_con">{{formModel.userAddress}}</td>
           <td class="td_tit3">工作经验：</td>
           <td class="td_con">{{formModel.workExpName}}</td>
           <td class="td_tit3">期望薪资：</td>
           <td class="td_con">{{formModel.dreamMoneyName}}</td>
+          <!-- <td class="td_tit3">常驻地址：</td>
+          <td class="td_con">{{formModel.userAddress}}</td> -->
         </tr>
         <tr>
           <td colspan="6" style="height:60px">

src/views/job/resume-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/job/resume">人力资源库管理</a>

src/views/job/workCategory-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/job/workCategory">岗位分类管理</a>