修复

src/router/index.js

@@ -713,7 +713,7 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/news/bookList'),
         meta: {
-          title: '添加书刊音像',
+          title: '书刊音像列表',
           hidden: true,
           breadcrumb: true
         }

src/views/news/GoodList.vue

@@ -99,9 +99,13 @@
 
             <el-table-column prop="updated_at" label="修改时间" width=""></el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="200" header-align="center">
+            <el-table-column fixed="right" label="操作" width="300" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
+
+                  <div class="listUpBtn" @click="returnRow(scope.row.id, tableData)"><i
+                      class="el-icon-refresh-right"></i>撤回</div>
+
                   <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i
                       class="el-icon-delete"></i>删除
                   </div>
@@ -133,6 +137,8 @@
 <script>
 //表格标题
 import tableTitle from './components/tableTitle';
+import { getUseType } from '@/utils/auth'
+
 //引入公用样式
 import '@/styles/global.less';
 
@@ -162,7 +168,17 @@ export default {
     }
   },
   methods: {
-    //1.列表和分页相关 start ------------------------------------------------------------>
+    //1.列表和分页相关 start ------------------------------------------------------------>  
+    returnRow(id) {
+      this.$confirm('确定要撤回吗?', '提示', {
+        confirmButtonText: '撤回',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        //撤回，把文章状态修改为0，重新进行审核
+        this.upRow(id, 1)
+      })
+    },
     //1.1 开始请求列表信息方法
     getData(type) {
       if (type == "search") {
@@ -224,12 +240,13 @@ export default {
         id: id,
         status: status
       }
-      this.$store.dispatch('news/upArticleStatus', data).then(res => {
+      this.$store.dispatch('news/updateGoodStatus', data).then(res => {
         if (res.code == 200) {
           this.$message({
             type: 'success',
             message: '商品状态已修改!'
           });
+          this.getData();
         }
       }).catch(() => {
         this.$message({

src/views/news/addBook.vue

@@ -44,24 +44,24 @@
               </template>
             </el-input>
           </el-form-item>
-          <el-form-item label="页数" prop="page" class="custom-align-right">
+          <el-form-item label="页数:" prop="page" class="custom-align-right">
             <el-input type="number" v-model="form.page" autocomplete="off" placeholder="请输入页数">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="开本" prop="format" class="custom-align-right">
+          <el-form-item label="开本：" prop="format" class="custom-align-right">
             <el-input v-model="form.format" autocomplete="off" placeholder="请输入开本">
             </el-input>
           </el-form-item>
-          <el-form-item label="纸张" prop="paper" class="custom-align-right">
+          <el-form-item label="纸张：" prop="paper" class="custom-align-right">
             <el-input v-model="form.paper" autocomplete="off" placeholder="请输入纸张">
             </el-input>
           </el-form-item>
-          <el-form-item label="包装" prop="package" class="custom-align-right">
+          <el-form-item label="包装：" prop="package" class="custom-align-right">
             <el-input v-model="form.package" autocomplete="off" placeholder="请输入包装">
             </el-input>
           </el-form-item>
-          <el-form-item label="出版社" prop="publishing_house" class="custom-align-right">
+          <el-form-item label="出版社：" prop="publishing_house" class="custom-align-right">
             <el-input v-model="form.publishing_house" autocomplete="off" placeholder="请输入出版社">
             </el-input>
           </el-form-item>
@@ -70,12 +70,12 @@
             <el-date-picker v-model="form.publish_time" placeholder="请选择出版时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="ISBN" prop="ISBN" class="custom-align-right">
+          <el-form-item label="ISBN：" prop="ISBN" class="custom-align-right">
             <el-input v-model="form.ISBN" autocomplete="off" placeholder="请输入ISBN">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="国内统一刊号CN" prop="CN" class="custom-align-right">
+          <el-form-item label="国内统一刊号CN：" prop="CN" class="custom-align-right">
             <el-input v-model="form.CN" autocomplete="off" placeholder="请输入国内统一刊号CN">
             </el-input>
           </el-form-item>
@@ -190,10 +190,10 @@ export default {
       //1.表单项 start ------------------------------------------------------------>
       editStatus: false,
       readStatus: false,
-      tableDivTitle: "添加书刊音像举报",
+      tableDivTitle: "添加书刊音像",
       searchCascaderKey: 0, //列表缓存key
       hovering: false, // 鼠标悬浮状态 悬浮时显示删除
-      website_id: 2,
+      website_id: '', //网站id,
       file: '',
       userType: 1, //用户类型 1：普通用户，
       img_url: '', //图片路径
@@ -205,7 +205,7 @@ export default {
       //提交表单
       form: {
         //1.1使用了外链
-        title: '',//书刊音像举报标题
+        title: '',//书刊音像标题
         price: '',//市场价
         market_price: '',//现售价
         page: '',//页数
@@ -222,7 +222,7 @@ export default {
         detail: "",
         // department_arr_id: [],//部门id
         // department_id: '',//部门id
-        website_id: 1,//网站id
+        website_id: '',//网站id
         cat_arr_id: [],//导航池id
         cat_id: '',//导航池id
         description: '',//商品描述
@@ -468,7 +468,7 @@ export default {
               //汇报结果
               this.$message({
                 type: 'success',
-                message: '已成功添加书刊音像举报！'
+                message: '已成功添加书刊音像！'
               });
               this.cleatForm();
               //返回列表页
@@ -476,7 +476,7 @@ export default {
             } else {
               this.$message({
                 type: 'error',
-                message: "书刊音像举报发布失败，请稍后再试！"
+                message: "书刊音像发布失败，请稍后再试！"
               });
             }
           })
@@ -620,7 +620,7 @@ export default {
               //汇报结果
               this.$message({
                 type: 'success',
-                message: '已成功编辑书刊音像举报！'
+                message: '已成功编辑书刊音像！'
               });
               this.cleatForm();
               //返回列表页
@@ -669,12 +669,12 @@ export default {
     if (this.$route.query.id != undefined) {
       this.editId = this.$route.query.id;
       this.editStatus = true;
-      this.tableDivTitle = "编辑书刊音像举报";
-      console.log("编辑书刊音像举报")
+      this.tableDivTitle = "编辑书刊音像";
+      console.log("编辑书刊音像")
       this.getMainData();
     } else {
       this.editStatus = false;
-      console.log("添加书刊音像举报！")
+      console.log("添加书刊音像！")
     }
     if (this.$route.query.read == 1) {
       this.readStatus = true;;

src/views/news/addJobHunting.vue

@@ -99,7 +99,6 @@
             <el-date-picker v-model="form.birth" type="date" placeholder="选择出生年月">
             </el-date-picker>
           </el-form-item>
-
           <el-form-item label="最高学历：" class="custom-align-right" style="width: 100%;">
             <el-select v-model="form.educational" placeholder="请选择最高学历" @change='changeCompanyNature()'>
               <el-option v-for="item in educations" :key="item.evalue" :label="item.ename"
@@ -155,15 +154,17 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="职位分类：" prop="job" class="custom-align-right">
-            <el-select v-model="form.job" placeholder="请选择职位名称">
+          <el-form-item label="职位类别：" prop="job" class="custom-align-right">
+            <el-select v-model="form.job" placeholder="请选择职位类别">
               <el-option v-for="item in jobPosition" :key="item.zwid" :label="item.zwname"
                 :value="item.zwid"></el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="职位名称：" prop="job_name_get" class="custom-align-right">
-            <el-input v-model="form.job_name_get" autocomplete="off" placeholder="请输入职位名称"></el-input>
+          <el-form-item label="具体职位：" prop="job_name_get" class="custom-align-right">
+            <el-select v-model="form.job_name_get" placeholder="请选择具体职位">
+              <el-option v-for="item in jobPosition1" :key="item.zwid" :label="item.zwname"
+                :value="item.zwid"></el-option>
+            </el-select>
           </el-form-item>
 
 
@@ -490,7 +491,6 @@ export default {
         origin: "",
         //校验专用
         industry: '',//行业
-        job_name: [],//职位名称
         job: '',//职位名称
         company_name: [],//公司名称
         job_industry: [],//行业
@@ -498,6 +498,7 @@ export default {
         department: [],//所属部门
         job_timeList: [],//工作时间
         job_content: [],//工作内容
+        job_name_get: '',
       },
       //1.2 表单验证规则
       formRules: {
@@ -649,7 +650,9 @@ export default {
 
           this.jobIndustry = res.data.jobIndustry;
           this.jobNature = res.data.jobNature;
-          this.jobPosition = res.data.jobPosition;
+          this.jobPosition = res.data.jobPosition.filter(item => item.zwpid == 0);
+          //具体职位
+          this.jobPosition1 = res.data.jobPosition.filter(item => item.zwpid !== 0);
         }
       })
     },
@@ -875,7 +878,7 @@ export default {
         this.form.experience = res.data.experience;
 
 
-        this.form.educational = res.data.educational;
+        this.form.educational = res.data.educationa == null ? "" : parseInt(res.data.educational);
         this.form.politic = res.data.politic;
         this.form.language = res.data.language;
         this.form.level = res.data.level;
@@ -893,6 +896,7 @@ export default {
         this.form.job_experience = JSON.parse(res.data.job_experience);
         this.form.education_experience = JSON.parse(res.data.education_experience);
         this.form.skillList = JSON.parse(res.data.skillList);
+        this.form.job_name_get = res.data.job_name_get == null ? '' : parseInt(res.data.job_name_get);
 
       }).catch(() => {
         this.$message({

src/views/news/bookListApply.vue

@@ -36,7 +36,7 @@
 
     <div class="layerBoxNoBg">
       <div>
-        <el-button type="primary" @click="goCreat">发布书刊音像</el-button>
+        <!-- <el-button type="primary" @click="goCreat">发布书刊音像</el-button> -->
       </div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>

src/views/news/jobHuntingApplyList.vue

@@ -175,7 +175,7 @@ export default {
     clearSearchList() {
       this.tableData = [];
       this.getApiData.username = "";
-
+      this.getApiData.salary = ""; //导航池id
       this.getApiData.page = 1;
       this.getApiData.pageSize = 10;
       this.getData();