合并冲突问题

src/api/base/company.js

@@ -45,6 +45,18 @@ function list(formData){
   return request.post(constant.serverUrl + "/base/company/list", formData);
 }
 
+function editChecked(id){
+  return request.get(constant.serverUrl + "/base/company/editChecked/" + id);
+}
+
+function checked(formModel){  
+  return request.post(constant.serverUrl + "/base/company/checked", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
 export default {
-  create,edit,add,update,remove,batchRemove,pageList,list
+  create,edit,add,update,remove,batchRemove,pageList,list,editChecked,checked
 }

src/api/job/recruitment.js

@@ -82,7 +82,17 @@ function batchOffShelf(idList){
   });
 }
 
-export default {
-  pageList,pageListHR,create,edit,add,update,remove,batchRemove,offShelf,batchOffShelf,down,batchDown,up,batchUp
+function editChecked(id){
+  return request.get(constant.serverUrl + "/job/recruitment/editChecked/" + id);
+}
 
+function checked(formModel){  
+  return request.post(constant.serverUrl + "/job/recruitment/checked", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+export default {
+  pageList,pageListHR,create,edit,add,update,remove,batchRemove,offShelf,batchOffShelf,down,batchDown,up,batchUp,editChecked,checked
 }

src/api/job/recruitmentApprove.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/job/recruitmentApprove/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/job/recruitmentApprove/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/job/recruitmentApprove/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/job/recruitmentApprove/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/job/recruitmentApprove/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/job/recruitmentApprove/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/job/recruitmentApprove/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -74,6 +74,15 @@ var routers = [
                         title: '用户实名审核'
                 }
         },
+        {
+                path: '/base/enterpriseCertificationApprove/list',
+                name: 'EnterpriseCertificationApproveList',
+                component: () => import('@/views/base/enterpriseCertificationApprove-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企业信息审核'
+                }
+        },
 ]
 
 export default routers;

src/routers/modules/job.js

@@ -92,6 +92,15 @@ var routers = [
                 title: '首页'
         }
     },
+    {
+        path: '/job/recruitmentApprove/list',
+        name: 'JobRecruitmentApproveList',
+        component: () => import('@/views/job/recruitmentApprove-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '岗位信息审核'
+        }
+    },
 ]
 
 export default routers;

src/views/base/enterpriseCertificationApprove-check.vue

