修改bug

src/views/job/checkjobRecruitingList.vue

@@ -1,298 +1,306 @@
 <template>
-    <div class="mainBox">
-      <!--搜索功能 start------------------------------------------------------------>
-      <div class="layerBox_search">
-        <div class="layerBoxLine">
-          <el-row>
-            <el-col :span="8">
-              <div class="searchBox">
-                <div class="searchTitle">职位名称：</div>
-                <el-input placeholder="请输入职位名称" autocomplete="off" v-model="getApiData.keyword"/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      
-      <div class="layerBoxNoBg">
-        <div>
-          <!--el-button type="primary" @click="goCreat">发布职位</el-button-->
-        </div>
-        <div>
-          <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="100"></el-table-column>
-              <el-table-column prop="title" label="职位名称" width=""></el-table-column>
-              <el-table-column prop="website_name" label="网站名称" width=""></el-table-column>
-              <el-table-column prop="user_name" label="发布人" width=""></el-table-column>
-              <el-table-column prop="created_at" label="创建时间" width=""></el-table-column>
-              <el-table-column prop="updated_at" label="修改时间" width=""></el-table-column>
-              <el-table-column prop="status" label="审核状态" width="100">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.status==0">待审核</span>
-                  <span v-if="scope.row.status==1">已审核</span>
-                  <span v-if="scope.row.status==2">已拒绝</span>
-                </template>
-              </el-table-column>
-              <el-table-column fixed="right" label="操作" width="300" header-align="center">
-                <template slot-scope="scope">
-                  <div class="listBtnBox">
-                    <div class="listMainBtn" @click="getUpRow(scope.row.id, tableData)" v-if="creatNews_user_type == '10000'"><i class="el-icon-check"></i>审核</div>
-                    <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
-                    <div class="listEditBtn" @click="goEdit(scope.row.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">
+  <div class="mainBox">
+    <!--搜索功能 start------------------------------------------------------------>
+    <div class="layerBox_search">
+      <div class="layerBoxLine">
         <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 :span="8">
+            <div class="searchBox">
+              <div class="searchTitle">职位名称：</div>
+              <el-input placeholder="请输入职位名称" autocomplete="off" v-model="getApiData.keyword" />
+            </div>
           </el-col>
         </el-row>
       </div>
-      <!--分页 end------------------------------------------------------------>
-      <!--表格内容 end------------------------------------------------------------>
+    </div>
+
+    <div class="layerBoxNoBg">
+      <div>
+        <!--el-button type="primary" @click="goCreat">发布职位</el-button-->
+      </div>
+      <div>
+        <el-button @click="clearSearchList">重置</el-button>
+        <el-button type="primary" @click="getData('search')">搜索</el-button>
+      </div>
+    </div>
+    <!--搜索功能 end------------------------------------------------------------>
 
-      <!--弹出框1：外部表单弹出框 start------------------------------------------------------------>
+    <!--表格内容 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="100"></el-table-column>
+            <el-table-column prop="title" label="职位名称" width=""></el-table-column>
+            <el-table-column prop="website_name" label="网站名称" width=""></el-table-column>
+            <el-table-column prop="user_name" label="发布人" width=""></el-table-column>
+            <el-table-column prop="created_at" label="创建时间" width=""></el-table-column>
+            <el-table-column prop="updated_at" label="修改时间" width=""></el-table-column>
+            <el-table-column prop="status" label="审核状态" width="100">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status == 0">待审核</span>
+                <span v-if="scope.row.status == 1">已审核</span>
+                <span v-if="scope.row.status == 2">已拒绝</span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="300" header-align="center">
+              <template slot-scope="scope">
+                <div class="listBtnBox">
+                  <div class="listMainBtn" @click="getUpRow(scope.row.id, tableData)"
+                    v-if="creatNews_user_type == '10000'"><i class="el-icon-check"></i>审核</div>
+                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i
+                      class="el-icon-delete"></i>删除</div>
+                  <div class="listEditBtn" @click="goEdit(scope.row.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------------------------------------------------------------>
+
+    <!--弹出框1：外部表单弹出框 start------------------------------------------------------------>
     <el-dialog title="请输入驳回理由" :visible.sync="examineWindow" :close-on-click-modal="false">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
           <el-form-item label="驳回原因：" :label-width="formLabelWidth" prop="refuse_reason" class="custom-align-right">
-            <el-input type="textarea" v-model="form.refuse_reason" class="custom-textarea" placeholder="请输入驳回原因" :rows="3"></el-input>
+            <el-input type="textarea" v-model="form.refuse_reason" class="custom-textarea" placeholder="请输入驳回原因"
+              :rows="3"></el-input>
           </el-form-item>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <div>
