From c741f0f46f60b5827544d6d45c5404862b2ef08b Mon Sep 17 00:00:00 2001
From: e <2538815847@qq.com>
Date: Mon, 15 Jul 2024 18:53:48 +0800
Subject: [PATCH] update

---
 src/api/applySupermarket/personBack/index.js  |  2 +-
 .../businessConsulting/index.vue              | 36 ++++++++++++--
 src/views/applySupermarket/index.vue          |  3 +-
 .../keyPerson/components/detailDialog.vue     | 32 ++++---------
 .../keyPerson/components/examineDialog.vue    | 46 ++++++++++--------
 .../applySupermarket/keyPerson/index.vue      | 24 +++++-----
 .../applySupermarket/legalAdvice/index.vue    | 37 ++++++++++++---
 .../personBack/components/detailDialog.vue    | 30 ++++--------
 .../personBack/components/examineDialog.vue   | 47 ++++++++++++-------
 .../applySupermarket/personBack/index.vue     | 12 ++---
 10 files changed, 157 insertions(+), 112 deletions(-)

diff --git a/src/api/applySupermarket/personBack/index.js b/src/api/applySupermarket/personBack/index.js
index 7ae2d48..38609a5 100644
--- a/src/api/applySupermarket/personBack/index.js
+++ b/src/api/applySupermarket/personBack/index.js
@@ -36,7 +36,7 @@ export function getDetail(id) {
 // 修改人员审核相关
 export function modifyPerson(data) {
   return request({
-    url: "/prepare/verification/",
+    url: "/prepare/verification",
     method: "put",
     data,
   });
diff --git a/src/views/applySupermarket/businessConsulting/index.vue b/src/views/applySupermarket/businessConsulting/index.vue
index a79ca83..87a9dab 100644
--- a/src/views/applySupermarket/businessConsulting/index.vue
+++ b/src/views/applySupermarket/businessConsulting/index.vue
@@ -40,7 +40,7 @@
                 </div>
                 <div class="item">
                   <div class="label">回复内容：</div>
-                  <div class="value">{{ item.card }}</div>
+                  <div class="value">{{ item.consultResult }}</div>
                 </div>
                 <div class="item">
                   <div class="label">状态：</div>
@@ -51,7 +51,14 @@
                 </div>
               </div>
               <div class="opt">
-                <div class="" @click="checkDetail(item)">详情</div>
+                <div
+                  class="optBtn mr14"
+                  v-if="item.auditState == '1'"
+                  @click="examine(item)"
+                >
+                  审核
+                </div>
+                <div class="optBtn" @click="checkDetail(item)">详情</div>
               </div>
             </div>
           </el-col>
@@ -68,12 +75,19 @@
       >
       </gMainTable>
     </div>
-    <FormDialog ref="formDialog" :formItems="formItems" width="800px">
+    <FormDialog
+      ref="formDialog"
+      :formItems="formItems"
+      width="800px"
+      @formSubmit="formSubmit"
+    >
     </FormDialog>
   </div>
 </template>
 <script>
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { modifyPerson } from "@/api/applySupermarket/personBack";
+
 export default {
   mixins: [tableListMixins],
   data() {
@@ -96,7 +110,7 @@ export default {
             span: 22,
           },
           attrs: {
-            model: "name",
+            model: "consultResult",
             value: "",
             placeholder: "",
             rows: 5,
@@ -118,12 +132,24 @@ export default {
     checkDetail(obj) {
       this.$refs.formDialog.openDialog("detail", obj);
     },
+    examine(obj) {
+      this.$refs.formDialog.openDialog("other", obj, "业务咨询审核");
+    },
     reset() {
       this.queryParam = {};
       this.queryParam.verificationType = 3;
       this.searchQuery();
     },
-    formSubmit(obj) {},
+    formSubmit(obj) {
+      console.log(obj);
+      obj.verificationType = 3;
+      modifyPerson(obj).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("操作成功！");
+          this.$refs["formDialog"].handleClose();
+        }
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/applySupermarket/index.vue b/src/views/applySupermarket/index.vue
index 89d1ccc..45a5bb7 100644
--- a/src/views/applySupermarket/index.vue
+++ b/src/views/applySupermarket/index.vue
@@ -762,7 +762,8 @@ export default {
 }
 </style>
 <style lang="less">
-.ahsqDialogPanel {
+.ahsqDialogPanel,
+.examineDialogPanel {
   height: 100%;
   color: #ffffff;
   .msgDetailLine {
diff --git a/src/views/applySupermarket/keyPerson/components/detailDialog.vue b/src/views/applySupermarket/keyPerson/components/detailDialog.vue
index 792a960..b1e01ac 100644
--- a/src/views/applySupermarket/keyPerson/components/detailDialog.vue
+++ b/src/views/applySupermarket/keyPerson/components/detailDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="人员背景审核结果"
+    title="重点岗位审核详情"
     :visible.sync="dialogVisible"
     width="80%"
     :before-close="handleClose"
@@ -19,19 +19,17 @@
           </div>
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查人数：</div>
-            <div class="msgDetailValue">
-              {{
-                dataInfo.detailsByAuditResultTrue.length +
-                dataInfo.detailsByAuditResultFalse.length
-              }}人
-            </div>
+            <div class="msgDetailValue">{{ dataInfo.investigateCount }}人</div>
           </div>
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查结果：</div>
             <div class="msgDetailValue">
-              {{ dataInfo.detailsByAuditResultTrue.length }}人正常，{{
-                dataInfo.detailsByAuditResultFalse.length
-              }}人异常
+              <span v-if="dataInfo.auditState == '1'">未审核</span>
+              <span v-else>
+                {{ dataInfo.detailsByAuditResultTrue.length }}人正常，{{
+                  dataInfo.detailsByAuditResultFalse.length
+                }}人异常
+              </span>
             </div>
           </div>
         </div>
@@ -44,7 +42,6 @@
           :tableData="tableList"
           :columns="columns"
           rowKey="id"
-          :pagination="{}"
         >
           <template v-slot:resultSlot="{ scope }">
             <span v-if="scope.row.auditResult == '0'">正常</span>
@@ -67,8 +64,6 @@
 </template>
 
 <script>
-import { getDetail } from "@/api/applySupermarket/personBack";
-
 export default {
   data() {
     return {
@@ -114,16 +109,7 @@ export default {
       console.log(obj);
       this.dataInfo = obj;
 
-      this.tableList = obj.detailsByAuditResultFalse.concat(
-        obj.detailsByAuditResultTrue
-      );
-
-      /* getDetail(obj.id).then((res) => {
-        if (res.code == 200) {
-          this.tableList = res.data.details || [];
-          this.dataInfo = res.data;
-        }
-      }); */
+      this.tableList = obj.details || [];
     },
 
     handleClose() {
diff --git a/src/views/applySupermarket/keyPerson/components/examineDialog.vue b/src/views/applySupermarket/keyPerson/components/examineDialog.vue
index ad9bb02..79a64b8 100644
--- a/src/views/applySupermarket/keyPerson/components/examineDialog.vue
+++ b/src/views/applySupermarket/keyPerson/components/examineDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="人员背景审核结果"
+    title="重点岗位审核结果"
     :visible.sync="dialogVisible"
     width="80%"
     :before-close="handleClose"
@@ -20,7 +20,7 @@
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查人数：</div>
             <div class="msgDetailValue">
-              {{ (dataInfo.details && dataInfo.details.length) || 0 }}人
+              {{ dataInfo.investigateCount || 0 }}人
             </div>
           </div>
         </div>
@@ -33,7 +33,6 @@
           :tableData="tableList"
           :columns="columns"
           rowKey="id"
-          :pagination="{}"
         >
           <template v-slot:photoSlot="{ scope }">
             <el-image
@@ -45,12 +44,8 @@
             </el-image>
           </template>
           <template v-slot:optSlot="{ scope }">
-            <el-radio v-model="scope.row.auditResult" label="正常"
-              >正常</el-radio
-            >
-            <el-radio v-model="scope.row.auditResult" label="异常"
-              >异常</el-radio
-            >
+            <el-radio v-model="scope.row.auditResult" label="0">正常</el-radio>
+            <el-radio v-model="scope.row.auditResult" label="1">异常</el-radio>
           </template>
         </gMainTable>
       </div>
@@ -61,9 +56,9 @@
     </div>
   </el-dialog>
 </template>
-  
-  <script>
-import { getDetail, modifyPerson } from "@/api/applySupermarket/personBack";
+
+<script>
+import { modifyPerson } from "@/api/applySupermarket/personBack";
 
 export default {
   data() {
@@ -86,11 +81,11 @@ export default {
           },
         },
         {
-          prop: "card",
+          prop: "cardId",
           label: "身份证号",
         },
         {
-          prop: "reason",
+          prop: "auditReason",
           label: "审查原因",
         },
         {
@@ -110,18 +105,31 @@ export default {
     openDialog(obj) {
       this.dialogVisible = true;
 
-      getDetail(obj.id).then((res) => {
+      this.dataInfo = obj;
+
+      this.tableList = obj.details || [];
+    },
+    sureExamine() {
+      console.log(this.tableList);
+      for (let i = 0; i < this.tableList.length; i++) {
+        if (!this.tableList[i]["auditResult"]) {
+          this.$message.info("存在未审核处理的数据！");
+          return;
+        }
+      }
+
+      this.dataInfo.verificationType = 2;
+      this.dataInfo.details = this.tableList;
+      modifyPerson(this.dataInfo).then((res) => {
         if (res.code == 200) {
-          this.tableList = res.data.details || [];
-          this.dataInfo = res.data;
+          this.$message.success("操作成功！");
+          this.handleClose();
         }
       });
     },
-    sureExamine() {},
     handleClose() {
       this.dialogVisible = false;
     },
   },
 };
 </script>
-  
\ No newline at end of file
diff --git a/src/views/applySupermarket/keyPerson/index.vue b/src/views/applySupermarket/keyPerson/index.vue
index 9b9f8a6..a327a5c 100644
--- a/src/views/applySupermarket/keyPerson/index.vue
+++ b/src/views/applySupermarket/keyPerson/index.vue
@@ -17,7 +17,7 @@
         </el-form>
       </div>
     </div>
-    <div class="enterServiceWrap">
+    <div class="enterServiceWrap enterServiceCardWrap">
       <div class="enterServicePanel">
         <el-row :gutter="20">
           <el-col :span="6" v-for="item in dataSource" :key="item.id">
@@ -28,12 +28,7 @@
               <div class="enterBtm">
                 <div class="item">
                   <div class="label">重点人数：</div>
-                  <div class="value">
-                    {{
-                      item.detailsByAuditResultTrue.length +
-                      item.detailsByAuditResultFalse.length
-                    }}
-                  </div>
+                  <div class="value">{{ item.investigateCount || 0 }}人</div>
                 </div>
                 <div class="item">
                   <div class="label">申请时间：</div>
@@ -77,7 +72,7 @@
       </gMainTable>
     </div>
     <detailDialog ref="detailDialog"></detailDialog>
-    <examineDialog ref="examineDialog"></examineDialog>
+    <examineDialog ref="examineDialog" @search="searchQuery"></examineDialog>
   </div>
 </template>
 <script>
@@ -131,9 +126,6 @@ export default {
 .enterpriseService {
   height: 100%;
   overflow: hidden;
-  /deep/.el-table {
-    display: none;
-  }
 }
 .enterServiceWrap {
   height: calc(100% - 60px);
@@ -193,4 +185,12 @@ export default {
   }
 }
 </style>
-
+<style lang="less">
+.enterpriseService {
+  .enterServiceCardWrap {
+    .el-table {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/applySupermarket/legalAdvice/index.vue b/src/views/applySupermarket/legalAdvice/index.vue
index 5941df7..ceece0e 100644
--- a/src/views/applySupermarket/legalAdvice/index.vue
+++ b/src/views/applySupermarket/legalAdvice/index.vue
@@ -40,7 +40,7 @@
                 </div>
                 <div class="item">
                   <div class="label">回复内容：</div>
-                  <div class="value">{{ item.card }}</div>
+                  <div class="value">{{ item.consultResult }}</div>
                 </div>
                 <div class="item">
                   <div class="label">状态：</div>
@@ -51,7 +51,14 @@
                 </div>
               </div>
               <div class="opt">
-                <div class="" @click="checkDetail(item)">详情</div>
+                <div
+                  class="optBtn mr14"
+                  v-if="item.auditState == '1'"
+                  @click="examine(item)"
+                >
+                  审核
+                </div>
+                <div class="optBtn" @click="checkDetail(item)">详情</div>
               </div>
             </div>
           </el-col>
@@ -68,12 +75,19 @@
       >
       </gMainTable>
     </div>
-    <FormDialog ref="formDialog" :formItems="formItems" width="800px">
+    <FormDialog
+      @formSubmit="formSubmit"
+      ref="formDialog"
+      :formItems="formItems"
+      width="800px"
+    >
     </FormDialog>
   </div>
 </template>
 <script>
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { modifyPerson } from "@/api/applySupermarket/personBack";
+
 export default {
   mixins: [tableListMixins],
   data() {
@@ -96,7 +110,7 @@ export default {
             span: 22,
           },
           attrs: {
-            model: "name",
+            model: "consultResult",
             value: "",
             placeholder: "",
             rows: 5,
@@ -118,12 +132,24 @@ export default {
     checkDetail(obj) {
       this.$refs.formDialog.openDialog("detail", obj);
     },
+    examine(obj) {
+      this.$refs.formDialog.openDialog("other", obj, "法律咨询审核");
+    },
     reset() {
       this.queryParam = {};
       this.queryParam.verificationType = 4;
       this.searchQuery();
     },
-    formSubmit(obj) {},
+    formSubmit(obj) {
+      console.log(obj);
+      obj.verificationType = 4;
+      modifyPerson(obj).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("操作成功！");
+          this.$refs["formDialog"].handleClose();
+        }
+      });
+    },
   },
 };
 </script>
@@ -192,4 +218,3 @@ export default {
   }
 }
 </style>
-
diff --git a/src/views/applySupermarket/personBack/components/detailDialog.vue b/src/views/applySupermarket/personBack/components/detailDialog.vue
index 792a960..635b3f7 100644
--- a/src/views/applySupermarket/personBack/components/detailDialog.vue
+++ b/src/views/applySupermarket/personBack/components/detailDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="人员背景审核结果"
+    title="人员背景审核详情"
     :visible.sync="dialogVisible"
     width="80%"
     :before-close="handleClose"
@@ -19,19 +19,17 @@
           </div>
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查人数：</div>
-            <div class="msgDetailValue">
-              {{
-                dataInfo.detailsByAuditResultTrue.length +
-                dataInfo.detailsByAuditResultFalse.length
-              }}人
-            </div>
+            <div class="msgDetailValue">{{ dataInfo.investigateCount }}人</div>
           </div>
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查结果：</div>
             <div class="msgDetailValue">
-              {{ dataInfo.detailsByAuditResultTrue.length }}人正常，{{
-                dataInfo.detailsByAuditResultFalse.length
-              }}人异常
+              <span v-if="dataInfo.auditState == '1'">未审核</span>
+              <span v-else>
+                {{ dataInfo.detailsByAuditResultTrue.length }}人正常，{{
+                  dataInfo.detailsByAuditResultFalse.length
+                }}人异常
+              </span>
             </div>
           </div>
         </div>
@@ -44,7 +42,6 @@
           :tableData="tableList"
           :columns="columns"
           rowKey="id"
-          :pagination="{}"
         >
           <template v-slot:resultSlot="{ scope }">
             <span v-if="scope.row.auditResult == '0'">正常</span>
@@ -114,16 +111,7 @@ export default {
       console.log(obj);
       this.dataInfo = obj;
 
-      this.tableList = obj.detailsByAuditResultFalse.concat(
-        obj.detailsByAuditResultTrue
-      );
-
-      /* getDetail(obj.id).then((res) => {
-        if (res.code == 200) {
-          this.tableList = res.data.details || [];
-          this.dataInfo = res.data;
-        }
-      }); */
+      this.tableList = obj.details || [];
     },
 
     handleClose() {
diff --git a/src/views/applySupermarket/personBack/components/examineDialog.vue b/src/views/applySupermarket/personBack/components/examineDialog.vue
index ad9bb02..defd1e4 100644
--- a/src/views/applySupermarket/personBack/components/examineDialog.vue
+++ b/src/views/applySupermarket/personBack/components/examineDialog.vue
@@ -20,7 +20,7 @@
           <div class="msgDetailItem">
             <div class="msgDetailLabel">审查人数：</div>
             <div class="msgDetailValue">
-              {{ (dataInfo.details && dataInfo.details.length) || 0 }}人
+              {{ dataInfo.investigateCount || 0 }}人
             </div>
           </div>
         </div>
@@ -33,7 +33,6 @@
           :tableData="tableList"
           :columns="columns"
           rowKey="id"
-          :pagination="{}"
         >
           <template v-slot:photoSlot="{ scope }">
             <el-image
@@ -45,12 +44,8 @@
             </el-image>
           </template>
           <template v-slot:optSlot="{ scope }">
-            <el-radio v-model="scope.row.auditResult" label="正常"
-              >正常</el-radio
-            >
-            <el-radio v-model="scope.row.auditResult" label="异常"
-              >异常</el-radio
-            >
+            <el-radio v-model="scope.row.auditResult" label="0">正常</el-radio>
+            <el-radio v-model="scope.row.auditResult" label="1">异常</el-radio>
           </template>
         </gMainTable>
       </div>
@@ -61,9 +56,9 @@
     </div>
   </el-dialog>
 </template>
-  
-  <script>
-import { getDetail, modifyPerson } from "@/api/applySupermarket/personBack";
+
+<script>
+import { modifyPerson } from "@/api/applySupermarket/personBack";
 
 export default {
   data() {
@@ -86,11 +81,11 @@ export default {
           },
         },
         {
-          prop: "card",
+          prop: "cardId",
           label: "身份证号",
         },
         {
-          prop: "reason",
+          prop: "auditReason",
           label: "审查原因",
         },
         {
@@ -110,18 +105,38 @@ export default {
     openDialog(obj) {
       this.dialogVisible = true;
 
-      getDetail(obj.id).then((res) => {
+      this.tableList = obj.details || [];
+      this.dataInfo = obj;
+
+      /* getDetail(obj.id).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.details || [];
           this.dataInfo = res.data;
         }
+      }); */
+    },
+    sureExamine() {
+      console.log(this.tableList);
+      for (let i = 0; i < this.tableList.length; i++) {
+        if (!this.tableList[i]["auditResult"]) {
+          this.$message.info("存在未审核处理的数据！");
+          return;
+        }
+      }
+
+      this.dataInfo.verificationType = 1;
+      this.dataInfo.details = this.tableList;
+      modifyPerson(this.dataInfo).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("操作成功！");
+          this.handleClose();
+          this.$emit("search");
+        }
       });
     },
-    sureExamine() {},
     handleClose() {
       this.dialogVisible = false;
     },
   },
 };
 </script>
-  
\ No newline at end of file
diff --git a/src/views/applySupermarket/personBack/index.vue b/src/views/applySupermarket/personBack/index.vue
index 7117e58..a1df9c9 100644
--- a/src/views/applySupermarket/personBack/index.vue
+++ b/src/views/applySupermarket/personBack/index.vue
@@ -28,16 +28,11 @@
               <div class="enterBtm">
                 <div class="item">
                   <div class="label">审查原因：</div>
-                  <div class="value">{{ item.name }}</div>
+                  <div class="value">{{ item.details[0]["auditReason"] }}</div>
                 </div>
                 <div class="item">
                   <div class="label">审查人数：</div>
-                  <div class="value">
-                    {{
-                      item.detailsByAuditResultTrue.length +
-                      item.detailsByAuditResultFalse.length
-                    }}
-                  </div>
+                  <div class="value">{{ item.investigateCount || 0 }}人</div>
                 </div>
                 <div class="item">
                   <div class="label">申请时间：</div>
@@ -81,13 +76,14 @@
       </gMainTable>
     </div>
     <detailDialog ref="detailDialog"></detailDialog>
-    <examineDialog ref="examineDialog"></examineDialog>
+    <examineDialog ref="examineDialog" @search="searchQuery"></examineDialog>
   </div>
 </template>
 <script>
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
 import detailDialog from "./components/detailDialog.vue";
 import examineDialog from "./components/examineDialog.vue";
+
 export default {
   mixins: [tableListMixins],
   components: { examineDialog, detailDialog },