Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

src/api/job.js

@@ -95,4 +95,12 @@ export function getRecruitingList(params) {
         method: 'get',
         params
     })
-}
+}
+//获得我的沟通列表
+export function getJobResumeList(data) {
+        return request({
+            url: `/news/getJobResumeList`,
+            method: 'post',
+            data
+        })
+    }

src/router/index.js

@@ -452,6 +452,22 @@ export const constantRoutes = [
         }
       ]
     },
+    {
+      path: '/jobResumeList',
+      component: Layout,
+      children: [
+        {
+          name: '',
+          path: '',
+          component: () => import('@/views/job/jobResumeList'),
+          meta: {
+          title: '我的沟通列表',
+          hidden: true,
+          breadcrumb: true
+          }
+        }
+      ]
+    },
     {
       path: '/creatJob',
       component: Layout, 

src/store/modules/job.js

@@ -1,5 +1,5 @@
 import { getJobRecruitingInfo,getJobNature,getEducation,getLanguage,getSalary,getCompanySize,getCompanyNature,
-    getIndustry,getJobRecruitingArea,getPositionList,getExperience,getRecruitingList
+    getIndustry,getJobRecruitingArea,getPositionList,getExperience,getRecruitingList,getJobResumeList
  } from '@/api/job'
 
 const state = {
@@ -119,6 +119,15 @@ const actions = {
             })
         })
     },