@@ -0,0 +1,154 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :label-width="'100px'"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="企业名称：" prop="name">
+              {{formModel.name}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="法人代表：" prop="legalPerson">
+              {{formModel.legalPerson}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="信用代码：" prop="creditCode">
+              {{formModel.creditCode}}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="企业类型：" prop="type">
+              {{formModel.type}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="企业规模：" prop="scale">
+              {{formModel.scale}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属行业：" prop="industry">
+              {{formModel.industry}}
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人：" prop="contactPerson">
+              {{formModel.contactPerson}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话：" prop="tel">
+              {{formModel.tel}}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="企业地址：" prop="address">
+              {{formModel.address}}
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-image style="width: 100%;" :src="formModel.businessLicenseUrl" fit="contain">
+              <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline"></i>
+              </div>
+            </el-image>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import userAuthenticationApproveApi from "@/api/base/userAuthenticationApprove";
+import companyApi from "@/api/base/company";
+
+export default {
+  props: ["businessKey", "companyKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.companyKey);
+
+        return companyApi.checked(formData);
+      })().then(function (response) {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.$message({
+            message: "保存成功!",
+            type: "success",
+          });
+
+          self.$emit("close", true);
+        } else {
+          self.$message({
+            message: jsonData.message + "",
+            type: "warning",
+          });
+
+          self.$emit("close", false);
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+        return companyApi.editChecked(self.companyKey);
+    })()
+    .then((response) => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+        console.log(self.formModel);
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    })
+    .catch((error) => {
+      self.$message.error(error + "");
+    });
+  },
+};
+</script>

src/views/base/enterpriseCertificationApprove-list.vue

@@ -6,9 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/enterpriseCertificationApprove"
-          >enterpriseCertificationApprove管理</a
-        >
+        <a href="/enterpriseCertificationApprove">企业信息审核</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -21,64 +19,11 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="" prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="删除标示" prop="delFlag">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.delFlag"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="申请认证企业ID" prop="companyId">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.companyId"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批人" prop="approvePersonId">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approvePersonId"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批时间" prop="approveTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approveTime"
-        ></el-input>
+      <el-form-item label="审批状态" prop="isCertification">
+        <el-select v-model="queryModel.isCertification" filterable placeholder="请选择审批状态" size="mini">
+          <el-option label="未审批" value="1"></el-option>
+          <el-option label="已审批" value="2"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -99,25 +44,6 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row>
     <el-table
       :data="tableData"
       style="min-height: 400px"
@@ -127,39 +53,15 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="" width="180"></el-table-column>
-      <el-table-column prop="createBy" label="" width="180"></el-table-column>
-      <el-table-column prop="createTime" label="" width="180"></el-table-column>
-      <el-table-column prop="updateBy" label="" width="180"></el-table-column>
-      <el-table-column prop="updateTime" label="" width="180"></el-table-column>
-      <el-table-column
-        prop="delFlag"
-        label="删除标示"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="companyId"
-        label="申请认证企业ID"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="approvePersonId"
-        label="审批人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="approveTime"
-        label="审批时间"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="isCertificationName" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="createByName" label="提交人" width="180"></el-table-column>
+      <el-table-column prop="createTime" label="申请时间" width="180"></el-table-column>
+      <el-table-column prop="companyName" label="申请认证企业" width="180"></el-table-column>
+      <el-table-column prop="approvePersonName" label="审核人" width="180"></el-table-column>
+      <el-table-column prop="approveTime" label="审核时间" width="180"></el-table-column>
       <el-table-column label="操作">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+        <template slot-scope="{row}">
+          <el-button v-if="row.isCertification==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -171,17 +73,18 @@
       @size-change="pageSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
-    <enterpriseCertificationApprove-detail
+    <enterpriseCertificationApprove-check
       v-if="showModal"
+      :companyKey="companyKey"
       :businessKey="businessKey"
       :title="modalTitle"
       @close="onDetailModalClose"
-    ></enterpriseCertificationApprove-detail>
+    ></enterpriseCertificationApprove-check>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
-import EnterpriseCertificationApproveDetail from "./enterpriseCertificationApprove-detail";
+import EnterpriseCertificationApproveCheck from "./enterpriseCertificationApprove-check";
 import enterpriseCertificationApproveApi from "@/api/base/enterpriseCertificationApprove";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -192,15 +95,7 @@ export default {
 
     return {
       queryModel: {
-        id: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        companyId: "",
-        approvePersonId: "",
-        approveTime: "",
+        isCertification: "",
       },
       loading: false,
       tableData: [],
@@ -215,6 +110,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      companyKey: "",
     };
   },
   methods: {
@@ -229,15 +125,7 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("companyId", self.queryModel.companyId);
-      formData.append("approvePersonId", self.queryModel.approvePersonId);
-      formData.append("approveTime", self.queryModel.approveTime);
+      formData.append("isCertification", self.queryModel.isCertification);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -289,6 +177,7 @@ export default {
     },
     handleEdit(record) {
       this.modalTitle = "编辑";
+      this.companyKey= record.companyId;
       this.businessKey = record.id;
       this.showModal = true;
     },
@@ -361,7 +250,7 @@ export default {
     this.changePage(1);
   },
   components: {
-    "enterpriseCertificationApprove-detail": EnterpriseCertificationApproveDetail,
+    "enterpriseCertificationApprove-check": EnterpriseCertificationApproveCheck,
   },
 };
 </script>

src/views/base/userAuthenticationApprove-detail.vue

@@ -111,7 +111,6 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
-          console.log(self.formModel);
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/job/index-HR.vue

@@ -1,95 +1,32 @@
 <template>
     <div class="mainDiv">
-        <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-            <a href="#">企业HR</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-            <a href="/job/index">首页</a>
-        </el-breadcrumb-item>
-        </el-breadcrumb>
-        <el-divider></el-divider>
-        <div class="mainDiv">
-        <el-row :gutter="20">
-            <el-col :span="6">
-                <div class="grid-content bg-purple">
-                    <div class="imgDiv"> 
-                        <el-avatar shape="square" :size="70" 
-                        fit="fit" 
-                        src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-                        ></el-avatar>
-                    </div>
-                    <h2>你好，方佳</h2>
-                    <div>湖北荆鹏软件集团有限公司</div>
-                </div>
-            </el-col>
-            <el-col :span="18">
-                <div class="grid-content bg-purple rightDiv">
-                </div>
-            </el-col>
-        </el-row>
-        </div>
-
+		<div class="main-row">
+			<div class="mainContainer main-headImg">123123</div>
+			<div class="mainContainer main-dataNum">123123</div>
+		</div>
+		<div class="mainContainer main-linkUrl">123123</div>
+		<div class="main-row">
+			<div class="mainContainer main-chart1">123123</div>
+			<div class="mainContainer main-chart2">123123</div>
+		</div>
     </div>
 </template>
 <script>
 </script>
 <style lang="scss" scoped>
-.el-breadcrumb {
-  margin: 10px;
-  line-height: 20px;
-}
-
-.el-divider {
-  margin: 5px 0;
-}
-
-.demo-form-inline {
-  margin-left: 10px;
-  text-align: left;
-}
-
-.button-group {
-  margin-left: 10px;
-  text-align: left;
-}
-.el-main{
-    background-color: #f3f3f4;
-}
-.el-row {
-
-    margin: 20px 20px 20px 20px;
-&:last-child {
-    margin-bottom: 0;
-}
-}
-.el-col {
-border-radius: 4px;
-}
-.bg-purple-dark {
-background: #99a9bf;
-}
-.bg-purple {
-background: #d3dce6;
-}
-.bg-purple-light {
-background: #e5e9f2;
-}
-.grid-content {
-border-radius: 4px;
-height: 80px;
-line-height: 10px;
-padding: 20px;
-text-align: left;
-}
-.row-bg {
-padding: 10px 0;
-background-color: #f9fafc;
-}
-.imgDiv{
-    float: left;
-    display: inline;
-    margin-right: 10px;
-}
+	.main-row{
+		display: flex;
+		justify-content: space-between;
+	}
+	.mainContainer{
+		border: 1px solid #ebebeb;
+		border-radius: 3px;
+		transition: .2s;
+		margin-bottom: 24px;
+	}
+	.main-headImg{
+		height: 100px;
+		width: 260px;
+		margin-right: 20px;
+	}
 </style>

src/views/job/recruitmentApprove-detail.vue

@@ -0,0 +1,184 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.td_tit1 {
+  font-size:26px;
+  color: #000;
+  height: 50px;
+}
+.td_tit2 {
+  font-size:18px;
+  color: #000;
+  height: 50px;
+}
+.td_tit3 {
+  width: 70px;
+  height: 30px;
+}
+.td_con {
+  min-width:100px;
+  color: #000;
+  height: 30px;
+}
+.divider {
+  border-top:1px dashed #cccccc;
+  height: 1px;
+  overflow:hidden;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <table style="width:100%;" border="0" cellpadding="0" cellspacing="0">
+        <tr>
+          <td style="width:70%; padding-right:40px;">
+            <table style="width:100%;" border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td class="td_tit1" style="padding-bottom:10px">{{formModel.title}}</td>
+                <td class="td_tit1" style="text-align:right;color:#ff0000">{{formModel.wageTypeName}}</td>
+              </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;
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2" class="td_tit3">{{formModel.requirements}}</td>
+              </tr>
+              <tr>
+                <td colspan="2" class="td_tit3" style="padding-bottom:10px">{{formModel.address}}</td>
+              </tr>
+              <tr>
+                <td colspan="2" class="divider"></td>
+              </tr>
+              <tr>
+                <td colspan="2" class="td_tit2" style="padding-top:10px">职位描述</td>
+              </tr>
+              <tr>
+                <td colspan="2" class="td_con">{{formModel.positionMessage}}</td>
+              </tr>
+              <tr>
+                <td v-if="formModel.updateTime != null" colspan="2" class="td_con" style="padding-top:40px">
+                  更新：{{formModel.updateTime}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  浏览：{{formModel.readingTimes}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  收藏：{{formModel.collectionTimes}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  投递：{{formModel.deliveryTimes}}
+                </td>
+                <td v-else colspan="2" class="td_con" style="padding-top:40px">
+                  更新：{{formModel.createTime}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  浏览：{{formModel.readingTimes}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  收藏：{{formModel.collectionTimes}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  投递：{{formModel.deliveryTimes}}
+                </td>
+              </tr>
+            </table>
+          </td>
+          <td style="padding-left:20px; border-left:1px dashed #cccccc;" valign="top">
+            <table style="width:100%;" border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td colspan="2" class="td_tit2" style="padding-bottom:10px">{{formModel.companyName}}</td>
+              </tr>
+              <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>
+                </td>
+              </tr>
+              <tr>
+                <td class="td_con">
+                  <el-tag size="medium">企业已认证</el-tag>&nbsp;
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2" class="td_con" style="padding-top:30px">{{formModel.address}}</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import recruitmentApi from "@/api/job/recruitment";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
+
+        return recruitmentApi.checked(formData);
+      })().then(function (response) {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.$message({
+            message: "保存成功!",
+            type: "success",
+          });
+
+          self.$emit("close", true);
+        } else {
+          self.$message({
+            message: jsonData.message + "",
+            type: "warning",
+          });
+
+          self.$emit("close", false);
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+        return recruitmentApi.edit(self.businessKey);
+    })()
+    .then((response) => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+        console.log(self.formModel);
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    })
+    .catch((error) => {
+      self.$message.error(error + "");
+    });
+  },
+};
+</script>

src/views/job/recruitmentApprove-list.vue

@@ -0,0 +1,289 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/job/recruitmentApprove">岗位信息审核</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="审批状态" prop="approveStatus">
+        <el-select v-model="queryModel.approveStatus" filterable placeholder="请选择审批状态" size="mini">
+          <el-option label="未审批" value="2"></el-option>
+          <el-option label="已审批" value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="approveStatusName" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="createByName" label="提交人" width="180"></el-table-column>
+      <el-table-column prop="createTime" label="申请时间" width="180"></el-table-column>
+      <el-table-column prop="recruitmentName" label="企业职位" width="330"></el-table-column>
+      <el-table-column prop="approvePersonName" label="审核人" width="180"></el-table-column>
+      <el-table-column prop="approveTime" label="审核时间" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button v-if="row.approveStatus==2" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <recruitmentApprove-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></recruitmentApprove-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import RecruitmentApproveDetail from "./recruitmentApprove-detail";
+import recruitmentApproveApi from "@/api/job/recruitmentApprove";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        approveStatus: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("approveStatus", self.queryModel.approveStatus);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      recruitmentApproveApi
+      .pageList(formData)
+      .then(function (response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      })
+      .catch((error) => {
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.recruitmentId;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          recruitmentApproveApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        recruitmentApproveApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "recruitmentApprove-detail": RecruitmentApproveDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>