From 89880d5675a33fcc24603974a1dcd91e3fcdaca1 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 12 Dec 2024 16:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                        |   4 +-
 pages/inspection/questDetails.vue |  15 +++-
 pages/inspection/questOrder.vue   | 137 +++++++++++++++++++++---------
 3 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/api/api.js b/api/api.js
index 253d263..f0c1078 100644
--- a/api/api.js
+++ b/api/api.js
@@ -359,7 +359,7 @@ const install = (Vue, vm) => {
         isparams: false
     })
     // 巡检  新加签名和备注字段接口
-    let updateSign = (params) => http.post('/task-serviceman-update-sign', params, {
+    let updateSign = (params) => http.post('/lab-ops/maintenance/task-serviceman-update-sign', params, {
         authorizations: true,
         isparams: false
     })
@@ -380,7 +380,7 @@ const install = (Vue, vm) => {
         isparams: false
     })
      // 更改消息状态  
-     let getMesseageTotal = (params) => http.get('//messeage/total', params, {
+     let getMesseageTotal = (params) => http.get('/messeage/total', params, {
         authorizations: true,
         isparams: false
     })
diff --git a/pages/inspection/questDetails.vue b/pages/inspection/questDetails.vue
index 1b3d39b..ed034a8 100644
--- a/pages/inspection/questDetails.vue
+++ b/pages/inspection/questDetails.vue
@@ -58,7 +58,7 @@
                                     <image class="item_right_img" :src="s.picUrl"></image>
                                 </text>
                             </view>
-                            <view class="info_item" v-if="s.signUrl != ''">
+                            <!-- <view class="info_item" v-if="s.signUrl != ''">
                                 <text class="item_left_txt">签字：</text>
                                 <text class="item_right_txt">
                                     {{ s.signUrl }}
@@ -69,7 +69,7 @@
                                 <text class="item_right_txt">
                                     {{ s.remark }}
                                 </text>
-                            </view>
+                            </view> -->
                             <view class="info_item" v-if="s.price >= 0">
                                 <text class="item_left_txt">价格：</text>
                                 <text class="item_right_txt">
@@ -87,7 +87,16 @@
                 </u-collapse-item>
             </u-collapse>
         </view>
-
+        <view class="info">
+            <view class="info_item">
+                <text class="item_left_txt">签字：</text>
+                <text class="item_right_txt">{{ detailForm.signUrl }}</text>
+            </view>
+            <view class="info_item">
+                <text class="item_left_txt">备注：</text>
+                <text class="item_right_txt">{{ detailForm.remark }}</text>
+            </view>
+        </view>
     </view>
 </template>
 <script>
diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue
index 4dd131b..859cbcf 100644
--- a/pages/inspection/questOrder.vue
+++ b/pages/inspection/questOrder.vue
@@ -91,7 +91,12 @@
         <!-- 填写内容 -->
         <view class="info" v-if="!reservationDisabled">
             <view class="info_title">巡检任务</view>
-            <u-collapse :accordion="false" ref="collapseTask">
+            <view class="info_search">
+                <u-search placeholder="请输入设备名称" v-model="deviceNameSearch" :clearabled="true"
+                    @change="deviceNameSearchFn" :show-action="false"></u-search>
+            </view>
+            <u-collapse :accordion="false" ref="collapseTask"
+                v-if="detailForm.details && detailForm.details.length > 0">
                 <u-collapse-item v-for="(item, index) in detailForm.details" :key="index">
                     <view slot="title">
                         <text class="collapse-title">实验室楼层：{{ item.floorName }}</text>
@@ -149,6 +154,7 @@
                     </view>
                 </u-collapse-item>
             </u-collapse>
+            <u-empty text="设备为空" mode="list" v-else></u-empty>
         </view>
         <view class="info">
             <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="120" class="repair_form">
@@ -338,7 +344,9 @@ export default {
                 approveResult: null,//1通过  0驳回
                 approveText: '',//展示内容
                 approveTime: '',//当前时间
-            }
+            },
+            deviceNameSearch: '',//巡检任务  搜索设备名称
+            deviceList: [],//记录设备总数
         }
     },
     onLoad(options) {
@@ -357,16 +365,24 @@ export default {
             if (this.detailsType == 'task') {
                 this.$u.api.getTaskDetail(query).then(res => {
                     if (res.code == 200) {
-                        this.detailForm = res.data
+
                         this.updateData(res.data.details)
+                        this.detailForm = res.data
+                        this.deviceList = this.detailForm.details
+                        this.signUrl = res.data.signUrl
+                        this.remark = res.data.remark
                         this.collapseData = JSON.parse(JSON.stringify(res.data.details))
                     }
                 })
             } else {
                 this.$u.api.getRepairDetail(query).then(res => {
                     if (res.code == 200) {
-                        this.detailForm = res.data
+
                         this.updateData(res.data.details)
+                        this.detailForm = res.data
+                        this.deviceList = this.detailForm.details
+                        this.signUrl = res.data.signUrl
+                        this.remark = res.data.remark
                         this.collapseData = JSON.parse(JSON.stringify(res.data.details))
                     }
                 })
@@ -456,7 +472,7 @@ export default {
         },
         // 维修人员提交明细 
         submitQuest() {
-            let newArr = this.handleData(this.detailForm.details)
+            let newArr = this.handleData(this.deviceList)
             let status = newArr.every((item) => {
                 return item.status != null
             })
@@ -480,33 +496,34 @@ export default {
                     taskId: this.detailForm.id
                 })
             })
-            this.$u.api.updateDetaile(queryData).then(res => {
-                if (res.code == 200) {
-                    let signInfo={
-                        id:this.detailForm.id,
-                        signUrl:this.signUrl,
-                        remark:this.remark
-                    }
-                    this.$u.api.updateSign(signInfo).then(res => {
-                        if (res.code == 200) {
-                            let query = {
-                                id: this.detailForm.id,
-                            }
-                            // this.$u.api.taskServicemanSubmit(query).then(res => {
-                            //     if (res.code == 200) {
-                            //         uni.showToast({ title: "提交成功", icon: "none" });
-                            //         setTimeout(() => {
-                            //             uni.navigateBack({
-                            //                 delta: 1 // 默认值是1，表示回退一个页面
-                            //             })
-                            //         }, 500)
-                            //     }
-                            // })
-                        }
-                    })
-
-                }
-            })
+            console.log(11111111, newArr)
+            // this.$u.api.updateDetaile(queryData).then(res => {
+            //     if (res.code == 200) {
+            //         let signInfo = {
+            //             id: this.detailForm.id,
+            //             signUrl: this.signUrl,
+            //             remark: this.remark
+            //         }
+            //         this.$u.api.updateSign(signInfo).then(res => {
+            //             if (res.code == 200) {
+            //                 let query = {
+            //                     id: this.detailForm.id,
+            //                 }
+            //                 this.$u.api.taskServicemanSubmit(query).then(res => {
+            //                     if (res.code == 200) {
+            //                         uni.showToast({ title: "提交成功", icon: "none" });
+            //                         setTimeout(() => {
+            //                             uni.navigateBack({
+            //                                 delta: 1 // 默认值是1，表示回退一个页面
+            //                             })
+            //                         }, 500)
+            //                     }
+            //                 })
+            //             }
+            //         })
+
+            //     }
+            // })
         },
         // 客户确认巡检任务
         changeApproveResult(e) {
@@ -743,14 +760,55 @@ export default {
         },
         calendarChange(e) {
             this.reservationTime = e.result
+        },
+        // 更改 手风琴的高度
+        itemCollapseChange() {
+            this.$nextTick(() => {
+                this.$refs.collapseTask.init()
+            })
+        },
+        deviceNameSearchFn(val) {
+            this.detailForm.details = []
+            let newArr = this.filterByDeviceName(this.deviceList, val)
+            this.detailForm.details = newArr.details
+            this.itemCollapseChange()
+        },
+        // 过滤  搜索条件
+        filterByDeviceName(data, targetDeviceName) {
+            // 定义一个递归函数来处理多维数组
+
+            const recursiveFilter = (details) => {
+
+                return details
+                    .map(item => {
+                        // 过滤 item.details，保持设备名称匹配的项  
+                        const filteredDetails = item.details ? item.details.map(subItem => {
+
+                            const matchingDetails = subItem.details
+                                ? subItem.details.filter(detail => detail.deviceName.includes(targetDeviceName))
+                                : [];
+                            console.log('matchingDetails', matchingDetails)
+                            return {
+                                ...subItem,
+                                details: matchingDetails.length > 0 ? matchingDetails : undefined, // 只保留有匹配项的 details  
+                            };
+                        }).filter(subItem => subItem.details) : []; // 仅保留 details 不为空的项  
+
+                        return {
+                            ...item,
+                            details: filteredDetails.length > 0 ? filteredDetails : undefined, // 只保留有匹配项的 details  
+                        };
+                    })
+                    .filter(item => item.details); // 过滤掉没有匹配 details 的项  
+            };
+
+            return {
+                ...data,
+                details: recursiveFilter(data)
+            };
         }
     },
-    // 更改 手风琴的高度
-    itemCollapseChange() {
-        this.$nextTick(() => {
-            this.$refs.collapseTask.init()
-        })
-    }
+
 }
 </script>
 <style lang="scss" scoped>
@@ -774,6 +832,9 @@ export default {
             margin: 18rpx 0 0rpx 20rpx;
             font-weight: bold;
         }
+        .info_search{
+            padding:0 32rpx
+        }
 
         .info_item {
             padding: 4rpx 20rpx 0;