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

src/api/job/recruitment.js

@@ -93,6 +93,11 @@ function checked(formModel){
     }
   });
 }
+
+function editD(id){
+  return request.get(constant.serverUrl + "/job/recruitment/editD/" + id);
+}
+
 export default {
-  pageList,pageListHR,create,edit,add,update,remove,batchRemove,offShelf,batchOffShelf,down,batchDown,up,batchUp,editChecked,checked
+  pageList,pageListHR,create,edit,add,update,remove,batchRemove,offShelf,batchOffShelf,down,batchDown,up,batchUp,editChecked,checked,editD
 }

src/views/base/enterpriseCertificationApprove-check.vue

@@ -77,8 +77,8 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="danger" @click="handleSubmit" :loading="submitting">退 回</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
+      <el-button type="danger" @click="handleFail" :loading="submitting">退 回</el-button>
+      <el-button type="primary" @click="handlePass" :loading="submitting">通 过</el-button>
     </span>
   </el-dialog>
 </template>
@@ -101,13 +101,44 @@ export default {
     closeDialog() {
       this.$emit("close", false);
     },
-    handleSubmit() {
+    handlePass() {
       var self = this;
 
       (function () {
         var formData = new FormData();
         formData.append("id", self.businessKey);
         formData.append("cid", self.companyKey);
+        formData.append("approveStatus", "2");
+
+        return companyApi.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);
+        }
+      });
+    },
+    handleFail() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
+        formData.append("cid", self.companyKey);
+        formData.append("approveStatus", "4");
 
         return companyApi.checked(formData);
       })().then(function (response) {

src/views/base/enterpriseCertificationApprove-list.vue

@@ -23,6 +23,7 @@
         <el-select v-model="queryModel.isCertification" filterable placeholder="请选择审批状态" size="mini">
           <el-option label="未审批" value="1"></el-option>
           <el-option label="已审批" value="2"></el-option>
+          <el-option label="退回" value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -53,7 +54,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="isCertificationName" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="approveStatusName" 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="companyName" label="申请认证企业" width="180"></el-table-column>
@@ -61,7 +62,7 @@
       <el-table-column prop="approveTime" label="审核时间" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
-          <el-button v-if="row.isCertification==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
+          <el-button v-if="row.approveStatus==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -125,7 +126,7 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("isCertification", self.queryModel.isCertification);
+      formData.append("approveStatus", self.queryModel.isCertification);
 
       if (this.field != null) {
         formData.append("field", this.field);

src/views/base/labourServicesApprove-detail.vue

@@ -35,7 +35,8 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
+      <el-button type="danger" @click="handleFail" :loading="submitting">退 回</el-button>
+      <el-button type="primary" @click="handlePass" :loading="submitting">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -57,13 +58,44 @@ export default {
     closeDialog() {
       this.$emit("close", false);
     },
-    handleSubmit() {
+    handlePass() {
       var self = this;
 
       (function () {
         var formData = new FormData();
         formData.append("id", self.businessKey);
         formData.append("cid", self.labourKey);
+        formData.append("approveStatus", "2");
+
+        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);
+        }
+      });
+    },
+    handleFail() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
+        formData.append("cid", self.labourKey);
+        formData.append("approveStatus", "4");
 
         return labourServicesApi.checked(formData);
       })().then(function (response) {

src/views/base/labourServicesApprove-list.vue

@@ -23,6 +23,7 @@
         <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-option label="退回" value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -53,16 +54,16 @@
       @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="approveStatusName" label="审核状态" width="180"></el-table-column>
       <el-table-column prop="createByName" label="提交人" width="180"></el-table-column>
       <el-table-column prop="companyName" 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="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>
+          <el-button v-if="row.approveStatus==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -126,7 +127,7 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("approvalStatus", self.queryModel.approvalStatus);
+      formData.append("approveStatus", self.queryModel.approvalStatus);
 
       if (this.field != null) {
         formData.append("field", this.field);

src/views/base/userAuthenticationApprove-detail.vue

@@ -47,7 +47,8 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
+      <el-button type="danger" @click="handleFail" :loading="submitting">退 回</el-button>
+      <el-button type="primary" @click="handlePass" :loading="submitting">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -70,12 +71,42 @@ export default {
     closeDialog() {
       this.$emit("close", false);
     },
-    handleSubmit() {
+    handlePass() {
       var self = this;
 
       (function () {
         var formData = new FormData();
         formData.append("id", self.businessKey);
+        formData.append("approveStatus", "1");
+
+        return userAuthenticationApproveApi.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);
+        }
+      });
+    },
+    handleFail() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
+        formData.append("approveStatus", "4");
 
         return userAuthenticationApproveApi.checked(formData);
       })().then(function (response) {

src/views/job/recruitmentApprove-detail.vue

@@ -89,7 +89,6 @@
               <tr>
                 <td class="td_con">{{formModel.companyIndustryN}} | {{formModel.companyScaleN}}</td>
                 <td rowspan="2" align="right" valign="top">
-                    <!-- <el-avatar :size="56" shape="square" src='http://oss.xiaoxinda.com/enterprise/personInfo/2021/8/b16c75d5-2d5c-4236-b8ec-c7ab8ecb6f14/336.jpg?x-oss-process=image/resize,m_fill,w_64,h_64'></el-avatar> -->
                     <el-avatar :size="56" shape="square" :src="formModel.companyLogo"></el-avatar>
                 </td>
               </tr>
@@ -108,7 +107,8 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+      <el-button type="danger" @click="handleFail" :loading="submitting">退 回</el-button>
+      <el-button type="primary" @click="handlePass" :loading="submitting">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -130,13 +130,44 @@ export default {
     closeDialog() {
       this.$emit("close", false);
     },
-    handleSubmit() {
+    handlePass() {
       var self = this;
 
       (function () {
         var formData = new FormData();
         formData.append("id", self.businessKey);
         formData.append("approveId", self.approveKey);
+        formData.append("approveStatus", "3");
+
+        return recruitmentApi.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);
+        }
+      });
+    },
+    handleFail() {
+      var self = this;
+
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
+        formData.append("approveId", self.approveKey);
+        formData.append("approveStatus", "4");
 
         return recruitmentApi.checked(formData);
       })().then(function (response) {
@@ -164,7 +195,7 @@ export default {
     var self = this;
 
     (function () {
-        return recruitmentApi.edit(self.businessKey);
+        return recruitmentApi.editD(self.businessKey);
     })()
     .then((response) => {
       var jsonData = response.data;

src/views/job/recruitmentApprove-list.vue

@@ -23,6 +23,7 @@
         <el-select v-model="queryModel.approveStatus" filterable placeholder="请选择审批状态" size="mini">
           <el-option label="未审批" value="2"></el-option>
           <el-option label="已审批" value="3"></el-option>
+          <el-option label="退回" value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>