From fb1b098f60cb1f7315fd82edfdd16d1a2fc0e005 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 11 Dec 2024 16:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=AE=A1=E6=A0=B8=E4=BF=AE=E9=A5=B0=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=B8=80=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  39 +-
 .../{ => repairManage}/code-operate.vue       |   0
 .../repair/{ => repairManage}/code-view.vue   |   2 +-
 .../repair/{ => repairManage}/details.vue     |   4 +-
 src/pages/repair/{ => repairManage}/index.vue |   2 +-
 .../repair/{ => repairManage}/num-operate.vue |   0
 src/pages/repair/testExamine/details.vue      | 297 +++++++++++++++
 src/pages/repair/testExamine/index.vue        | 355 ++++++++++++++++++
 src/pages/repair/testedInBound/details.vue    | 270 +++++++++++++
 src/pages/repair/testedInBound/index.vue      | 331 ++++++++++++++++
 src/pages/work/index.vue                      |  14 +-
 src/services/repair/testExamine.js            |  81 ++++
 src/services/repair/testedInBound.js          |  90 +++++
 13 files changed, 1474 insertions(+), 11 deletions(-)
 rename src/pages/repair/{ => repairManage}/code-operate.vue (100%)
 rename src/pages/repair/{ => repairManage}/code-view.vue (98%)
 rename src/pages/repair/{ => repairManage}/details.vue (98%)
 rename src/pages/repair/{ => repairManage}/index.vue (99%)
 rename src/pages/repair/{ => repairManage}/num-operate.vue (100%)
 create mode 100644 src/pages/repair/testExamine/details.vue
 create mode 100644 src/pages/repair/testExamine/index.vue
 create mode 100644 src/pages/repair/testedInBound/details.vue
 create mode 100644 src/pages/repair/testedInBound/index.vue
 create mode 100644 src/services/repair/testExamine.js
 create mode 100644 src/services/repair/testedInBound.js

diff --git a/src/pages.json b/src/pages.json
index a616d65..ff7b7fd 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -198,39 +198,68 @@
         /* 维修及其页面 */
         // 1. 维修列表
         {
-            "path": "pages/repair/index",
+            "path": "pages/repair/repairManage/index",
             "style": {
                 "navigationBarTitleText": "维修任务"
             }
         },
         // 2. 维修详情
         {
-            "path": "pages/repair/details",
+            "path": "pages/repair/repairManage/details",
             "style": {
                 "navigationBarTitleText": "维修任务"
             }
         },
         // 3. 编码维修 展示
         {
-            "path": "pages/repair/code-view",
+            "path": "pages/repair/repairManage/code-view",
             "style": {
                 "navigationBarTitleText": "编码设备维修"
             }
         },
         // 4. 编码维修 操作
         {
-            "path": "pages/repair/code-operate",
+            "path": "pages/repair/repairManage/code-operate",
             "style": {
                 "navigationBarTitleText": "维修"
             }
         },
         // 5. 数量维修 操作
         {
-            "path": "pages/repair/num-operate",
+            "path": "pages/repair/repairManage/num-operate",
             "style": {
                 "navigationBarTitleText": "数量设备维修"
             }
+        },
+        //修试审核
+        {
+            "path": "pages/repair/testExamine/index",
+            "style": {
+                "navigationBarTitleText": "修试审核"
+            }
+        },
+        //修试审核-详情
+        {
+            "path": "pages/repair/testExamine/details",
+            "style": {
+                "navigationBarTitleText": "修试审核详情"
+            }
+        },
+        //修试入库
+        {
+            "path": "pages/repair/testedInBound/index",
+            "style": {
+                "navigationBarTitleText": "修试入库"
+            }
+        },
+        //修试审核-详情
+        {
+            "path": "pages/repair/testedInBound/details",
+            "style": {
+                "navigationBarTitleText": "修试入库详情"
+            }
         }
