From dcfbb9cb08f287fe44bd1688c5b7a709524cc16a Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 21 Jul 2023 09:23:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=A1=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/applySupermarket/personBack/index.js  |   8 +
 src/utils/request.js                          |   4 +-
 .../personBack/components/abnormalTable.vue   | 149 +++++++++++++++---
 .../personBack/components/normalTable.vue     |  52 +++---
 .../components/personBackDialog.vue           |  34 +++-
 5 files changed, 201 insertions(+), 46 deletions(-)

diff --git a/src/api/applySupermarket/personBack/index.js b/src/api/applySupermarket/personBack/index.js
index e2acf92..a34b469 100644
--- a/src/api/applySupermarket/personBack/index.js
+++ b/src/api/applySupermarket/personBack/index.js
@@ -15,4 +15,12 @@ export function get_personback_item_data(params) {
         method: 'post',
         params
     })
+}
+// 人员背景审查子页个人详情查询
+export function get_personback_item_data_person(params) {
+    return request({
+        url: '/safety/store/personnelReview/tbCompanyUserCase/list',
+        method: 'post',
+        params
+    })
 }
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 52bc36f..e21f018 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,8 +6,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
   // baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
-  //baseURL: 'http://192.168.0.188:8888/zhapi',
-  baseURL: `http://${window.location.host}/zhapi`,
+  baseURL: 'http://192.168.0.188:8888/zhapi',
+  //baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
diff --git a/src/views/applySupermarket/personBack/components/abnormalTable.vue b/src/views/applySupermarket/personBack/components/abnormalTable.vue
index 14f8a53..e21c0e5 100644
--- a/src/views/applySupermarket/personBack/components/abnormalTable.vue
+++ b/src/views/applySupermarket/personBack/components/abnormalTable.vue
@@ -2,29 +2,66 @@
 <template>
   <div>
     <el-table
-      :data="table_data"
-      height="280"
+      :data="abnormal_table_data.rows"
+      height="285"
       :header-cell-style="table_header"
       :cell-style="{ background: 'revert', 'text-align': 'center' }"
+      @expand-change="to_expand"
     >
