Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

src/api/base/labourServices.js

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

src/api/base/labourServicesApprove.js

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

src/routers/modules/base.js

@@ -83,6 +83,15 @@ var routers = [
                         title: '企业信息审核'
                 }
         },
+        {
+                path: '/base/labourServicesApprove/list',
+                name: 'LabourServicesApproveList',
+                component: () => import('@/views/base/labourServicesApprove-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '劳务对接审核'
+                }
+        },
 ]
 
 export default routers;

src/views/base/enterpriseCertificationApprove-check.vue

@@ -105,7 +105,8 @@ export default {
 
       (function () {
         var formData = new FormData();
-        formData.append("id", self.companyKey);
+        formData.append("id", self.businessKey);
+        formData.append("cid", self.companyKey);
 
         return companyApi.checked(formData);
       })().then(function (response) {

src/views/base/labourServicesApprove-detail.vue

@@ -0,0 +1,112 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.td_tit1 {
+  font-size:18px;
+  color: #000;
+  height: 35px;
+}
+</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="24">
+              <div class="td_tit1">{{formModel.typeN}}</div>
+          </el-col>
+          <el-col :span="24">
+            <div v-html="formModel.content"></div>
+          </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 labourServicesApi from "@/api/base/labourServices";
+
+export default {
+  props: ["businessKey", "labourKey", "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);
+        formData.append("cid", self.labourKey);
+
+        return labourServicesApi.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 labourServicesApi.editChecked(self.labourKey);
+    })()
+    .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/labourServicesApprove-list.vue

@@ -0,0 +1,214 @@
+<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="/base/labourServicesApprove">劳务对接审核</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="approvalStatus">
+        <el-select v-model="queryModel.approvalStatus" 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
+          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-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="approvalStatusName" 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="labourServicesName" label="劳务对接" width="400" :show-overflow-tooltip="true"></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.approvalStatus==1" 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>
+    <labourServicesApprove-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :labourKey="labourKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></labourServicesApprove-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import LabourServicesApproveDetail from "./labourServicesApprove-detail";
+import labourServicesApproveApi from "@/api/base/labourServicesApprove";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        approvalStatus: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      labourKey: ""
+    };
+  },
+  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("approvalStatus", self.queryModel.approvalStatus);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      labourServicesApproveApi
+      .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;
+      });
+    },
+    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();
+    },
+    handleEdit(record) {
+      this.modalTitle = "审核";
+      this.businessKey = record.id;
+      this.labourKey = record.labourServicesId;
+      this.showModal = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "labourServicesApprove-detail": LabourServicesApproveDetail,
+  },
+};
+</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>

src/views/base/userAuthenticationApprove-detail.vue

@@ -36,7 +36,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-image style="width: 100%;" :src="formModel.idCardUrl" fit="contain">
+            <el-image v-for="item in formModel.idCardUrlArray" :key="item" :src="item" style="width: 100%;" fit="contain">
               <div slot="error" class="image-slot">
                 <i class="el-icon-picture-outline"></i>
               </div>