-          <el-button type="info" @click="examineWindow=false">取消</el-button>
+          <el-button type="info" @click="examineWindow = false">取消</el-button>
           <el-button type="primary" @click="examineToServe">确定</el-button>
         </div>
       </div>
     </el-dialog>
     <!--弹出框1：外部表单弹出框 end------------------------------------------------------------>
 
-    </div>
-  </template>
-  
-  <script>
-  //表格标题
-  import tableTitle from './components/tableTitle';
-  //引入公用样式
-  import '@/styles/global.less';
-  import { getUseType } from '@/utils/auth';
-  export default {
-    components: {
-      tableTitle,//表格标题
-    },
-    data() {
-      const validateEmpty = (rule, value, callback) => {
-        if (value == '') {
-          callback(new Error('该项不能为空！'))
-        } else {
-          callback()
-        }
+  </div>
+</template>
+
+<script>
+//表格标题
+import tableTitle from './components/tableTitle';
+//引入公用样式
+import '@/styles/global.less';
+import { getUseType } from '@/utils/auth';
+export default {
+  components: {
+    tableTitle,//表格标题
+  },
+  data() {
+    const validateEmpty = (rule, value, callback) => {
+      if (value == '') {
+        callback(new Error('该项不能为空！'))
+      } else {
+        callback()
       }
-      return {
-        //1.列表和分页相关 start ------------------------------------------------------------>
-        tableDivTitle:"职位列表",
-        tableData:[],//内容
-        editId:0,//要修改的网站id
-        examineWindow:false,//审核窗口
-        formLabelWidth:"120px",//表单label宽度
-        getApiData:{
-          title:"",//职位名称
-          website_name:"",//网站名称
-          user_name:"",//发布人
-          created_at:"",//创建时间
-          updated_at:"",//修改时间
-          page:1,//当前是第几页
-          page_size:10,//一共多少条
-          checkout:0,//是否审核 0 未审核 
-          
-        },
-        //提交驳回
-        form:{
-          refuse_reason:""
-        },
-        formRules: {
-          //导航池名称不能为空
-          refuse_reason: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        },
-        creatNews_user_type:'0',//用户类型
-        keyword:"",//搜索关键字
-        allCount:0,//总条数
-        //分页相关 end ------------------------------------------------------------>
+    }
+    return {
+      //1.列表和分页相关 start ------------------------------------------------------------>
+      tableDivTitle: "职位列表",
+      tableData: [],//内容
+      editId: 0,//要修改的网站id
+      examineWindow: false,//审核窗口
+      formLabelWidth: "120px",//表单label宽度
+      getApiData: {
+        title: "",//职位名称
+        website_name: "",//网站名称
+        user_name: "",//发布人
+        created_at: "",//创建时间
+        updated_at: "",//修改时间
+        page: 1,//当前是第几页
+        page_size: 10,//一共多少条
+        checkout: 0,//是否审核 0 未审核 
+
+      },
+      //提交驳回
+      form: {
+        refuse_reason: ""
+      },
+      formRules: {
+        //导航池名称不能为空
+        refuse_reason: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+      },
+      creatNews_user_type: '0',//用户类型
+      keyword: "",//搜索关键字
+      allCount: 0,//总条数
+      //分页相关 end ------------------------------------------------------------>
+    }
+  },
+  methods: {
+    //1.列表和分页相关 start ------------------------------------------------------------>
+    //1.1 开始请求列表信息方法
+    getData(type) {
+      if (type == "search") {
+        this.getApiData.page = 1;
       }
+      this.getApiData.checkout = 0;
+      // this.getApiData.keyword = this.keyword;
+      this.$store.dispatch('news/getJobRecruitingList', this.getApiData).then(res => {
+        let data = [];
+        console.log(res.data.rows)
+        this.tableData = res.data.rows; //给与内容
+        this.allCount = res.data.count; //给与总条数
+      }).catch(() => {
+        this.$message({
+          type: 'warning',
+          message: '网络错误，请重试！'
+        });
+      })
     },
-    methods: {
-      //1.列表和分页相关 start ------------------------------------------------------------>
-      //1.1 开始请求列表信息方法
-      getData(type){
-        if(type=="search"){
-          this.getApiData.page = 1;
-        }
-        this.getApiData.checkout = 0;
-        // this.getApiData.keyword = this.keyword;
-        this.$store.dispatch('news/getJobRecruitingList',this.getApiData).then(res=> {
-          let data = [];
-          console.log(res.data.rows)
-          this.tableData = res.data.rows; //给与内容
-          this.allCount = res.data.count; //给与总条数
-        }).catch(() => {
+    //1.2 删除内容
+    deleteRow(id) {
+      this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log("当前删除：" + id)
+        this.$store.dispatch('news/delJobRecruiting', { id: id }).then(res => {
+          this.getData();
           this.$message({
-            type: 'warning',
-            message: '网络错误，请重试！'
+            type: 'success',
+            message: '删除成功!'
           });
-        })
-      },
-      //1.2 删除内容
-      deleteRow(id){
-        this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          console.log("当前删除：" + id)
-          this.$store.dispatch('news/delJobRecruiting',{id:id}).then(res=> {
-            this.getData();
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          }).catch(() => {
-            this.$message({
-              type: 'warning',
-              message: '网络错误，请重试！'
-            });
-          })
         }).catch(() => {
           this.$message({
             type: 'warning',
-            message: '已取消删除'
+            message: '网络错误，请重试！'
           });
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'warning',
+          message: '已取消删除'
         });
-      },
-      //1.4 审核温江
-      getUpRow(id){
-        //设置待审核的id
-        this.editId = id;
-        console.log(id)
-        this.$confirm('将此职位通过审核吗?', '提示', {
-          confirmButtonText: '通过',
-          cancelButtonText: '拒绝',
-          type: 'warning'
-        }).then(() => {
-          this.upRow(id,1)
-        }).catch(() => {
+      });
+    },
+    //1.4 审核温江
+    getUpRow(id) {
+      //设置待审核的id
+      this.editId = id;
+      console.log(id)
+      this.$confirm('将此职位通过审核吗?', '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '拒绝',
+        type: 'warning'
+      }).then(() => {
+        this.upRow(id, 1)
+      }).catch(() => {
         //输入驳回理由
         console.log("驳回")
-        this.examineWindow = true;
-        })
-      },
-      //1.5 修改文章状态
-      upRow(id,status){
-        let data = {
-          id:id,
-          status:status
+
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
+      })
+    },
+    //1.5 修改文章状态
+    upRow(id, status) {
+      let data = {
+        id: id,
+        status: status
+      }
+      this.$store.dispatch('news/checkJobRecruiting', data).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            type: 'success',
+            message: '操作成功！'
+          });
+          this.getData();
         }
-        this.$store.dispatch('news/checkJobRecruiting',data).then(res=> {
-          if(res.code==200){
-            this.$message({
-              type: 'success',
-              message: '操作成功！'
-            });
-            this.getData();
+      })
+    },
+    //提交驳回内容
+    examineToServe(id) {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let data = {
+            id: this.editId,
+            status: 2,//驳回status
+            refuse_reason: this.form.refuse_reason
           }
-        })
-      },
-      //提交驳回内容
-      examineToServe(id){
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            let data = {
-              id:this.editId,
-              status:2,//驳回status
-              refuse_reason:this.form.refuse_reason
+          this.$store.dispatch('news/checkJobRecruiting', data).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '操作成功！'
+              });
+              this.getData();
+              this.form.refuse_reason = "";//清空上一次的输入
+              this.examineWindow = false;
             }
-            this.$store.dispatch('news/checkJobRecruiting',data).then(res=> {
-              if(res.code==200){
-                this.$message({
-                  type: 'success',
-                  message: '操作成功！'
-                });
-                this.getData();
-                this.form.refuse_reason = "";//清空上一次的输入
-                this.examineWindow = false;
-              }
-            })
-          }else{
-            this.$message.error("驳回理由不能为空！")
-          }
-        })
-      },
-      //1.4 列表内容分页
-      //直接跳转
-      handleSizeChange(val) {
-        this.getApiData.page = val;
-        this.getData();
-      },
-      //1.5 点击分页
-      handleCurrentChange(val) {
-        this.getApiData.page = val;
-        this.getData();
-      },
-      //1.6 重置按钮
-      clearSearchList(){
-        this.getApiData.keyword = "";
-        this.getApiData.page = 1;
-        this.getApiData.page_size = 10;
-        this.getData();
-      },
-      //列表和分页相关 end ------------------------------------------------------------>
-  
-      //2.添加新闻 start ------------------------------------------------------------>
-      //跳转到职位发布页面
-      goCreat(){
-        this.$router.push({
-          path: '/creatJob',
-        });
-      },
-      goEdit(id){
-        let data = {
-          id:id,
-          to:"checkjob"
+          })
+        } else {
+          this.$message.error("驳回理由不能为空！")
         }