+        
     ],
     "tabBar": {
         "color": "#2c2c2c",
diff --git a/src/pages/repair/code-operate.vue b/src/pages/repair/repairManage/code-operate.vue
similarity index 100%
rename from src/pages/repair/code-operate.vue
rename to src/pages/repair/repairManage/code-operate.vue
diff --git a/src/pages/repair/code-view.vue b/src/pages/repair/repairManage/code-view.vue
similarity index 98%
rename from src/pages/repair/code-view.vue
rename to src/pages/repair/repairManage/code-view.vue
index dd72533..4260000 100644
--- a/src/pages/repair/code-view.vue
+++ b/src/pages/repair/repairManage/code-view.vue
@@ -92,7 +92,7 @@ const repairDeviceList = ref(queryParams.repairDeviceList)
 
 // 点击跳转维修页面
 const goOperate = (index) => {    
-    const codingUrl = '/pages/repair/code-operate' // 编码维修
+    const codingUrl = '/pages/repair/repairManage/code-operate' // 编码维修
     uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}&rowIndex=${index}` })
 }
 
diff --git a/src/pages/repair/details.vue b/src/pages/repair/repairManage/details.vue
similarity index 98%
rename from src/pages/repair/details.vue
rename to src/pages/repair/repairManage/details.vue
index f7e8765..ead9ba2 100644
--- a/src/pages/repair/details.vue
+++ b/src/pages/repair/repairManage/details.vue
@@ -184,10 +184,10 @@ const onRepairItem = (item) => {
     let queryParams = null
     let codingUrl = ''
     if (item.manageType === 0) {
-        codingUrl = '/pages/repair/code-view' // 编码维修
+        codingUrl = '/pages/repair/repairManage/code-view' // 编码维修
     }
     if (item.manageType == 1) {
-        codingUrl = '/pages/repair/num-operate' // 数量维修
+        codingUrl = '/pages/repair/repairManage/num-operate' // 数量维修
     }
     queryParams = item
     uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}` })
diff --git a/src/pages/repair/index.vue b/src/pages/repair/repairManage/index.vue
similarity index 99%
rename from src/pages/repair/index.vue
rename to src/pages/repair/repairManage/index.vue
index 8c14318..09ecc5c 100644
--- a/src/pages/repair/index.vue
+++ b/src/pages/repair/repairManage/index.vue
@@ -266,7 +266,7 @@ const changeTab = (index) => {
 }
 // 点击跳转详情
 const handleItem = (item) => {
-    uni.navigateTo({ url: `/pages/repair/details?taskId=${item.taskId}` })
+    uni.navigateTo({ url: `/pages/repair/repairManage/details?taskId=${item.taskId}` })
 }
 
 // 判断数据是否加载完毕
