From da1911dc04e73e5116039c29896a8ee7b26282f2 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 11 Nov 2024 17:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseManage/pushAndAccept/index.vue   |  12 +-
 .../pushAndAccept/pushAndAcceptDetail.vue     | 104 ++++++++----------
 2 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/src/views/warehouseManage/pushAndAccept/index.vue b/src/views/warehouseManage/pushAndAccept/index.vue
index fc2ac84..c5ac77c 100644
--- a/src/views/warehouseManage/pushAndAccept/index.vue
+++ b/src/views/warehouseManage/pushAndAccept/index.vue
@@ -9,13 +9,13 @@
             size="small"
             v-show="showSearch"
         >
-            <el-form-item label="关键字" prop="keyWord">
+            <!-- <el-form-item label="关键字" prop="keyWord">
                 <el-input
                     v-model="queryForm.keyWord"
                     clearable
                     placeholder="请输入关键字"
                 />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="状态" prop="receiveStatus">
                 <el-select
                     v-model="queryForm.receiveStatus"
@@ -139,8 +139,8 @@
         <pagination
             v-show="total > 0"
             :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
+            :page.sync="queryForm.pageNum"
+            :limit.sync="queryForm.pageSize"
             @pagination="getList"
         />
     </div>
@@ -157,6 +157,8 @@ export default {
             queryForm: {
                 keyWord: '',
                 receiveStatus: '',
+                pageNum: 1,
+                pageSize: 10,
                 // pushDate: '',
             },
             tableData: [],
@@ -183,6 +185,8 @@ export default {
         resetQueryForm() {
             console.log('🚀 ~ resetQueryForm ~ 重置:')
             this.$refs.queryForm.resetFields()
+            this.queryForm.pageNum = 1
+            this.queryForm.pageSize = 10
             this.pushDate = ''
             this.getList()
         },
diff --git a/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue b/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
index b617cbb..4256e91 100644
--- a/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
+++ b/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
@@ -279,34 +279,41 @@
                         <el-image
                             class="idCard"
                             :src="src.IDCardFront"
-                            :preview-src-list="src.IDCardFrontList"
                         ></el-image>
                         <el-image
                             class="idCard"
                             :src="src.IDCardBack"
-                            :preview-src-list="src.IDCardBackList"
                         ></el-image>
                     </div>
                     <div class="information">
                         <el-row>
                             <el-col :span="10" class="item"
-                                >姓名: {{ information.name }}</el-col
+                                >姓名:
+                                {{ enterpriseDriverInfo.maUserName }}</el-col
                             >
                             <el-col :span="14" class="item"
-                                >身份证号: {{ information.IDCard }}</el-col
+                                >身份证号:
+                                {{ enterpriseDriverInfo.maUserIdCard }}</el-col
                             >
                         </el-row>
                         <el-row>
                             <el-col :span="12" class="item"
-                                >性别: {{ information.gender }}</el-col
+                                >性别:
+                                {{
+                                    enterpriseDriverInfo.maUserSex == 1
+                                        ? '男'
+                                        : '女'
+                                }}</el-col
                             >
                         </el-row>
                         <el-row>
                             <el-col :span="10" class="item"
-                                >年龄: {{ information.age }}</el-col
+                                >年龄:
+                                {{ enterpriseDriverInfo.maUserAge }}</el-col
                             >
                             <el-col :span="14" class="item"
-                                >电话: {{ information.phone }}</el-col
+                                >电话:
+                                {{ enterpriseDriverInfo.maUserPhone }}</el-col
                             >
                         </el-row>
                     </div>
@@ -322,8 +329,7 @@
                     >
                         <el-image
                             class="itemImg"
-                            :src="item.src"
-                            :preview-src-list="item.previewList"
+                            :src="item.fileUrl"
                         ></el-image>
                         <span class="itemName">{{ item.name }}</span>
                     </div>
@@ -403,58 +409,20 @@ export default {
             total: 0,
             isDetail: false, // 是否详情页
             dialogVisible: false,
-            // 机手身份证
-            src: {
-                IDCardFront:
-                    'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                IDCardBack:
-                    'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                IDCardFrontList: [
-                    'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                ],
-                IDCardBackList: [
-                    'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                ],
-            },
+
             // 机手信息
-            information: {
-                name: '张三',
-                IDCard: '123456789012345678',
-                gender: '男',
-                age: '18',
-                phone: '12345678901',
-            },
-            // 持证信息
-            certificateList: [
-                {
-                    name: 'xx范德萨范德萨范德萨范德萨发大水范德萨发大水x证',
-                    src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                    previewList: [
-                        'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                    ],
-                },
-                {
-                    name: 'xx范德萨范范德萨范德萨发大水范德萨德萨发大水x证',
-                    src: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                    previewList: [
-                        'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                    ],
-                },
-                {
-                    name: 'xx范德萨范德萨发大水x证',
-                    src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                    previewList: [
-                        'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-                    ],
-                },
-                {
-                    name: 'xx范德萨范德萨发大水x证',
-                    src: 'https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png',
-                    previewList: [
-                        'https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png',
-                    ],
-                },
-            ],
+            // information: {
+            //     name: '张三',
+            //     IDCard: '123456789012345678',
+            //     gender: '男',
+            //     age: '18',
+            //     phone: '12345678901',
+            // },
+            enterpriseDriverFileList: [],
+            enterpriseDriverInfo: {},
+            certificateList: [],
+            IDCardFront: '',
+            IDCardBack: '',
         }
     },
     created() {
@@ -542,6 +510,22 @@ export default {
         // 机手详情 - 弹框
         getMachinistDetail(row) {
             console.log('🚀 ~ getMachinistDetail ~ 机手详情:', row)
+            this.certificateList = row.enterpriseDriverFileList.filter(
+                (e) => e.fileType == 2,
+            )
+            // this.enterpriseDriverFileList = row.enterpriseDriverFileList
+
+            if (row.enterpriseDriverFileList.length > 0) {
+                row.enterpriseDriverFileList.forEach((e) => {
+                    if (e.fileType == 0) {
+                        this.IDCardFront = e.fileUrl
+                    }
+                    if (e.fileType == 1) {
+                        this.IDCardBack = e.fileUrl
+                    }
+                })
+            }
+            this.enterpriseDriverInfo = row
             this.dialogVisible = true
         },
     },