-        this.$router.push({
-          path: '/creatJob',
-          query: data
-        });
-      }
-      //添加新闻 end ------------------------------------------------------------>
+      })
     },
-    mounted(){
-      this.creatNews_user_type = getUseType()
-      //1.获得初始数据
+    //1.4 列表内容分页
+    //直接跳转
+    handleSizeChange(val) {
+      this.getApiData.page = val;
       this.getData();
+    },
+    //1.5 点击分页
+    handleCurrentChange(val) {
+      this.getApiData.page = val;
+      this.getData();
+    },
+    //1.6 重置按钮
+    clearSearchList() {
+      this.getApiData.keyword = "";
+      this.getApiData.page = 1;
+      this.getApiData.page_size = 10;
+      this.getData();
+    },
+    //列表和分页相关 end ------------------------------------------------------------>
+
+    //2.添加新闻 start ------------------------------------------------------------>
+    //跳转到职位发布页面
+    goCreat() {
+      this.$router.push({
+        path: '/creatJob',
+      });
+    },
+    goEdit(id) {
+      let data = {
+        id: id,
+        to: "checkjob"
+      }
+      this.$router.push({
+        path: '/creatJob',
+        query: data
+      });
     }
+    //添加新闻 end ------------------------------------------------------------>
+  },
+  mounted() {
+    this.creatNews_user_type = getUseType()
+    //1.获得初始数据
+    this.getData();
   }