+    getJobResumeList({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getJobResumeList(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
 }
 
 

src/views/job/jobResumeList.vue

@@ -0,0 +1,207 @@
+<template>
+    <div class="mainBox">
+      <!--搜索功能 start------------------------------------------------------------>
+      <div class="layerBox_search">
+        <div class="layerBoxLine">
+          <el-row>
+            <el-col :span="6">
+              <div class="searchBox">
+                <div class="searchTitle">标题名称</div>
+                <el-input placeholder="请输入标题名称" autocomplete="off" v-model="getApiData.user_name" />
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="searchBox">
+                <div class="searchTitle">薪资范围</div>
+                <el-select v-model="getApiData.salary" placeholder="请选择薪资范围" style="width: 100%;">
+                  <el-option v-for="item in incomes" :key="item.evalue" :label="item.ename" :value="item.evalue">
+                  </el-option>
+                </el-select>
+              </div>
+            </el-col>
+  
+          </el-row>
+        </div>
+      </div>
+      <div class=" " style="padding:0px 40px 0px 0px; overflow:hidden;">
+        <div style="float:right;">
+          <el-button @click="clearSearchList">重置</el-button>
+          <el-button type="primary" @click="getData('search')">搜索</el-button>
+        </div>
+      </div>
+      <!--搜索功能 end------------------------------------------------------------>
+  
+      <!--表格内容 start------------------------------------------------------------>
+      <div class="layerBox">
+        <tableTitle :name="tableDivTitle" />
+        <el-row>
+          <template>
+            <el-table :data="tableData" style="width: 100%">
+              <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
+              <el-table-column prop="user_name" label="标题名称" width=""></el-table-column>
+              <el-table-column prop="job_name" label="具体职位" width=""></el-table-column>
+              <el-table-column prop="cityname" label="工作地点" width=""></el-table-column>
+              <el-table-column prop="salary_name" label="薪资范围" width=""></el-table-column>
+              <el-table-column prop="updated_at" label="更新时间" width=""></el-table-column>
+              <el-table-column fixed="right" label="操作" width="200" header-align="center">
+                <template slot-scope="scope">
+                  <div class="listBtnBox">
+                    <div class="listEditBtn" @click="goDetail(scope.row.hunt_id, tableData)"><i
+                        class="el-icon-edit-outline"></i>详情</div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
+        </el-row>
+      </div>
+      <!--分页 start------------------------------------------------------------>
+      <div class="alignBox">
+        <el-row>
+          <el-col :span="24">
+            <el-pagination @size-change="handleSizeChange" :current-page="getApiData.page"
+              @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper"
+              :total="allCount"></el-pagination>
+          </el-col>
+        </el-row>
+      </div>
+      <!--分页 end------------------------------------------------------------>
+      <!--表格内容 end------------------------------------------------------------>
+    </div>
+  </template>
+  
+  <script>
+  //表格标题
+  import tableTitle from './components/tableTitle';
+  //引入公用样式
+  import '@/styles/global.less';
+  
+  export default {
+    components: {
+      tableTitle,//表格标题
+    },
+    data() {
+      return {
+        //1.列表和分页相关 start ------------------------------------------------------------>
+        tableDivTitle: "我的沟通列表",
+        tableData: [],//内容
+        editId: 0,//要修改的网站id
+        incomes: [],//薪资范围
+        getApiData: {
+          user_name: "",//标题
+          salary: "",//导航池id
+        //   status: 2,//状态
+  
+          page: 1,//当前是第几页
+          pageSize: 10,//一共多少条
+        },
+        allCount: 0,//总条数
+        //分页相关 end ------------------------------------------------------------>
+      }
+    },
+    methods: {
+      //1.列表和分页相关 start ------------------------------------------------------------>
+      //1.1 开始请求列表信息方法
+      getData(type) {
+        if (type == "search") {
+          this.getApiData.page = 1;
+        }
+        this.$store.dispatch('job/getJobResumeList', this.getApiData).then(res => {
+          //格式化：islink=0为不使用外面 islink=1为使用外链
+          //status=1为显示 status=2为不显示
+            if(res.code == 0){
+                this.tableData = []; //给与内容
+                this.allCount = 0; //给与总条数
+            }else{
+                let data = [];
+                for (let item of res.data.row) {
+                    item.user_name = item.user_name + '简历'
+                    item.category_name = '我的沟通'
+                    item.job_name = item.jtzw_name || '暂无'
+                    item.cityname = item.hunt_cityname || '暂无'
+                    item.updated_at = item.updated_at || '暂无'
+                    data.push(item)
+                }
+                
+                this.tableData = res.data.row; //给与内容
+                this.allCount = res.data.count; //给与总条数
+            }
+        
+        }).catch(() => {
+            this.$message({
+                type: 'warning',
+                message: '网络错误，请重试！'
+            });
+        })
+      },
+  
+      //1.4 列表内容分页
+      //直接跳转
+      handleSizeChange(val) {
+        this.getApiData.page = val;
+        this.getData();
+      },
+      //1.5 点击分页
+      handleCurrentChange(val) {
+        this.getApiData.page = val;
+        this.getData();
+      },
+      //1.6 重置按钮
+      clearSearchList() {
+        this.tableData = [];
+        this.getApiData.user_name = "";
+        this.getApiData.salary = ""; //导航池id
+        this.getApiData.page = 1;
+        this.getApiData.pageSize = 10;
+        this.getData();
+      },
+      //列表和分页相关 end ------------------------------------------------------------>
+  
+      //2.添加求职信息start ------------------------------------------------------------>
+      //跳转到求职信息发布页面
+      goCreat() {
+        this.$router.push({
+          path: '/addJobHunting',
+        });
+      },
+      goDetail(id) {
+        console.log(id, '---3--')
+        let data = {
+          id: id
+        }
+        this.$router.push({
+          path: '/jobHuntingApplyDetil',
+          query: data
+        });
+      },
+      //添加求职信息end ------------------------------------------------------------>
+      getJobHuntingData() {
+        this.$store.dispatch('news/getJobHuntingData', {}).then(res => {
+          if (res.code == 200) {
+            this.jobEnum = res.data.jobEnum;
+            this.educations = this.jobEnum.filter(item => item.egroup === 'education');
+            this.languages = this.jobEnum.filter(item => item.egroup === 'language');
+            this.languagetypes = this.jobEnum.filter(item => item.egroup === 'languagetype');
+            this.natures = this.jobEnum.filter(item => item.egroup === 'nature');
+            this.maritals = this.jobEnum.filter(item => item.egroup === 'marital');
+            this.incomes = this.jobEnum.filter(item => item.egroup === 'income');
+            this.years = this.jobEnum.filter(item => item.egroup === 'years');
+  
+            this.jobIndustry = res.data.jobIndustry;
+            this.jobNature = res.data.jobNature;
+            this.jobPosition = res.data.jobPosition;
+          }
+        })
+      },
+  
+    },
+    mounted() {
+      //1.获得初始数据
+      this.getData();
+      this.getJobHuntingData();
+    }
+  }
+  </script>
+  
+  <style scoped lang="less"></style>
+  

src/views/news/bookListApply.vue

@@ -81,8 +81,8 @@
             <el-table-column fixed="right" label="操作" width="300" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listMainBtn" v-if="type_id == 10000" @click="getUpRow(scope.row.id, tableData)"><i
-                      class="el-icon-check"></i>审核
+                  <div class="listMainBtn" v-if="type_id == 10000" @click="getUpRow(scope.row.id, tableData)">
+                    <i class="el-icon-check"></i>审核
                   </div>
 
                   <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i
@@ -204,14 +204,20 @@ export default {
       this.$confirm('将此通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项，用于区分取消和关闭按钮的行为
         type: 'warning'
       }).then(() => {
         this.upRow(id, 2)
         this.getData();
-      }).catch(() => {
+      }).catch((the_reback) => {
         //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+        console.log("val=",the_reback)
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
+
       })
     },
     upRow(id, status) {

src/views/news/examine.vue

@@ -313,13 +313,19 @@ export default {
       this.$confirm('将此文章通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项，用于区分取消和关闭按钮
         type: 'warning'
       }).then(() => {
         this.upRow(id, 1)
-      }).catch(() => {
+      }).catch((the_reback) => {
         //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+        
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
+
       })
     },
     //1.5 修改文章状态

src/views/news/jobHuntingApplyList.vue

@@ -23,9 +23,8 @@
         </el-row>
       </div>
     </div>
-    <div class="layerBoxNoBg">
-
-      <div>
+    <div class=" " style="padding:0px 40px 0px 0px; overflow:hidden;">
+      <div style="float:right;">
         <el-button @click="clearSearchList">重置</el-button>
         <el-button type="primary" @click="getData('search')">搜索</el-button>
       </div>

src/views/news/myApplyList.vue

@@ -33,8 +33,8 @@
                 </el-row>
             </div>
         </div>
-        <div class="layerBoxNoBg">
-            <div>
+        <div class=" " style="padding:0px 40px 0px 0px; overflow:hidden;">
+            <div style="float:right;">
                 <el-button @click="clearSearchList">重置</el-button>
                 <el-button type="primary" @click="getData">搜索</el-button>
             </div>