flat: 暂存

src/api/manage/mission.js

@@ -95,3 +95,12 @@ export const download = (query) => {
   return  `jobslink-api/missions/mission/export-mission?companyName=${companyName}&missionNo=${missionNo}&missionTitle=${missionTitle}&type=${type}&stime=${stime}&etime=${etime}&status=${status}&Jobslink-Auth=${getToken()}`
 */
 };
+
+
+export const Auditing = (data) => {
+  return request({
+    url: "/api/jobslink-api/user/userrecruit/approval",
+    method: "post",
+    data,
+  });
+};

src/common/dic.js

@@ -358,3 +358,10 @@ export const recruitStatus = [
   { value: 1, label: "未审核" },
   { value: 0, label: "通过" },
 ];
+export const dataSourcesEnum = [
+  // { value: -1, label: "总集数据中心" },
+  { value: 1, label: "总集数据中心" },
+  { value: 2, label: "我的招工" },
+  { value: 3, label: "社区发布" },
+  { value: 4, label: "爬取" },
+]

src/views/manage/mission/index.vue

@@ -61,6 +61,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="审核状态：">
+          <el-select v-model="query.reviewState">
+            <el-option
+              v-for="(item, index) in recruitStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据来源：">
+          <el-select v-model="query.dataSources">
+            <el-option
+              v-for="(item, index) in dataSourcesEnum"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <div class="searchBtn">
           <el-button
             type="primary"
@@ -141,11 +161,12 @@ import {
   complet,
   getDetail,
   download,
+  Auditing
 } from "@/api/manage/mission";
 import { mapGetters } from "vuex";
 import missionView from "@/views/util/mission-view";
 import zpView from "./zpView";
-import { missionState, wageUnitCategoryState } from "@/common/dic";
+import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum } from "@/common/dic";
 import { calcDate } from "@/util/date";
 import { Message } from "element-ui";
 import lodash from "lodash";