diff --git a/src/pages/repair/num-operate.vue b/src/pages/repair/repairManage/num-operate.vue
similarity index 100%
rename from src/pages/repair/num-operate.vue
rename to src/pages/repair/repairManage/num-operate.vue
diff --git a/src/pages/repair/testExamine/details.vue b/src/pages/repair/testExamine/details.vue
new file mode 100644
index 0000000..159746c
--- /dev/null
+++ b/src/pages/repair/testExamine/details.vue
@@ -0,0 +1,297 @@
+<template>
+    <!-- 领料出库详情 -->
+    <view class="page-container">
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="12">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search">查询</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" style="background-color: #19be6b" @tap="handleAllPass">通过</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" style="background-color: #ff4949" @tap="handleAllFail">驳回</view>
+            </uni-col>
+        </uni-row>
+
+        <view class="table-list-item">
+            <checkbox-group @change="onChangeAllChecked">
+                <label>
+                    全选
+                    <checkbox
+                        color="#409eff"
+                        borderColor="#409eff"
+                        activeBorderColor="#409eff"
+                        :checked="allChecked"
+                        value="all"
+                        style="transform: scale(0.7)"
+                    />
+                </label>
+            </checkbox-group>
+        </view>
+
+        <scroll-view scroll-y class="scroll-container">
+            <view
+                v-for="(item, index) in detailsList"
+                :key="index"
+                class="table-list-item"
+                @tap="onRepairItem(item)"
+            >   
+                <div class="title">
+                    <span style="font-size: 15px; font-weight: 800">修试审核</span>
+                    <!-- <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span> -->
+                </div>
+                <view class="line"></view>
+                <uni-row :gutter="24">
+                    <uni-col :span="2">
+                        <checkbox-group @change="onChangeChecked(item)">
+                            <label>
+                                <checkbox
+                                    color="#409eff"
+                                    borderColor="#409eff"
+                                    activeBorderColor="#409eff"
+                                    :checked="item.isChecked"
+                                    style="transform: scale(0.7)"
+                                />
+                            </label>
+                        </checkbox-group>
+                    </uni-col>
+                    <uni-col :span="6">物资名称：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.machineTypeName }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">规格型号：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.specificationType }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">单位：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.unitName }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">已修数量：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.repairedNum }}</view>
+                    </uni-col>
+                </uni-row>
+               
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">管理模式：</uni-col>
+                    <uni-col :span="16">
+                        <uni-tag
+                            text="编码"
+                            type="warning"
+                            v-if="item.manageType == 0"
+                            size="small"
+                        />
+                        <uni-tag
+                            text="数量"
+                            type="success"
+                            v-if="item.manageType == 1"
+                            size="small"
+                        />
+                    </uni-col>
+                </uni-row>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onUnmounted, computed } from 'vue' 
+import { getAuditInfo,innerAudit } from '@/services/repair/testExamine.js'
+import { onLoad,onShow } from '@dcloudio/uni-app'
+const detailsList = ref([])
+const query = defineProps() // 获取上级页面传递的路由参数
+
+// 获取列表详情
+const getDetailsData = async () => {
+    const res = await getAuditInfo({ taskId: query.taskId })
+    detailsList.value = res.rows
+    detailsList.value = detailsList.value.map((e) => {
+        return { ...e, isChecked: false }
+    })
+}
+
+// 复选框全选
+const onChangeAllChecked = (e) => {
+    detailsList.value.forEach((item) => {
+        if (e.detail.value.length > 0) {
+            item.isChecked = true
+        } else {
+            item.isChecked = false
+        }
+    })
+}
+// 复选框每一项
+const onChangeChecked = (val) => {
+    val.isChecked = !val.isChecked
+}
+
+// 计算全选按钮是否选中
+const allChecked = computed(() => {
+    return detailsList.value.every((e) => e.isChecked == true)
+})
+
+// 点击合格按钮
+const handleAllPass = async () => {
+    const isSelect = detailsList.value.some((e) => e.isChecked == true)
+    if (!isSelect) {
+        uni.showToast({
+            title: '请勾选需要需要合格的数据！',
+            icon: 'none',
+        })
+        return
+    } 
+    // 组装参数
+    const ids = []
+    detailsList.value.forEach((item) => {
+        if (item.isChecked) {
+            console.log(item)
+            let obj = { id: item.id, status: "1",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
+            repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
+            auditId:item.id,repairId:item.repairId,maId:item.maId}
+            ids.push(obj) 
+        }
+    })                          
+    console.log(ids)
+    const res = await innerAudit(ids)
+    if (res.code === 200) {
+        uni.showToast({
+            title: '操作成功！',
+            icon: 'none',
+        })
+        getDetailsData()
+    }
+}
+
+// 点击驳回按钮
+const handleAllFail = async () => {
+    const isSelect = detailsList.value.some((e) => e.isChecked == true)
+    if (!isSelect) {
+        uni.showToast({
+            title: '请勾选需要需要驳回的数据！',
+            icon: 'none',
+        })
+        return
+    } 
+    // 组装参数          
+    const ids = []
+    detailsList.value.forEach((item) => {
+        if (item.isChecked) {
+            console.log(item)
+            let obj = { id: item.id, status: "2",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
+            repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
+            auditId:item.id,repairId:item.repairId,maId:item.maId}
+            ids.push(obj) 
+        }
+    })
+    console.log(ids)
+    const res = await innerAudit(ids)
+    if (res.code === 200) {
+        uni.showToast({
+            title: '操作成功！',
+            icon: 'none',
+        })
+        getDetailsData()
+    }
+}
+
+// 点击跳转维修页面
+const onRepairItem = (item) => {
+    console.log(item) 
+    // let queryParams = null
+    // let codingUrl = ''
+    // if (item.manageType === 0) {
+    //     codingUrl = '/pages/repair/repairManage/code-view' // 编码维修
+    // }
+    // if (item.manageType == 1) {
+    //     codingUrl = '/pages/repair/repairManage/num-operate' // 数量维修
+    // }
+    // queryParams = item
+    // uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}` })
+}
+onShow(() => {
+    getDetailsData()  
+})
+// 页面加载完毕
+onLoad(() => {
+    getDetailsData() 
+    // 监听出库完成事件 刷新列表
+    uni.$on('onUpdate', () => {
+        // console.log('监听事件')
+        // 刷新列表
+        getDetailsData()
+    })
+}) 
+// 页面销毁时移除事件监听
+onUnmounted(() => {
+    uni.$off('onUpdate') // 移除事件监听
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+    display: flex;
+    height: 100%;
+    padding: 0 15rpx;
+    flex-direction: column;
+    background-color: #e8f5fb;
+
+    .search-form {
+        margin: 10rpx 0;
+        display: flex;
+        align-items: center;
+        box-sizing: content-box;
+    }
+
+    .search {
+        height: 60rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 60rpx;
+        color: #fff;
+        border-radius: 10rpx;
+    }
+
+    .table-list-item {
+        margin-bottom: 20rpx;
+        padding: 20rpx;
+        background-color: #fff;
+        // min-height: 300rpx;
+        border-radius: 10rpx;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+        .title {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .line {
+            margin: 20rpx 0;
+            height: 1px;
+            background-color: #e8e8e8;
+        }
+    }
+}
+// 加载提示文字
+.loading-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #666;
+    padding: 20rpx 0;
+}
+</style>
diff --git a/src/pages/repair/testExamine/index.vue b/src/pages/repair/testExamine/index.vue
new file mode 100644
index 0000000..941a798
--- /dev/null
+++ b/src/pages/repair/testExamine/index.vue
@@ -0,0 +1,355 @@
+<template>
+    <!-- 维修列表 -->
+    <view class="page-container">
+        <view class="complete-btn">
+            <view class="btn" @click="changeTab(1)">
+                <span>已完成</span>
+                <view v-if="active == 1" class="bt-line"></view>
+            </view>
+            <view class="btn" style="margin-left: 120rpx" @click="changeTab(2)">
+                <span>未完成</span>
+                <view v-if="active == 2" class="bt-line"></view>
+            </view>
+        </view>
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="18">
+                <view>
+                    <uni-datetime-picker
+                        v-model="dateArray"
+                        type="daterange"
+                        @maskClick="maskClick"
+                        @change="onChangeDate"
+                        placeholder="选择日期范围"
+                    />
+                </view>
+            </uni-col> 
+        </uni-row>
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="18">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="onSearchBtn()">搜索</view>
+            </uni-col>
+        </uni-row>
+
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <view
+                class="table-list-item"
+                :key="index"
+                @click="handleItem(item)"
+                v-for="(item, index) in tableList"
+            >
+                <uni-swipe-action>
+                    <uni-swipe-action-item @click="onClick($event, item)" :right-options="options">
+                        <div class="title">
+                            <span style="font-size: 15px; font-weight: 800">修试审核</span>
+                            <!-- <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span> -->
+                        </div>
+                        <view class="line"></view>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">退料单位：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.unitName }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">退料工程：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.projectName }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">维修单号：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.repairNum }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">退料物资：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.itemType }}</view>
+                            </uni-col>
+                        </uni-row>  
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">创建人：</uni-col>
+                            <uni-col :span="18"
+                                ><view class="cont">{{ item.createBy }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">创建时间：</uni-col>
+                            <uni-col :span="18"
+                                ><view class="cont">{{ item.createTime }}</view>
+                            </uni-col>
+                        </uni-row>
+                       
+                      
+                        
+                        
+                        <!-- <uni-row :gutter="24">
+                            <uni-col :span="6">维修班组：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.preCountNum }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">已修数量：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.alNum }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">待修数量：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont"></view>
+                            </uni-col>
+                        </uni-row> -->
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">状态：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">
+                                    <uni-tag
+                                        text="未完成"
+                                        type="warning"
+                                        v-if="item.repairStatusCode == 0"
+                                    />
+                                    <uni-tag
+                                        text="已完成"
+                                        type="success"
+                                        v-if="item.repairStatusCode == 1"
+                                    />
+                                </view>
+                            </uni-col>
+                        </uni-row>
+                    </uni-swipe-action-item>
+                </uni-swipe-action>
+            </view>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue' 
+import { getListTestExamineApply,outerAudit } from '@/services/repair/testExamine.js'
+
+import { onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash-es'
+
+const total = ref(0) //                 数据总量
+const active = ref(1) //                tap索引
+const tableList = ref([]) //            列表数据源
+const dateArray = ref([]) //            日期范围
+// 查询参数
+const queryParams = ref({
+    startTime: '', //                   开始时间
+    endTime: '', //                     结束时间
+    keyWord: '', //                     关键字 
+    pageNum: 1,
+    pageSize: 5,
+    taskType:5,
+})
+
+// 右滑按钮组
+const options = ref([
+    {
+        text: '通过',
+        style: {
+            backgroundColor: '#84c649',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+
+    {
+        text: '驳回',
+        style: {
+            backgroundColor: '#ed6042',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+])
+
+// 右滑按钮点击事件
+const onClick = async (e, item) => {
+    console.log(item) 
+    if (e.index === 0) {
+        // 通过逻辑
+        const res = await outerAudit([{ status: "1",taskId:item.taskId}])
+        if (res.code === 200) {
+            uni.showToast({
+                title: '通过成功！',
+                icon: 'none',
+            })
+        }
+    } else {
+        // 驳回逻辑
+        const res = await outerAudit([{ status: "2",taskId:item.taskId}])
+        if (res.code === 200) {
+            uni.showToast({
+                title: '驳回成功！',
+                icon: 'none',
+            })
+        }
+    }
+}
+
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+
+// 搜索按钮
+const onSearchBtn = () => {
+    queryParams.value.pageNum = 1
+    tableList.value = []
+    getTableList()
+}
+
+// 获取列表数据
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
+    const res = await getListTestExamineApply(queryParams.value)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
+    } else {
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
+    }
+}
+
+// // 页面加载完毕
+// onLoad(() => {
+//     getTableList()
+// })
+
+onShow(() => {
+    tableList.value = []
+    total.value = 0
+    getTableList()
+})
+
+// 滚动触底事件
+const onScrollTolower = debounce(() => {
+    console.log('触底事件')
+    if (total.value > tableList.value.length) {
+        queryParams.value.pageNum++
+        getTableList()
+    }
+}, 500)
+
+// tap 栏切换
+const changeTab = (index) => {
+    active.value = index
+    if (index == 1) {
+        queryParams.value.statusList = [4] // 查已完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
+    } else if (index == 2) {
+        queryParams.value.statusList = [3] // 查未完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
+    }
+}
+// 点击跳转详情
+const handleItem = (item) => {
+    uni.navigateTo({ url: `/pages/repair/testExamine/details?taskId=${item.taskId}` })
+}
+
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+
+const maskClick = () => {}
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+    display: flex;
+    height: 100%;
+    padding: 0 15rpx;
+    flex-direction: column;
+
+    .complete-btn {
+        display: flex;
+        padding: 20rpx;
+        .btn {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-size: 30rpx;
+            font-weight: 800;
+        }
+        .bt-line {
+            width: 80rpx;
+            height: 4rpx;
+            background-color: #3784fb;
+        }
+    }
+
+    .search-form {
+        display: flex;
+        align-items: center;
+        box-sizing: content-box;
+        margin-bottom: 10rpx;
+    }
+
+    .search {
+        height: 65rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 65rpx;
+        color: #fff;
+        border-radius: 10rpx;
+    }
+
+    .scroll-container {
+        .table-list-item {
+            margin: 20rpx 0;
+            padding: 20rpx;
+            background-color: #fff;
+            min-height: 300rpx;
+            border-radius: 10rpx;
+            .title {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+            .cont {
+                display: flex;
+                justify-content: flex-end;
+                line-height: 1.9;
+            }
+            .line {
+                margin: 20rpx 0;
+                height: 1px;
+                background-color: #e8e8e8;
+            }
+        }
+    }
+}
+// 加载提示文字
+.loading-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #666;
+    padding: 20rpx 0;
+}
+::v-deep .uni-swipe_button {
+    writing-mode: vertical-rl;
+    padding: 0 18rpx;
+}
+</style>
diff --git a/src/pages/repair/testedInBound/details.vue b/src/pages/repair/testedInBound/details.vue
new file mode 100644
index 0000000..12575d5
--- /dev/null
+++ b/src/pages/repair/testedInBound/details.vue
@@ -0,0 +1,270 @@
+<template>
+    <!-- 领料出库详情 -->
+    <view class="page-container">
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="12">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search">查询</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" style="background-color: #19be6b" @tap="onQualified">通过</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" style="background-color: #ff4949" >驳回</view>
+            </uni-col>
+        </uni-row>
+
+        <view class="table-list-item">
+            <checkbox-group @change="onChangeAllChecked">
+                <label>
+                    全选
+                    <checkbox
+                        color="#409eff"
+                        borderColor="#409eff"
+                        activeBorderColor="#409eff"
+                        :checked="allChecked"
+                        value="all"
+                        style="transform: scale(0.7)"
+                    />
+                </label>
+            </checkbox-group>
+        </view>
+
+        <scroll-view scroll-y class="scroll-container">
+            <view
+                v-for="(item, index) in detailsList"
+                :key="index"
+                class="table-list-item"
+                @tap="onRepairItem(item)"
+            >   
+                <div class="title">
+                    <span style="font-size: 15px; font-weight: 800">修试入库</span>
+                    <!-- <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span> -->
+                </div>
+                <view class="line"></view>
+                <uni-row :gutter="24">
+                    <uni-col :span="2">
+                        <checkbox-group @change="onChangeChecked(item)">
+                            <label>
+                                <checkbox
+                                    color="#409eff"
+                                    borderColor="#409eff"
+                                    activeBorderColor="#409eff"
+                                    :checked="item.isChecked"
+                                    style="transform: scale(0.7)"
+                                />
+                            </label>
+                        </checkbox-group>
+                    </uni-col>
+                    <uni-col :span="6">物资名称：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.typeName2 }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">规格型号：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.typeName }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">数量：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.repairNum }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">单位：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.unitName }}</view>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">管理模式：</uni-col>
+                    <uni-col :span="16">
+                        <uni-tag
+                            text="编码"
+                            type="warning"
+                            v-if="item.manageType == 0"
+                            size="small"
+                        />
+                        <uni-tag
+                            text="数量"
+                            type="success"
+                            v-if="item.manageType == 1"
+                            size="small"
+                        />
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="2" style="color: transparent">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">状态：</uni-col>
+                    <uni-col :span="16">
+                        <view class="cont">{{ item.status }}</view>
+                    </uni-col>
+                </uni-row>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onUnmounted, computed } from 'vue' 
+import { getRepairedDetailList } from '@/services/repair/testedInBound.js'
+import { onLoad,onShow } from '@dcloudio/uni-app'
+const detailsList = ref([])
+const query = defineProps() // 获取上级页面传递的路由参数
+
+// 获取列表详情
+const getDetailsData = async () => {
+    const res = await getRepairedDetailList(query.taskId)
+    detailsList.value = res.rows
+    detailsList.value = detailsList.value.map((e) => {
+        return { ...e, isChecked: false }
+    })
+}
+
+// 复选框全选
+const onChangeAllChecked = (e) => {
+    detailsList.value.forEach((item) => {
+        if (e.detail.value.length > 0) {
+            item.isChecked = true
+        } else {
+            item.isChecked = false
+        }
+    })
+}
+// 复选框每一项
+const onChangeChecked = (val) => {
+    val.isChecked = !val.isChecked
+}
+
+// 计算全选按钮是否选中
+const allChecked = computed(() => {
+    return detailsList.value.every((e) => e.isChecked == true)
+})
+
+// 点击合格按钮
+const onQualified = async () => {
+    const isSelect = detailsList.value.some((e) => e.isChecked == true)
+
+    if (!isSelect) {
+        uni.showToast({
+            title: '请勾选需要需要合格的数据！',
+            icon: 'none',
+        })
+        return
+    }
+
+    // 组装参数
+    const ids = []
+    detailsList.value.forEach((item) => {
+        if (item.isChecked) {
+            console.log(item)
+            ids.push(item)
+        }
+    })
+    console.log(ids)
+    // const res = await auditRepairPass(ids)
+    // if (res.code === 200) {
+    //     uni.showToast({
+    //         title: '操作成功！',
+    //         icon: 'none',
+    //     })
+    //     getDetailsData()
+    // }
+}
+
+// 点击跳转维修页面
+const onRepairItem = (item) => {
+    console.log(item) 
+    // let queryParams = null
+    // let codingUrl = ''
+    // if (item.manageType === 0) {
+    //     codingUrl = '/pages/repair/repairManage/code-view' // 编码维修
+    // }
+    // if (item.manageType == 1) {
+    //     codingUrl = '/pages/repair/repairManage/num-operate' // 数量维修
+    // }
+    // queryParams = item
+    // uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}` })
+}
+onShow(() => {
+    getDetailsData()  
+})
+// 页面加载完毕
+onLoad(() => {
+    getDetailsData() 
+    // 监听出库完成事件 刷新列表
+    uni.$on('onUpdate', () => {
+        // console.log('监听事件')
+        // 刷新列表
+        getDetailsData()
+    })
+}) 
+// 页面销毁时移除事件监听
+onUnmounted(() => {
+    uni.$off('onUpdate') // 移除事件监听
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+    display: flex;
+    height: 100%;
+    padding: 0 15rpx;
+    flex-direction: column;
+    background-color: #e8f5fb;
+
+    .search-form {
+        margin: 10rpx 0;
+        display: flex;
+        align-items: center;
+        box-sizing: content-box;
+    }
+
+    .search {
+        height: 60rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 60rpx;
+        color: #fff;
+        border-radius: 10rpx;
+    }
+
+    .table-list-item {
+        margin-bottom: 20rpx;
+        padding: 20rpx;
+        background-color: #fff;
+        // min-height: 300rpx;
+        border-radius: 10rpx;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+        .title {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .line {
+            margin: 20rpx 0;
+            height: 1px;
+            background-color: #e8e8e8;
+        }
+    }
+}
+// 加载提示文字
+.loading-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #666;
+    padding: 20rpx 0;
+}
+</style>
diff --git a/src/pages/repair/testedInBound/index.vue b/src/pages/repair/testedInBound/index.vue
new file mode 100644
index 0000000..441fd56
--- /dev/null
+++ b/src/pages/repair/testedInBound/index.vue
@@ -0,0 +1,331 @@
+<template>
+    <!-- 维修列表 -->
+    <view class="page-container">
+        <view class="complete-btn">
+            <view class="btn" @click="changeTab(1)">
+                <span>已完成</span>
+                <view v-if="active == 1" class="bt-line"></view>
+            </view>
+            <view class="btn" style="margin-left: 120rpx" @click="changeTab(2)">
+                <span>未完成</span>
+                <view v-if="active == 2" class="bt-line"></view>
+            </view>
+        </view>
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="18">
+                <view>
+                    <uni-datetime-picker
+                        v-model="dateArray"
+                        type="daterange"
+                        @maskClick="maskClick"
+                        @change="onChangeDate"
+                        placeholder="选择日期范围"
+                    />
+                </view>
+            </uni-col> 
+        </uni-row>
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="18">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="onSearchBtn()">搜索</view>
+            </uni-col>
+        </uni-row>
+
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <view
+                class="table-list-item"
+                :key="index"
+                @click="handleItem(item)"
+                v-for="(item, index) in tableList"
+            >
+                <!-- <uni-swipe-action> -->
+                    <!-- <uni-swipe-action-item @click="onClick($event, item)" :right-options="options"> -->
+                        <div class="title">
+                            <span style="font-size: 15px; font-weight: 800">修试入库</span>
+                            <!-- <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span> -->
+                        </div>
+                        <view class="line"></view>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">维修单号：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.repairCode }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">物资类型：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.maTypeName }}</view>
+                            </uni-col>
+                        </uni-row>  
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">退料单位：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.unitName }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">退料工程：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">{{ item.projectName }}</view>
+                            </uni-col>
+                        </uni-row> 
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">维修人员：</uni-col>
+                            <uni-col :span="18"
+                                ><view class="cont">{{ item.wxName }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">维修时间：</uni-col>
+                            <uni-col :span="18"
+                                ><view class="cont">{{ item.wxTime }}</view>
+                            </uni-col>
+                        </uni-row>
+                        <uni-row :gutter="24">
+                            <uni-col :span="6">状态：</uni-col>
+                            <uni-col :span="18">
+                                <view class="cont">
+                                    <uni-tag
+                                        text="未完成"
+                                        type="warning"
+                                        v-if="item.repairStatusCode == 0"
+                                    />
+                                    <uni-tag
+                                        text="已完成"
+                                        type="success"
+                                        v-if="item.repairStatusCode == 1"
+                                    />
+                                </view>
+                            </uni-col>
+                        </uni-row>
+                    <!-- </uni-swipe-action-item> -->
+                <!-- </uni-swipe-action> -->
+            </view>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue' 
+import { getRepairedList } from '@/services/repair/testedInBound.js' 
+import { onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash-es'
+
+const total = ref(0) //                 数据总量
+const active = ref(1) //                tap索引
+const tableList = ref([]) //            列表数据源
+const dateArray = ref([]) //            日期范围
+// 查询参数
+const queryParams = ref({
+    startTime: '', //                   开始时间
+    endTime: '', //                     结束时间
+    keyWord: '', //                     关键字 
+    pageNum: 1,
+    pageSize: 5,
+})
+
+// 右滑按钮组
+const options = ref([
+    {
+        text: '提交',
+        style: {
+            backgroundColor: '#84c649',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+
+    {
+        text: '驳回',
+        style: {
+            backgroundColor: '#ed6042',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+])
+
+// 右滑按钮点击事件
+const onClick = async (e, item) => {
+    if (e.index === 0) {
+        // 提交逻辑
+        // const res = await repairSubmitAPI([{ taskId: item.taskId }])
+        // if (res.code === 200) {
+        //     uni.showToast({
+        //         title: '提交成功！',
+        //         icon: 'none',
+        //     })
+        // }
+    } else {
+        // 驳回逻辑
+        // console.log('驳回')
+        // const res = await repairRejectAPI(item.taskId)
+        // if (res.code === 200) {
+        //     uni.showToast({
+        //         title: '驳回成功！',
+        //         icon: 'none',
+        //     })
+        // }
+    }
+}
+
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+
+// 搜索按钮
+const onSearchBtn = () => {
+    queryParams.value.pageNum = 1
+    tableList.value = []
+    getTableList()
+}
+
+// 获取列表数据
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
+    const res = await getRepairedList(queryParams.value)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
+    } else {
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
+    }
+}
+
+// // 页面加载完毕
+// onLoad(() => {
+//     getTableList()
+// })
+
+onShow(() => {
+    tableList.value = []
+    total.value = 0
+    getTableList()
+})
+
+// 滚动触底事件
+const onScrollTolower = debounce(() => {
+    console.log('触底事件')
+    if (total.value > tableList.value.length) {
+        queryParams.value.pageNum++
+        getTableList()
+    }
+}, 500)
+
+// tap 栏切换
+const changeTab = (index) => {
+    active.value = index
+    if (index == 1) {
+        queryParams.value.statusList = [4] // 查已完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
+    } else if (index == 2) {
+        queryParams.value.statusList = [3] // 查未完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
+    }
+}
+// 点击跳转详情
+const handleItem = (item) => {
+    uni.navigateTo({ url: `/pages/repair/testedInBound/details?taskId=${item.id}` })
+}
+
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+
+const maskClick = () => {}
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+    display: flex;
+    height: 100%;
+    padding: 0 15rpx;
+    flex-direction: column;
+
+    .complete-btn {
+        display: flex;
+        padding: 20rpx;
+        .btn {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-size: 30rpx;
+            font-weight: 800;
+        }
+        .bt-line {
+            width: 80rpx;
+            height: 4rpx;
+            background-color: #3784fb;
+        }
+    }
+
+    .search-form {
+        display: flex;
+        align-items: center;
+        box-sizing: content-box;
+        margin-bottom: 10rpx;
+    }
+
+    .search {
+        height: 65rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 65rpx;
+        color: #fff;
+        border-radius: 10rpx;
+    }
+
+    .scroll-container {
+        .table-list-item {
+            margin: 20rpx 0;
+            padding: 20rpx;
+            background-color: #fff;
+            min-height: 300rpx;
+            border-radius: 10rpx;
+            .title {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+            .cont {
+                display: flex;
+                justify-content: flex-end;
+                line-height: 1.9;
+            }
+            .line {
+                margin: 20rpx 0;
+                height: 1px;
+                background-color: #e8e8e8;
+            }
+        }
+    }
+}
+// 加载提示文字
+.loading-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #666;
+    padding: 20rpx 0;
+}
+::v-deep .uni-swipe_button {
+    writing-mode: vertical-rl;
+    padding: 0 18rpx;
+}
+</style>
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index ab29198..2402dc4 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -77,11 +77,21 @@ const pickingList = ref([
         iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
     },
 ])
-// 领料
+// 维修
 const repairList = ref([
     {
         title: '维修',
-        url: '/pages/repair/index',
+        url: '/pages/repair/repairManage/index',
+        iconSrc: '../../static/workbench/fix.png',
+    },
+    {
+        title: '修试审核',
+        url: '/pages/repair/testExamine/index',
+        iconSrc: '../../static/workbench/fix.png',
+    },
+    {
+        title: '修试入库',
+        url: '/pages/repair/testedInBound/index',
         iconSrc: '../../static/workbench/fix.png',
     },
 ])
diff --git a/src/services/repair/testExamine.js b/src/services/repair/testExamine.js
new file mode 100644
index 0000000..08b0365
--- /dev/null
+++ b/src/services/repair/testExamine.js
@@ -0,0 +1,81 @@
+import { http } from '@/utils/http'
+
+// 列表查询
+export const getListTestExamineApply = (data) => {
+    return http({
+        method: 'GET',
+        url: '/material/repair_audit_details/questList',
+        data,
+    })
+}
+// 查询修试审核详细列表
+export const getAuditInfo = (data) => {
+    return http({
+        method: 'GET',
+        url: '/material/repair_audit_details/getRepairAuditList',
+        data,
+    })
+}
+
+// 外层修试审核通过
+export const outerAudit = (data) => {
+    return http({
+        method: 'POST',
+        url: '/material/repair_audit_details/outerAudit',
+        data,
+    })
+}
+
+//修试审核内层-通过，驳回
+export const innerAudit = (data) => {
+    return http({
+        method: 'put',
+        url: '/material/repair_audit_details/innerAudit',
+        data,
+    })
+}
+
+
+
+ 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/services/repair/testedInBound.js b/src/services/repair/testedInBound.js
new file mode 100644
index 0000000..a45afdf
--- /dev/null
+++ b/src/services/repair/testedInBound.js
@@ -0,0 +1,90 @@
+import { http } from '@/utils/http'
+
+// 列表查询
+export const getRepairedList = (data) => {
+    return http({
+        method: 'GET',
+        url: '/material/repair/getRepairedList',
+        data,
+    })
+}
+// 查询修试详细列表
+export const getRepairedDetailList = (taskId) => {
+    return http({
+        method: 'GET',
+        url: '/material/repair/getRepairedDetailList?taskId='+taskId,
+        // data,
+    })
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+