-  </script>
-  
-  <style scoped lang="less">
-  
-  </style>
-  
+}
+</script>
+
+<style scoped lang="less"></style>

src/views/news/addJobHunting.vue

@@ -16,23 +16,24 @@
       </div>
       <el-form :model="form" ref="form" :rules="formRules" label-position="left" label-width="120px">
         <div class="formDiv">
-          <div v-if="creatNews_user_type != 10000">
+          <!-- <div v-if="creatNews_user_type != 10000">
             <el-form-item label="栏目名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的栏目名称" :props="parentData"
                 filterable clearable></el-cascader>
             </el-form-item>
-          </div>
+          </div> -->
           <div v-if="creatNews_user_type == 10000">
             <el-form-item label="站点名称：" prop="web_site_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称"
                 :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable
                 clearable></el-cascader>
             </el-form-item>
-            <el-form-item label="栏目名称：" prop="cat_arr_id" class="custom-align-right">
-              <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的栏目名称" :props="parentData_2"
-                filterable clearable></el-cascader>
-            </el-form-item>
           </div>
+          <el-form-item label="栏目名称：" prop="cat_arr_id" class="custom-align-right">
+            <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的栏目名称" :props="parentData_2"
+              filterable clearable></el-cascader>
+          </el-form-item>
+
           <!-- <div v-if="creatNews_user_type == 10000">
             <el-form-item label="推荐等级：" prop="" class="custom-align-right">
               <el-select v-model="form.job_level" clearable placeholder="请选择推荐等级">
@@ -457,7 +458,7 @@ export default {
         city_arr_id: [],
         salary: '',//薪资
         skillList: [{ 'skill': '' }],
-         job_experience: [{
+        job_experience: [{
           company_name: '',//公司名称*
           job_industry: '',//所属行业*
           job_typename: '', //职位类别*
@@ -576,25 +577,35 @@ export default {
           if (data && data.children && data.children.length !== 0) {
             return resolve(node)
           }
+
           let parentId;
+
           if (data != undefined) {
             parentId = data.value;
           } else {
             parentId = self.creatNews_pid_num.toString();
           }
+          if (self.form.web_site_id) {
+            this.websiteid = self.form.web_site_id;
+          } else {
+
+            this.websiteid = getWebSiteId();
+          }
+
           let parames = {
             'type': 5,
-            'website_id': self.form.web_site_id ? self.form.web_site_id : self.websiteid,
-            'pid': parentId
-
+            'website_id': this.websiteid ? this.websiteid : 0,
+            'pid': parentId ? parentId : 0
           }
-          self.$store.dispatch('pool/get_creatNews_nav_son_actions', parames).then(res => {
+          self.$store.dispatch('news/getWebsiteNavList', parames).then(res => {
+
             if (res.data) {
+              console.log('11111111112222222222222222', res.data);
+
               const nodes = res.data.map(item => ({
                 value: item.category_id,
                 label: item.alias,
                 leaf: level >= 3,
-                disabled: item.type != 5,
                 children: []
               }))
               resolve(nodes)

src/views/news/jobHuntingListApply.vue

@@ -23,7 +23,7 @@
     </div>
     <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>
@@ -178,7 +178,12 @@ export default {
       }).catch(() => {
         //输入驳回理由
         console.log("驳回")
-        this.examineWindow = true;
+
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
       })
     },
     upRow(id, status) {