@@ -163,6 +184,8 @@ export default {
   name: "manage_mission",
   data() {
     return {
+      recruitStatus,
+      dataSourcesEnum,
       view: {},
       form: {},
       selectionList: [],
@@ -310,11 +333,21 @@ export default {
             display: false,
             span: 24,
             width: 80,
+          }, {
+            label: "数据来源",
+            prop: "dataSources",
+            dicData: dataSourcesEnum,
+            display: false,
+            span: 24,
+            width: 80,
+          },{
+            label: "审核状态",
+            prop: "reviewState",
+            dicData: recruitStatus,
+            display: false,
+            span: 24,
+            width: 80,
           },
-          // {
-          //   label:"备注",
-          //   prop:"remarks"
-          // }
         ],
       },
       data: [],
@@ -436,6 +469,7 @@ export default {
       this.$refs.delay.open(row.missionNo);
     },
     handleCheck() {
+      let self = this
       if (this.ids.length < 1) {
         message({
           type: "warning",
@@ -446,7 +480,7 @@ export default {
       let idList = [];
       for (let i = 0; i < this.ids.length; i++) {
         this.data.forEach((ele) => {
-          if (ele.status == 1 && ele.id == this.ids[i]) {
+          if (ele.id == this.ids[i]) {
             idList.push(ele.id);
           }
         });
@@ -458,33 +492,56 @@ export default {
         let h = this.$createElement;
         this.$prompt(
           h("p", { style: "color: #F56C6C" }, "一旦驳回无法进行后续操作"),
-          "您确定要驳回此任务吗？",
+          "请核对招聘信息后再进行审核通过",
           {
-            confirmButtonText: "确定",
+            distinguishCancelAndClose: true,
-            cancelButtonText: "取消",
+            confirmButtonText: "通 过",
+            cancelButtonText: "驳 回",
             type: "warning",
             center: true,
             inputType: "textarea",
             inputPlaceholder: "备注驳回原因",
+            beforeClose: function(action, instance, done) {
+              if(action === 'cancel') {
+                if (!instance.inputValue) {
+                  return this.$message({
+                    type: "info",
+                    message: "请输入驳回原因!",
+                  });
+                }
+                self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
+              } else if(action === 'confirm') {
+                self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
+              } else {
+                done()
+              }
+            }
           }
         )
-          .then(({ value }) => {
+      }
+    },
+    handelFetchAuditing(idList, reviewState, msg, message) {
+      return new Promise((resolve, reject) => {
+        let arr = idList.map((item) => ({
+          id: item,
+          reviewState: reviewState,
+          reviewMsg: msg || '',
+          jobType: 0,
+        }))
         this.loading = true;
-            review(idList.join(","), value)
+        Auditing(arr).then(() => {
-              .then(() => {
           this.loading = false;
           this.onLoad(this.page, this.params);
           this.$message({
-                  type: "success",
+            type: message ? "info" : "success",
-                  message: "操作成功!",
+            message: message || "审核通过，操作成功!",
           });
-              })
+          resolve()
-              .catch(() => {
+        }).catch(() => {
           this.loading = false;
+          reject()
         });
       })
-          .catch(() => {});
-      }
     },
     downRecords() {
       if (this.query.time) {

src/views/manage/recruit/index.vue

@@ -59,6 +59,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="审核状态：">
+          <el-select v-model="query.reviewState">
+            <el-option
+              v-for="(item, index) in recruitStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据来源：">
+          <el-select v-model="query.dataSources">
+            <el-option
+              v-for="(item, index) in dataSourcesEnum"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <div class="searchBtn">
           <el-button
             type="primary"
@@ -115,7 +135,7 @@
           v-if="vaildData(permission.manage_mission_check, false) && row.reviewState === 1"
           type="text"
           size="small"
-          @click.stop="handleCheck(row)"
+          @click.stop="handleCheck"
           >审核</el-button
         >
       </template>
@@ -123,19 +143,6 @@
     <el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
       <post-view :model="view"></post-view>
     </el-drawer>
-    <el-dialog
-      title="审核"
-      :visible.sync="centerDialogVisible"
-      width="30%"
-      append-to-body
-      center>
-      <span>请核对招聘信息后再进行审核通过</span>
-      <span slot="footer" class="dialog-footer">
-         <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="warning" @click="handelAuditing(0)">不通过</el-button>
-        <el-button type="primary" @click="handelAuditing(9)">通 过</el-button>
-      </span>
-    </el-dialog>
   </basic-container>
 </template>
 
@@ -148,10 +155,11 @@ import  {
 import { mapGetters } from "vuex";
 import postView from "@/views/util/post-view.vue";
 import zpView from "./zpView.vue";
-import { recruitStatus, wageUnitCategoryState} from "@/common/dic";
+import {dataSourcesEnum, recruitStatus, wageUnitCategoryState} from "@/common/dic";
 import { calcDate } from "@/util/date";
 import { Message } from "element-ui";
 import lodash from "lodash";
+import {Auditing} from "@/api/manage/mission";
 
 const message = lodash.throttle(
   function (options) {
@@ -167,6 +175,7 @@ export default {
   data() {
     return {
       recruitStatus,
+      dataSourcesEnum,
       view: {},
       form: {},
       selectionList: [],
@@ -304,8 +313,6 @@ export default {
         ],
       },
       data: [],
-      centerDialogVisible: false,
-      AuditingData: null,
     };
   },
   computed: {
@@ -420,26 +427,80 @@ export default {
     handleDelay(row) {
       this.$refs.delay.open(row.missionNo);
     },
-    async handelAuditing(type) {
+    handleCheck() {
-      const {id, jobType} = this.AuditingData
+      let self = this
-      let resData = await review({id, reviewState: type, jobType})
+      if (this.ids.length < 1) {
-      this.AuditingData = null
-      this.centerDialogVisible = false
-      if(resData.data.code === 200) {
-        this.$message({
-          type: "success",
-          message: "审核成功!",
-        });
-      } else {
         message({
           type: "warning",
-            message: "审核失败",
+          message: "请至少选择一条数据",
+        });
+        return;
+      }
+      let idList = [];
+      for (let i = 0; i < this.ids.length; i++) {
+        this.data.forEach((ele) => {
+          if (ele.id == this.ids[i]) {
+            idList.push(ele.id);
+          }
         });
       }
+
+      if (idList.length == 0) {
+        this.$message.error("只能驳回【招聘中】的任务");
+      } else {
+        let h = this.$createElement;
+        this.$prompt(
+          h("p", {style: "color: #F56C6C"}, "一旦驳回无法进行后续操作"),
+          "请核对招聘信息后再进行审核通过",
+          {
+            distinguishCancelAndClose: true,
+            confirmButtonText: "通 过",
+            cancelButtonText: "驳 回",
+            type: "warning",
+            center: true,
+            inputType: "textarea",
+            inputPlaceholder: "备注驳回原因",
+            beforeClose: function (action, instance, done) {
+              if (action === 'cancel') {
+                if (!instance.inputValue) {
+                  return this.$message({
+                    type: "info",
+                    message: "请输入驳回原因!",
+                  });
+                }
+                self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
+              } else if (action === 'confirm') {
+                self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
+              } else {
+                done()
+              }
+            }
+          }
+        )
+      }
     },
-    handleCheck(row) {
+    handelFetchAuditing(idList, reviewState, msg, message) {
-      this.centerDialogVisible = true
+      return new Promise((resolve, reject) => {
-      this.AuditingData = row
+        let arr = idList.map((item) => ({
+          id: item,
+          reviewState: reviewState,
+          reviewMsg: msg || '',
+          jobType: 2,
+        }))
+        this.loading = true;
+        Auditing(arr).then(() => {
+          this.loading = false;
+          this.onLoad(this.page, this.params);
+          this.$message({
+            type: message ? "info" : "success",
+            message: message || "审核通过，操作成功!",
+          });
+          resolve()
+        }).catch(() => {
+          this.loading = false;
+          reject()
+        });
+      })
     },
   },
 };

src/views/manage/works/index.vue

@@ -59,6 +59,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="审核状态：">
+          <el-select v-model="query.reviewState">
+            <el-option
+              v-for="(item, index) in recruitStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据来源：">
+          <el-select v-model="query.dataSources">
+            <el-option
+              v-for="(item, index) in dataSourcesEnum"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <div class="searchBtn">
           <el-button
             type="primary"
@@ -148,10 +168,11 @@ import {
 import { mapGetters } from "vuex";
 import postView from "@/views/util/post-view";
 import zpView from "./zpView";
-import { companyPostState, wageUnitCategoryState } from "@/common/dic";
+import {companyPostState, dataSourcesEnum, recruitStatus, wageUnitCategoryState} from "@/common/dic";
 import { calcDate } from "@/util/date";
 import { Message } from "element-ui";
 import lodash from "lodash";
+import {Auditing} from "@/api/manage/mission";
 
 const message = lodash.throttle(
   function (options) {
@@ -166,6 +187,8 @@ export default {
   name: "manage_mission",
   data() {
     return {
+      recruitStatus,
+      dataSourcesEnum,
       view: {},
       form: {},
       selectionList: [],
@@ -315,6 +338,20 @@ export default {
             display: false,
             span: 24,
             width: 80,
+          },{
+            label: "数据来源",
+            prop: "dataSources",
+            dicData: dataSourcesEnum,
+            display: false,
+            span: 24,
+            width: 80,
+          },{
+            label: "审核状态",
+            prop: "reviewState",
+            dicData: recruitStatus,
+            display: false,
+            span: 24,
+            width: 80,
           },
           // {
           //   label:"备注",
@@ -444,6 +481,7 @@ export default {
       this.$refs.delay.open(row.missionNo);
     },
     handleCheck() {
+      let self = this
       if (this.ids.length < 1) {
         message({
           type: "warning",
@@ -454,7 +492,7 @@ export default {
       let idList = [];
       for (let i = 0; i < this.ids.length; i++) {
         this.data.forEach((ele) => {
-          if (ele.jobStatus == 1 && ele.id == this.ids[i]) {
+          if (ele.id == this.ids[i]) {
             idList.push(ele.id);
           }
         });
@@ -466,33 +504,56 @@ export default {
         let h = this.$createElement;
         this.$prompt(
           h("p", { style: "color: #F56C6C" }, "一旦驳回无法进行后续操作"),
-          "您确定要驳回此任务吗？",
+          "请核对招聘信息后再进行审核通过",
           {
-            confirmButtonText: "确定",
+            distinguishCancelAndClose: true,
-            cancelButtonText: "取消",
+            confirmButtonText: "通 过",
+            cancelButtonText: "驳 回",
             type: "warning",
             center: true,
             inputType: "textarea",
             inputPlaceholder: "备注驳回原因",
+            beforeClose: function(action, instance, done) {
+              if(action === 'cancel') {
+                if (!instance.inputValue) {
+                  return this.$message({
+                    type: "info",
+                    message: "请输入驳回原因!",
+                  });
+                }
+                self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
+              } else if(action === 'confirm') {
+                self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
+              } else {
+                done()
+              }
+            }
           }
         )
-          .then(({ value }) => {
+      }
+    },
+    handelFetchAuditing(idList, reviewState, msg, message) {
+      return new Promise((resolve, reject) => {
+        let arr = idList.map((item) => ({
+          id: item,
+          reviewState: reviewState,
+          reviewMsg: msg || '',
+          jobType: 1,
+        }))
         this.loading = true;
-            review(idList.join(","), value)
+        Auditing(arr).then(() => {
-              .then(() => {
           this.loading = false;
           this.onLoad(this.page, this.params);
           this.$message({
-                  type: "success",
+            type: message ? "info" : "success",
-                  message: "操作成功!",
+            message: message || "审核通过，操作成功!",
           });
-              })
+          resolve()
-              .catch(() => {
+        }).catch(() => {
           this.loading = false;
+          reject()
         });
       })
-          .catch(() => {});
-      }
     },
     downRecords() {
       if (this.query.time) {

src/views/util/mission-view.vue

@@ -182,6 +182,28 @@
             </el-col>
           </el-row>
         </el-collapse-item>
+
+        <el-collapse-item title="审核状态" name="5" disabled="true">
+          <template slot="title">
+            <div class="avue-group__header">
+              <div class="avue-group__title">审核信息</div>
+            </div>
+          </template>
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="审核状态：">{{
+                  recruit[model.reviewState]
+                }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="审核备注：">{{
+                  model.reviewMsg || '无'
+                }}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
       </el-collapse>
     </el-form>
   </div>
@@ -195,6 +217,7 @@ import {
   wageUnitCategoryState,
   educationState,
   genderState,
+  recruitStatus
 } from "@/common/dic";
 
 function getDic(arr) {
@@ -210,10 +233,11 @@ export default {
   props: { model: Object },
   data() {
     return {
-      activeNames: ["1", "2", "3", "4"],
+      activeNames: ["1", "2", "3", "4", "5"],
       wageUnitCategory: getDic(wageUnitCategoryState),
       education: getDic(educationState),
       gender: getDic(genderState),
+      recruit: getDic(recruitStatus),
     };
   },
   mounted() { },

src/views/util/post-view.vue

@@ -182,6 +182,28 @@
             </el-col>
           </el-row>
         </el-collapse-item>
+
+        <el-collapse-item title="审核状态" name="5" disabled="true">
+          <template slot="title">
+            <div class="avue-group__header">
+              <div class="avue-group__title">审核信息</div>
+            </div>
+          </template>
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="审核状态：">{{
+                  recruit[model.reviewState]
+                }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="审核备注：">{{
+                  model.reviewMsg || '无'
+                }}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
       </el-collapse>
     </el-form>
   </div>
@@ -194,7 +216,7 @@ import { dateFormat } from "@/util/date";
 import {
   wageUnitCategoryState,
   educationState,
-  genderState,
+  genderState, recruitStatus,
 } from "@/common/dic";
 
 function getDic(arr) {
@@ -210,10 +232,11 @@ export default {
   props: { model: Object },
   data() {
     return {
-      activeNames: ["1", "2", "3", "4"],
+      activeNames: ["1", "2", "3", "4", "5"],
       wageUnitCategory: getDic(wageUnitCategoryState),
       education: getDic(educationState),
       gender: getDic(genderState),
+      recruit: getDic(recruitStatus),
     };
   },
   mounted() { },

vue.config.js

@@ -24,9 +24,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://localhost:8000', // 本地服务接口地址
-        target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
         // target: "http://192.168.3.108:8000",  // 本地
-        // target: 'http://192.168.3.111:8000',
+        target: 'http://192.168.3.111:8000', 
         ws: true,
         changeOrigin: true,
         pathRewrite: {