+      <!-- 点击展开详情 -->
+      <el-table-column type="expand">
+        <template slot-scope="person_information">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="案件编号">
+              <span>{{ person_information.row.caseNo }}</span>
+            </el-form-item>
+            <el-form-item label="案件名称">
+              <span>{{ person_information.row.caseName }}</span>
+            </el-form-item>
+            <el-form-item label="案件分类">
+              <span>{{ person_information.row.caseType }}</span>
+            </el-form-item>
+            <el-form-item label="案件类别">
+              <span>{{ person_information.row.caseCategory }}</span>
+            </el-form-item>
+            <el-form-item label="发案区划">
+              <span>{{ person_information.row.policeDistrictCode }}</span>
+            </el-form-item>
+            <el-form-item label="派出所">
+              <span>{{ person_information.row.policeDistrict }}</span>
+            </el-form-item>
+            <el-form-item label="破案情况">
+              <span>{{ person_information.row.caseState }}</span>
+            </el-form-item>
+            <el-form-item label="发案地点">
+              <span>{{ person_information.row.caseAddress }}</span>
+            </el-form-item>
+            <el-form-item></el-form-item>
+            <el-form-item label="案件详情" class="text">
+              <span>{{ person_information.row.caseDetail }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column type="index" label="序号" width="80"> </el-table-column>
       <el-table-column prop="processName" label="照片" width="110">
         <template slot-scope="scope">
-          <el-button
-            size="small"
-            class="operation"
-            @click="check_details(scope.row)"
-            >详情
-          </el-button>
+          <img
+            :src="scope.row.picUrl ? '' : scope.row.picUrl"
+            alt=""
+            width="40"
+            height="40"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="姓名" width="140">
+      <el-table-column prop="staffName" label="姓名" width="140">
       </el-table-column>
-      <el-table-column prop="processType" label="身份证号" width="260">
+      <el-table-column prop="identityId" label="身份证号" width="230">
       </el-table-column>
-      <el-table-column prop="taskName" label="审查时间" width="260">
+      <el-table-column prop="examinationTime" label="审查时间" width="240">
+      </el-table-column>
+      <el-table-column prop="examinationResultStatusCn" label="审查结果">
       </el-table-column>
-      <el-table-column prop="operation" label="审查结果"> </el-table-column>
     </el-table>
     <!-- 分页公共样式 -->
     <div class="pagination_body">
@@ -36,24 +73,58 @@
         :page-size="pageSize"
         :current-page="pageNum"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+        :total="abnormal_table_data.total"
       >
       </el-pagination>
     </div>
   </div>
 </template>
 <script>
+import { get_personback_item_data } from "@/api/applySupermarket/personBack";
+import { get_personback_item_data_person } from "@/api/applySupermarket/personBack";
 export default {
-  name: "NormalTable",
+  name: "AbnormalTable",
+  props: {
+    form_data: {},
+    abnormal_table_data: {},
+  },
   data() {
     return {
-      table_data: [],
       pageSize: 4,
       pageNum: 1,
-      total: 0,
+      // person_information: {}, // 接收展开的数据
+      expand_keys: [], // 可以通过该属性设置 Table 目前的展开行，需要设置 row-key 属性才能使用，该属性为展开行的 keys 数组。
     };
   },
   methods: {
+    // 点击分页查询
+    search() {
+      let param = {
+        applyCode: this.form_data.applyCode,
+        companyId: this.form_data.companyId,
+        companyName: this.form_data.companyName,
+        examinationResultStatus: "2",
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+      };
+      get_personback_item_data(param).then((res) => {
+        this.abnormal_table_data.rows = res.rows;
+      });
+    },
+    to_expand(row, expandedRows) {
+      // 先判断该行是否已经展开了
+      if (!row.expand) {
+        console.log("row1", row);
+        console.log("expandedRows1", expandedRows);
+        let param = {
+          applyCode: row.applyCode,
+        };
+        get_personback_item_data_person(param).then((res) => {
+          Object.assign(row, res.rows[0]);
+          row.expand = true; // 设置展开行是打开的
+        });
+      }
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -68,10 +139,12 @@ export default {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
+      this.search();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
+      this.search();
     },
   },
 };
@@ -105,13 +178,11 @@ export default {
   }
 }
 /deep/.el-table__body-wrapper::-webkit-scrollbar {
-  display: none;
   width: 6px;
   background-color: #5e666a;
   border-radius: 4px;
 }
 /deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
-  display: none;
   width: 5px;
   background-color: #3c4b4a;
   border-radius: 4px;
@@ -120,6 +191,48 @@ export default {
 .el-table th.el-table__cell.is-leaf {
   border: 0.1px solid #3f5564;
 }
+/deep/.el-table__cell.el-table__expanded-cell {
+  background: #2f6363;
+  color: #fff;
+}
+.demo-table-expand {
+  font-size: 0;
+  // background: rgba(0, 0, 0, 0);
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #fff;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 30%;
+}
+.demo-table-expand .el-form-item .text {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
+/deep/.el-form-item__label {
+  color: #fff;
+  text-align: center;
+}
+/deep/.el-form-item__content {
+  color: #fff;
+}
+// /deep/.el-button.operation {
+//   background-color: rgba(0, 0, 0, 0);
+//   border: 0px;
+//   color: #2fabdc;
+// }
+
+// /deep/.el-button.operation:hover,
+// .el-button.operation:focus {
+//   background-color: #182527;
+//   border: 0px;
+//   color: #2fabdc;
+//   text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
+// }
 .pagination_body {
   width: 44vw;
   height: 4vh;
diff --git a/src/views/applySupermarket/personBack/components/normalTable.vue b/src/views/applySupermarket/personBack/components/normalTable.vue
index 6a5108b..76a4081 100644
--- a/src/views/applySupermarket/personBack/components/normalTable.vue
+++ b/src/views/applySupermarket/personBack/components/normalTable.vue
@@ -2,29 +2,29 @@
 <template>
   <div>
     <el-table
-      :data="table_data"
-      height="280"
+      :data="normal_table_data.rows"
+      height="285"
       :header-cell-style="table_header"
       :cell-style="{ background: 'revert', 'text-align': 'center' }"
     >
       <el-table-column type="index" label="序号" width="80"> </el-table-column>
-      <el-table-column prop="processName" label="照片" width="110">
+      <el-table-column prop="picUrl" label="照片" width="110">
         <template slot-scope="scope">
-          <el-button
-            size="small"
-            class="operation"
-            @click="check_details(scope.row)"
-            >详情
-          </el-button>
+          <img
+            :src="scope.row.picUrl ? '' : scope.row.picUrl"
+            alt=""
+            width="40"
+            height="40"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="姓名" width="140">
+      <el-table-column prop="staffName" label="姓名" width="140">
       </el-table-column>
-      <el-table-column prop="processType" label="身份证号" width="260">
+      <el-table-column prop="identityId" label="身份证号" width="260">
       </el-table-column>
-      <el-table-column prop="taskName" label="审查时间" width="260">
+      <el-table-column prop="examinationTime" label="审查时间" width="260">
       </el-table-column>
-      <el-table-column prop="operation" label="审查结果">
+      <el-table-column prop="examinationResultStatusCn" label="审查结果">
       </el-table-column>
     </el-table>
     <!-- 分页公共样式 -->
@@ -37,24 +37,40 @@
         :page-size="pageSize"
         :current-page="pageNum"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+        :total="normal_table_data.total"
       >
       </el-pagination>
     </div>
   </div>
 </template>
 <script>
+import { get_personback_item_data } from "@/api/applySupermarket/personBack";
 export default {
   name: "NormalTable",
+  props: {
+    form_data: {},
+    normal_table_data: {},
+  },
   data() {
     return {
-      table_data: [],
       pageSize: 4,
       pageNum: 1,
-      total: 0,
     };
   },
   methods: {
+    search() {
+      let param = {
+        applyCode:this.form_data.applyCode,
+        companyId:this.form_data.companyId,
+        companyName:this.form_data.companyName,
+        examinationResultStatus:'1',
+        pageSize:this.pageSize,
+        pageNum:this.pageNum,
+      }
+      get_personback_item_data(param).then(res=> {
+        this.normal_table_data.rows = res.rows
+      })
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -69,10 +85,12 @@ export default {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
+      this.search()
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
+      this.search()
     },
   },
 };
@@ -106,13 +124,11 @@ export default {
   }
 }
 /deep/.el-table__body-wrapper::-webkit-scrollbar {
-  display: none;
   width: 6px;
   background-color: #5e666a;
   border-radius: 4px;
 }
 /deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
-  display: none;
   width: 5px;
   background-color: #3c4b4a;
   border-radius: 4px;
diff --git a/src/views/applySupermarket/personBack/components/personBackDialog.vue b/src/views/applySupermarket/personBack/components/personBackDialog.vue
index aaeabd8..e411d21 100644
--- a/src/views/applySupermarket/personBack/components/personBackDialog.vue
+++ b/src/views/applySupermarket/personBack/components/personBackDialog.vue
@@ -48,10 +48,11 @@
       <!-- 正常异常切换 -->
       <el-tabs v-model="active" @tab-click="handle_click" class="item_tabs">
         <el-tab-pane :label="normal_label" name="first">
-            <NormalTable ref="normalTable"></NormalTable>
+            <NormalTable ref="normalTable" :normal_table_data="normal_table_data" :form_data="form_data"></NormalTable>
         </el-tab-pane>
         <el-tab-pane :label="abnormal_label" name="second">
-            <AbnormalTable ref="abnormalTable"></AbnormalTable>
+            <AbnormalTable ref="abnormalTable"
+            :abnormal_table_data="abnormal_table_data" :form_data="form_data"></AbnormalTable>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -74,6 +75,8 @@ export default {
       active: "first",
       normal_label:'', // 正常tab的标题
       abnormal_label:'', // 异常tab的标题
+      normal_table_data:{}, // 正常表格数据
+      abnormal_table_data:{}, // 异常表格数据
     };
   },
   methods: {
@@ -81,19 +84,34 @@ export default {
       this.visible = true;
       this.form_data = item;
       console.log('this.form_data',this.form_data);
-      // 初次加载正常人员数据 1 正常 2 异常
-      let param = {
+      // 初次加载正常人员数据 examinationResultStatus 1 正常 2 异常
+      let normal_param = {
         applyCode:this.form_data.applyCode,
-        // id: this.form_data.id,
         companyId:this.form_data.companyId,
         companyName:this.form_data.companyName,
         examinationResultStatus:'1',
         pageSize:4,
         pageNum:1,
       }
-      // 查询子表格数据
-      get_personback_item_data(param).then(res=> {
-        console.log('res_id',res);
+      // 查询正常子表格数据
+      get_personback_item_data(normal_param).then(res=> {
+        console.log('res_n',res);
+        this.normal_table_data = res
+        this.normal_label = `正常 ${res.total}`
+      })
+      let abnormal_param = {
+        applyCode:this.form_data.applyCode,
+        companyId:this.form_data.companyId,
+        companyName:this.form_data.companyName,
+        examinationResultStatus:'2',
+        pageSize:4,
+        pageNum:1,
+      }
+      // 查询异常子表格数据
+      get_personback_item_data(abnormal_param).then(res=> {
+        console.log('res_abn',res);
+        this.abnormal_table_data = res
+        this.abnormal_label = `异常 ${res.total}`
       })
     },
     // 点击切换
-- 
2.36.3


From 8e3be6ae2c40dd38c5c786fb6b95a3f05c9734a7 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 21 Jul 2023 09:25:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index e21f018..52bc36f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,8 +6,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
   // baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
-  baseURL: 'http://192.168.0.188:8888/zhapi',
-  //baseURL: `http://${window.location.host}/zhapi`,
+  //baseURL: 'http://192.168.0.188:8888/zhapi',
+  baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
-- 
2.36.3