From 93612da111454ab48796eefc9c817162726dae25 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 19 Dec 2024 09:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93=E3=80=82?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                              |  15 +
 src/pages/back/backCodeDetail.vue           |   2 +-
 src/pages/repair/testedInBound/codeList.vue | 196 +++++++++++
 src/pages/repair/testedInBound/codeScan.vue | 230 +++++++++++++
 src/pages/repair/testedInBound/details.vue  |  39 ++-
 src/pages/repair/testedInBound/index.vue    |   2 +-
 src/pages/standardBox/acceptBox.vue         | 331 +++++++++++++++++++
 src/pages/standardBox/codeList.vue          | 196 +++++++++++
 src/pages/standardBox/codeScan.vue          | 229 +++++++++++++
 src/pages/standardBox/index.vue             | 348 ++++++++++++++++++++
 src/pages/standardBox/transferBox.vue       | 331 +++++++++++++++++++
 src/services/standard.js                    |  50 +++
 src/utils/http.js                           |   4 +-
 13 files changed, 1952 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/repair/testedInBound/codeList.vue
 create mode 100644 src/pages/repair/testedInBound/codeScan.vue
 create mode 100644 src/pages/standardBox/acceptBox.vue
 create mode 100644 src/pages/standardBox/codeList.vue
 create mode 100644 src/pages/standardBox/codeScan.vue
 create mode 100644 src/pages/standardBox/index.vue
 create mode 100644 src/pages/standardBox/transferBox.vue
 create mode 100644 src/services/standard.js

diff --git a/src/pages.json b/src/pages.json
index ff7b7fd..8a607bc 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -258,8 +258,23 @@
             "style": {
                 "navigationBarTitleText": "修试入库详情"
             }
+        },
+        //修试审核-编码详情
+        {
+            "path": "pages/repair/testedInBound/codeList",
+            "style": {
+                "navigationBarTitleText": "编码详情"
+            }
+        },
+        //修试审核-编码扫描
+        {
+            "path": "pages/repair/testedInBound/codeScan",
+            "style": {
+                "navigationBarTitleText": "编码扫描"
+            }
         }
         
+        
     ],
     "tabBar": {
         "color": "#2c2c2c",
diff --git a/src/pages/back/backCodeDetail.vue b/src/pages/back/backCodeDetail.vue
index a2c7495..b0b9be8 100644
--- a/src/pages/back/backCodeDetail.vue
+++ b/src/pages/back/backCodeDetail.vue
@@ -5,7 +5,7 @@
                 <view><uni-easyinput placeholder="请输入内容" v-model="searchValue"/></view>
             </uni-col>
             <uni-col :span="4">
-                <view class="search" @click="getTableList()">查询</view>
+                <view class="search" @click="getCodeList()">查询</view>
             </uni-col>
             <uni-col :span="4">
                 <view class="addBtn" @click="goCode">编码退料</view>
diff --git a/src/pages/repair/testedInBound/codeList.vue b/src/pages/repair/testedInBound/codeList.vue
new file mode 100644
index 0000000..5f276f0
--- /dev/null
+++ b/src/pages/repair/testedInBound/codeList.vue
@@ -0,0 +1,196 @@
+<template>
+    <view class="accept page-common">
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="12">
+                <view><uni-easyinput placeholder="请输入内容" v-model="searchValue"/></view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getCodeList()">查询</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="addBtn" @click="goCode">扫码</view>
+            </uni-col> 
+        </uni-row> 
+        <div class="card" style="margin-top: 10px;">
+            <div>退料物资</div>
+            <uni-forms :model="rowData" label-width="200rpx" :border="true">
+                <uni-forms-item label="物资名称：" name="unitName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.typeName2 }}</span>
+                </uni-forms-item>
+               <uni-forms-item label="规格型号：" name="proName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.typeName }}</span>
+                </uni-forms-item>
+                <uni-forms-item label="待入库数量：" name="code">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.repairNum }}</span>
+                </uni-forms-item>
+            </uni-forms>
+
+            <div style="width: 92%;height: auto;margin: 10px;">
+                <uni-table border stripe emptyText="暂无更多数据" >
+                    <!-- 表头行 -->
+                    <uni-tr>
+                        <uni-th width="70px" align="center">编码</uni-th>
+                        <uni-th width="70px" align="center">状态</uni-th> 
+                        <uni-th width="100px" align="center">入库人</uni-th> 
+                        <uni-th width="120px" align="center">入库时间</uni-th>
+                        <uni-th width="120px" align="center">入库方式</uni-th>
+                    </uni-tr>
+                    <!-- 表格数据行 -->
+                    <uni-tr v-for="(item,index) in codeList" :key="item.id">
+                        <uni-td>{{item.maCode}}</uni-td>
+                        <uni-td>{{item.maCode}}</uni-td>
+                        <!-- <uni-td>
+                            <view class="uni-group"> 
+                                <span style="color: red;margin-left:10px;" @click="delRow(item)">驳回</span>
+                            </view>
+                        </uni-td> -->
+                    </uni-tr>
+                </uni-table>
+            </div>  
+        </div>  
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad,onShow } from '@dcloudio/uni-app'  
+import { getMaCodeList,deleteMaCode,saveCode } from '../../../services/back.js';
+import { baseURL } from '@/utils/http'
+const searchValue = ref('')
+const taskInfo = ref({})    
+const rowData = ref({})     
+const codeList = ref([])    
+const imgBeseUrl = ref("")    
+const bmFileInfos = ref([])//请求图片参数
+const goCode = () => {
+    uni.navigateTo({ url: `/pages/repair/testedInBound/codeScan?taskInfo=${JSON.stringify(taskInfo.value)}` })
+}
+const getCodeList = () => {
+    console.log(rowData.value)
+    let param = {
+        "typeId":rowData.value.typeId,
+        "parentId":rowData.value.parentId
+    }
+    getMaCodeList(param).then(res => { 
+        console.log(res)
+        if(res.code=200){
+            codeList.value = res.data;
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+} 
+//删除
+const delRow = (item) => {
+    console.log(item) 
+    let param = {
+        "typeId":item.typeId,
+        "parentId":rowData.value.parentId,
+        "maId":item.maId,
+    }
+    console.log(param)
+    deleteMaCode(param).then(res => {  
+        console.log(res)
+        if(res.code==200){
+            uni.showToast({ title: '删除成功', icon: 'none' })
+            getCodeList()
+        }else{
+            uni.showToast({ title: '删除失败', icon: 'none' })
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+} 
+
+ 
+onLoad((options)=>{
+    console.log(options)
+	taskInfo.value = JSON.parse(options.taskInfo)
+    console.log(taskInfo.value) 
+    rowData.value = JSON.parse(options.rowData)
+    console.log(rowData.value)
+    // getCodeList()
+})
+onShow(()=>{
+    getCodeList()
+})
+</script>
+
+<style lang="scss">
+.accept {
+    padding: 10px;
+    height: 95vh;
+    word-break: break-all;
+}
+.card {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 6px;
+    box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1);
+}
+.coding-btn {
+    padding: 5rpx 0;
+    background-color: #409eff;
+    border-radius: 6rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.upload {
+    width: 80px;
+    height: 80px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    color: #ccc;
+    margin-top: 10px;
+}
+.search-form {
+    display: flex;
+    align-items: center;
+    box-sizing: content-box;
+    margin-top: 10px;
+    font-size: 14px;
+}
+
+.search {
+    height: 60rpx;
+    background-color: #3784fb;
+    text-align: center;
+    line-height: 60rpx;
+    color: #fff;
+    border-radius: 5px;
+    font-size: 12px;
+}
+.addBtn {
+    height: 60rpx;
+    background-color: #3784fb;
+    text-align: center;
+    line-height: 60rpx;
+    color: #fff;
+    border-radius: 5px;
+    font-size: 12px;
+}
+.btn {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 30px;
+
+    .btn-cont {
+        width: 40%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background-color: #3784fb;
+        color: #fff;
+        border-radius: 20px;
+        // 取消按钮淡蓝色
+        // &:first-child {
+        //     background-color: #aacefb;
+        // }
+    }
+}
+</style>
diff --git a/src/pages/repair/testedInBound/codeScan.vue b/src/pages/repair/testedInBound/codeScan.vue
new file mode 100644
index 0000000..776529d
--- /dev/null
+++ b/src/pages/repair/testedInBound/codeScan.vue
@@ -0,0 +1,230 @@
+<template>
+    <view class="accept page-common">
+        <div class="card">
+            <div>任务信息</div>
+            <uni-forms :model="taskInfo" label-width="170rpx" :border="true">
+                <uni-forms-item label="退料单位" name="unitName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.unitName }}</span>
+                </uni-forms-item>
+               <uni-forms-item label="退料工程：" name="proName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.projectName }}</span>
+                </uni-forms-item>
+                <uni-forms-item label="退料单号：" name="code">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.repairCode }}</span>
+                </uni-forms-item>
+                <!-- <uni-forms-item label="退料人员：" name="backPerson">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.backPerson }}</span>
+                </uni-forms-item>
+                <uni-forms-item label="联系电话：" name="phone">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.phone }}</span>
+                </uni-forms-item> -->
+            </uni-forms>
+        </div>
+        <div class="card" style="margin-top: 10px;">
+            <uni-row :gutter="24">
+                <uni-col :span="6">接收方式：</uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">编码识别</view>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">编码识别</view>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">二维码识别</view>
+                </uni-col>
+            </uni-row>
+        </div>
+ 
+        <div class="card" style="margin-top: 10px;"> 
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">识别编码：</uni-col>
+                <uni-col :span="12">
+                    <uni-easyinput placeholder="请输入内容" v-model="maCode"/>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" style="padding: 10rpx 0;color: #fe9a09;background-color: #fff7eb;border: 1px solid #fe9a09;"
+                        @click="getMaInfo"
+                        >编码检索</view>
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">物资类型：</uni-col>
+                <uni-col :span="16">
+                    {{ typeName }}
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">规格型号：</uni-col>
+                <uni-col :span="16">
+                    {{ materialName }}
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">设备状态：</uni-col>
+                <uni-col :span="16">
+                    {{ maStatusName }}
+                </uni-col>
+            </uni-row>
+            
+            
+            
+        </div>
+
+        <div class="btn">
+            <button class="btn-cont" @click="cancelPage">取消</button>
+            <button class="btn-cont" @click="submitCode">入库</button>
+        </div>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'  
+import { getMachine,insertApp } from '../../../services/back.js';
+import { baseURL } from '@/utils/http'
+const taskInfo = ref({})    
+const maId = ref("")  //编码
+const maCode = ref("")  //编码
+const typeName = ref("")//物资类型
+const materialName = ref("")  //规格型号
+const typeId = ref("")  //类型id
+const maStatusName = ref("")  //状态  
+const bmFileInfos = ref([])//图片数组
+
+//根据编码获取设备类型
+const getMaInfo = () => {
+    console.log(maCode.value)
+    let param={
+        "maCode":maCode.value,
+        "unitId":taskInfo.value.unitId,
+        "proId":taskInfo.value.proId
+    }
+    getMachine(param).then(res => {
+		console.log(res)
+        if(res.code==200){
+            if(res.data&&res.data.length>0){
+                typeName.value = res.data[0].typeName;
+                materialName.value = res.data[0].materialName;
+                maStatusName.value = res.data[0].maStatusName;
+                maId.value = res.data[0].maId;
+                typeId.value = res.data[0].typeId;
+            }else{
+                uni.showToast({ title: '该编码非该单位工程领用，不可退料！', icon: 'none' })
+            }
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+}
+// 扫码识别按钮
+const scanStart = () => {
+    console.log('编码识别--')
+    // 只允许通过相机扫码
+    uni.scanCode({
+    	onlyFromCamera: true,
+    	scanType: ['qrCode', 'pdf417'],
+    	success: (res) => {
+    		console.log('扫码结果：' + res.result); 
+			maCode.value = res.result
+    	},
+    	fail: (err) => { 
+    		// uni.showToast({
+    		// 	title: '取消',
+    		// 	icon: 'none'
+    		// });
+    	}
+    });
+}
+//提交
+const submitCode = () => {
+    console.log(taskInfo.value)
+    // console.log(typeList.value)
+    let obj = {
+       "maId":maId.value,
+       "maCode":maCode.value,
+       "typeId":typeId.value, 
+       "bmFileInfos":bmFileInfos.value
+    }
+    let param = {
+        "backApplyInfo":taskInfo.value,
+        "backApplyDetails":obj
+    }
+    insertApp(param).then(res => { 
+        console.log(res)
+        if(res.code==200){
+			uni.showToast({ title: '编辑成功', icon: 'none' })
+			uni.navigateBack({
+				delta: 1 // 返回到已存在的页面
+			});
+		}else{
+			uni.showToast({ title: res.msg, icon: 'none' })
+		}
+	}).catch(error => {
+		console.log(error) 
+	})  
+}
+
+const cancelPage = () => {
+    uni.navigateBack({
+        delta: 1 // 返回到已存在的页面
+    });
+}
+onLoad((options)=>{
+	console.log(options)
+	taskInfo.value = JSON.parse(options.taskInfo)
+    console.log(taskInfo.value)
+})
+</script>
+
+<style lang="scss">
+.accept {
+    padding: 10px;
+    height: 100%;
+    word-break: break-all;
+}
+.card {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 6px;
+    box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1);
+}
+.coding-btn {
+    padding: 5rpx 0;
+    background-color: #409eff;
+    border-radius: 6rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.upload {
+    width: 80px;
+    height: 80px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    color: #ccc;
+    margin-top: 10px;
+}
+.btn {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 30px;
+
+    .btn-cont {
+        width: 40%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background-color: #3784fb;
+        color: #fff;
+        border-radius: 20px;
+        // 取消按钮淡蓝色
+        &:first-child {
+            background-color: #aacefb;
+        }
+    }
+}
+</style>
diff --git a/src/pages/repair/testedInBound/details.vue b/src/pages/repair/testedInBound/details.vue
index 12575d5..efc2ec7 100644
--- a/src/pages/repair/testedInBound/details.vue
+++ b/src/pages/repair/testedInBound/details.vue
@@ -35,10 +35,8 @@
         </view>
 
         <scroll-view scroll-y class="scroll-container">
-            <view
-                v-for="(item, index) in detailsList"
-                :key="index"
-                class="table-list-item"
+            <view v-for="(item, index) in detailsList"
+                :key="index" class="table-list-item"
                 @tap="onRepairItem(item)"
             >   
                 <div class="title">
@@ -74,18 +72,25 @@
                 </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="6">到货数量：</uni-col>
                     <uni-col :span="16">
                         <view class="cont">{{ item.repairNum }}</view>
                     </uni-col>
-                </uni-row>
+                </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="6">已入库数：</uni-col>
                     <uni-col :span="16">
-                        <view class="cont">{{ item.unitName }}</view>
+                        <view class="cont">{{ item.repairNum }}</view>
                     </uni-col>
-                </uni-row>
+                </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>
@@ -121,11 +126,11 @@ 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 query = defineProps() // 获取上级页面传递的路由参数 
+const taskInfo = JSON.parse(query.taskInfo) 
 // 获取列表详情
 const getDetailsData = async () => {
-    const res = await getRepairedDetailList(query.taskId)
+    const res = await getRepairedDetailList(taskInfo.id)
     detailsList.value = res.rows
     detailsList.value = detailsList.value.map((e) => {
         return { ...e, isChecked: false }
@@ -186,16 +191,16 @@ const onQualified = async () => {
 // 点击跳转维修页面
 const onRepairItem = (item) => {
     console.log(item) 
-    // let queryParams = null
-    // let codingUrl = ''
+    let queryParams = null
+    let codingUrl = ''
     // if (item.manageType === 0) {
-    //     codingUrl = '/pages/repair/repairManage/code-view' // 编码维修
+        codingUrl = '/pages/repair/testedInBound/codeList' // 编码维修
     // }
     // if (item.manageType == 1) {
     //     codingUrl = '/pages/repair/repairManage/num-operate' // 数量维修
     // }
-    // queryParams = item
-    // uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}` })
+    queryParams = item
+    uni.navigateTo({ url: `${codingUrl}?taskInfo=${JSON.stringify(taskInfo)}&rowData=${JSON.stringify(queryParams)}` })
 }
 onShow(() => {
     getDetailsData()  
diff --git a/src/pages/repair/testedInBound/index.vue b/src/pages/repair/testedInBound/index.vue
index 441fd56..1cd803f 100644
--- a/src/pages/repair/testedInBound/index.vue
+++ b/src/pages/repair/testedInBound/index.vue
@@ -241,7 +241,7 @@ const changeTab = (index) => {
 }
 // 点击跳转详情
 const handleItem = (item) => {
-    uni.navigateTo({ url: `/pages/repair/testedInBound/details?taskId=${item.id}` })
+    uni.navigateTo({ url: `/pages/repair/testedInBound/details?taskInfo=${JSON.stringify(item)}` })
 }
 
 // 判断数据是否加载完毕
diff --git a/src/pages/standardBox/acceptBox.vue b/src/pages/standardBox/acceptBox.vue
new file mode 100644
index 0000000..9daa195
--- /dev/null
+++ b/src/pages/standardBox/acceptBox.vue
@@ -0,0 +1,331 @@
+<template>
+    <view class="accept page-common">
+        <view class="complete-btn">
+            <view class="btn" @click="changeTab(1)">
+                <span>已完成</span>
+                <div v-if="active == 1" class="bt-line"></div>
+            </view>
+            <view class="btn" style="margin-left: 120rpx" @click="changeTab(2)">
+                <span>未完成</span>
+                <div v-if="active == 2" class="bt-line"></div>
+            </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="16">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord"/>
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getTableList(true)">搜索</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="addBtn" @click="goAdd()">新增</view>
+            </uni-col>
+        </uni-row>
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
+                <!-- <uni-swipe-action-item :right-options="item.taskStatus==0 ? options:options2" @click="onClick($event,item)"  @change="onSwipeChange"> -->
+                    <div class="title">
+                        <span style="font-size: 15px; font-weight: 800">标准箱</span>
+                        <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span>
+                    </div>
+                    <div class="line"></div>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱名称：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.createTime }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱编号：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.code }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">机具数量：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.typeName }}</div></uni-col
+                        >
+                    </uni-row> 
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建人：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.backPerson }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建时间：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.phone }}</div></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" 
+                                size="small"
+                            />
+                            <uni-tag
+                                text="未录入"
+                                type="success" 
+                                size="small"
+                            />
+                        </uni-col>
+                    </uni-row>
+                <!-- </uni-swipe-action-item> -->
+            </div>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { getBackList,submitBackApply,backApplyRemove } from '../../services/back.js'
+import { onLoad,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: '', //                     关键字 
+    status: 2,
+    pageNum: 1,
+    pageSize: 5,
+})
+
+// 右滑按钮组-未完成
+const options = ref([
+    {
+        text: '查看',
+        style: {
+            backgroundColor: '#409EFF',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+    {
+        text: '接收',
+        style: {
+            backgroundColor: '#19BE6B',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+]) 
+// 右滑按钮组-已完成
+const options2 = ref([
+{
+        text: '查看',
+        style: {
+            backgroundColor: '#65a1ff',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    }
+])  
+//点击事件
+const onClick=(e,item)=> {
+    const { index } = e
+    console.log(index)
+    if (index === 0) {
+        handleItem(item)
+    }
+    // 2. 接收
+    if (index === 1) {
+        console.log(item)
+        uni.showModal({
+        title: '提示',
+        content: '是否确认接收？',
+        confirmText: '确定',
+        cancelText: '取消',
+        success: async (res) => {
+            if (res.confirm) {
+                // 用户点击了确定
+                let param = {
+                    id:item.id
+                }
+                console.log(param)
+                const res = await backApplyRemove(param)
+                if (res.code === 200) {
+                    uni.showToast({
+                        title: '接收成功',
+                        icon: 'none',
+                    })
+                    setTimeout(() => {
+                        getTableList(true)
+                    }, 500)  
+                }else{
+                    uni.showToast({ title: '接收失败', icon: 'none' })
+                }
+            } 
+        }
+        })
+    }
+}
+
+//获取列表
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
+    const res  = await getBackList(queryParams.value)
+    console.log('res列表数据', res)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
+    } else {
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
+    }
+}
+ 
+// 滚动触底事件
+const onScrollTolower = debounce(() => {
+    if (total.value > tableList.value.length) {
+        queryParams.value.pageNum++
+        getTableList()
+    }
+})
+//切换tab
+const changeTab = (index) => {  
+    active.value = index
+    if (index == 1) {
+        queryParams.value.status = 2 
+    } else if (index == 2) {
+        queryParams.value.status = 0 
+    }
+    queryParams.value.pageNum = 1
+    getTableList(true)
+}
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+//日期选择
+const maskClick = () => {}
+
+//点击新增
+const goAdd = () => { 
+    uni.navigateTo({ url: `/pages/back/addBack` })
+}
+//点击详情
+const handleItem = (item) => {
+    console.log('🚀 ~ handleItem ~ item:', item)
+    uni.navigateTo({ url: `/pages/back/detail?id=${item.id}&taskId=${item.taskId}` })
+}
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+onShow(() => {
+    tableList.value = []
+    total.value = 0
+    getTableList(true)
+})
+</script>
+
+<style lang="scss" scoped>
+.accept {
+    height: 95vh;
+    word-break: break-all;
+    .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;
+    }
+    .addBtn {
+        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;
+}
+</style>
diff --git a/src/pages/standardBox/codeList.vue b/src/pages/standardBox/codeList.vue
new file mode 100644
index 0000000..ddc4a01
--- /dev/null
+++ b/src/pages/standardBox/codeList.vue
@@ -0,0 +1,196 @@
+<template>
+    <view class="accept page-common">
+        <uni-row :gutter="24" class="search-form">
+            <uni-col :span="12">
+                <view><uni-easyinput placeholder="请输入内容" v-model="searchValue"/></view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getCodeList()">查询</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="addBtn" @click="goCode">扫码</view>
+            </uni-col> 
+        </uni-row> 
+        <div class="card" style="margin-top: 10px;">
+            <div>退料物资</div>
+            <uni-forms :model="rowData" label-width="200rpx" :border="true">
+                <uni-forms-item label="物资名称：" name="unitName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.typeName2 }}</span>
+                </uni-forms-item>
+               <uni-forms-item label="规格型号：" name="proName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.typeName }}</span>
+                </uni-forms-item>
+                <uni-forms-item label="已录入数量：" name="code">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ rowData.repairNum }}</span>
+                </uni-forms-item>
+            </uni-forms>
+
+            <div style="width: 92%;height: auto;margin: 10px;">
+                <uni-table border stripe emptyText="暂无更多数据" >
+                    <!-- 表头行 -->
+                    <uni-tr>
+                        <uni-th width="70px" align="center">编码</uni-th>
+                        <uni-th width="70px" align="center">状态</uni-th> 
+                        <uni-th width="100px" align="center">录入人</uni-th> 
+                        <uni-th width="120px" align="center">录入时间</uni-th>
+                        <uni-th width="120px" align="center">操作</uni-th>
+                    </uni-tr>
+                    <!-- 表格数据行 -->
+                    <uni-tr v-for="item in codeList" :key="item.id">
+                        <uni-td>{{item.maCode}}</uni-td>
+                        <uni-td>{{item.maCode}}</uni-td>
+                        <uni-td>
+                            <view class="uni-group"> 
+                                <span style="color: red;margin-left:10px;" @click="delRow(item)">删除</span>
+                            </view>
+                        </uni-td>
+                    </uni-tr>
+                </uni-table>
+            </div>  
+        </div>  
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad,onShow } from '@dcloudio/uni-app'  
+import { getMaCodeList,deleteMaCode,saveCode } from '../../services/back.js';
+import { baseURL } from '@/utils/http'
+const searchValue = ref('')
+const taskInfo = ref({})    
+const rowData = ref({})     
+const codeList = ref([])    
+const imgBeseUrl = ref("")    
+const bmFileInfos = ref([])//请求图片参数
+const goCode = () => {
+    uni.navigateTo({ url: `/pages/repair/testedInBound/codeScan?taskInfo=${JSON.stringify(taskInfo.value)}` })
+}
+const getCodeList = () => {
+    console.log(rowData.value)
+    let param = {
+        "typeId":rowData.value.typeId,
+        "parentId":rowData.value.parentId
+    }
+    getMaCodeList(param).then(res => { 
+        console.log(res)
+        if(res.code=200){
+            codeList.value = res.data;
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+} 
+//删除
+const delRow = (item) => {
+    console.log(item) 
+    let param = {
+        "typeId":item.typeId,
+        "parentId":rowData.value.parentId,
+        "maId":item.maId,
+    }
+    console.log(param)
+    deleteMaCode(param).then(res => {  
+        console.log(res)
+        if(res.code==200){
+            uni.showToast({ title: '删除成功', icon: 'none' })
+            getCodeList()
+        }else{
+            uni.showToast({ title: '删除失败', icon: 'none' })
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+} 
+
+ 
+onLoad((options)=>{
+    console.log(options)
+	taskInfo.value = JSON.parse(options.taskInfo)
+    console.log(taskInfo.value) 
+    rowData.value = JSON.parse(options.rowData)
+    console.log(rowData.value)
+    // getCodeList()
+})
+onShow(()=>{
+    getCodeList()
+})
+</script>
+
+<style lang="scss">
+.accept {
+    padding: 10px;
+    height: 95vh;
+    word-break: break-all;
+}
+.card {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 6px;
+    box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1);
+}
+.coding-btn {
+    padding: 5rpx 0;
+    background-color: #409eff;
+    border-radius: 6rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.upload {
+    width: 80px;
+    height: 80px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    color: #ccc;
+    margin-top: 10px;
+}
+.search-form {
+    display: flex;
+    align-items: center;
+    box-sizing: content-box;
+    margin-top: 10px;
+    font-size: 14px;
+}
+
+.search {
+    height: 60rpx;
+    background-color: #3784fb;
+    text-align: center;
+    line-height: 60rpx;
+    color: #fff;
+    border-radius: 5px;
+    font-size: 12px;
+}
+.addBtn {
+    height: 60rpx;
+    background-color: #3784fb;
+    text-align: center;
+    line-height: 60rpx;
+    color: #fff;
+    border-radius: 5px;
+    font-size: 12px;
+}
+.btn {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 30px;
+
+    .btn-cont {
+        width: 40%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background-color: #3784fb;
+        color: #fff;
+        border-radius: 20px;
+        // 取消按钮淡蓝色
+        // &:first-child {
+        //     background-color: #aacefb;
+        // }
+    }
+}
+</style>
diff --git a/src/pages/standardBox/codeScan.vue b/src/pages/standardBox/codeScan.vue
new file mode 100644
index 0000000..8b7bc80
--- /dev/null
+++ b/src/pages/standardBox/codeScan.vue
@@ -0,0 +1,229 @@
+<template>
+    <view class="accept page-common">
+        <div class="card">
+            <div>任务信息</div>
+            <uni-forms :model="taskInfo" label-width="170rpx" :border="true">
+                <uni-forms-item label="标准箱名称" name="unitName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.unitName }}</span>
+                </uni-forms-item>
+               <uni-forms-item label="标准箱编号：" name="proName">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.projectName }}</span>
+                </uni-forms-item>
+                <uni-forms-item label="已录数量：" name="code">
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.repairCode }}</span>
+                </uni-forms-item> 
+            </uni-forms>
+        </div>
+        <div class="card" style="margin-top: 10px;">
+            <uni-row :gutter="24"> 
+                <uni-col :span="12">
+                    <view class="coding-btn">查看绑定清单</view>
+                </uni-col>
+                
+            </uni-row>
+        </div>
+        <div class="card" style="margin-top: 10px;">
+            <uni-row :gutter="24">
+                <uni-col :span="6">接收方式：</uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">编码识别</view>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">编码识别</view>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" @click="scanStart">二维码识别</view>
+                </uni-col>
+            </uni-row>
+        </div>
+ 
+        <div class="card" style="margin-top: 10px;"> 
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">识别编码：</uni-col>
+                <uni-col :span="12">
+                    <uni-easyinput placeholder="请输入内容" v-model="maCode"/>
+                </uni-col>
+                <uni-col :span="6">
+                    <view class="coding-btn" style="padding: 10rpx 0;color: #fe9a09;background-color: #fff7eb;border: 1px solid #fe9a09;"
+                        @click="getMaInfo"
+                        >编码检索</view>
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">物资类型：</uni-col>
+                <uni-col :span="16">
+                    {{ typeName }}
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">规格型号：</uni-col>
+                <uni-col :span="16">
+                    {{ materialName }}
+                </uni-col>
+            </uni-row>
+            <uni-row :gutter="24" style="display: flex; align-items: center;margin-bottom: 10px;">
+                <uni-col :span="6">设备状态：</uni-col>
+                <uni-col :span="16">
+                    {{ maStatusName }}
+                </uni-col>
+            </uni-row> 
+        </div>
+
+        <div class="btn">
+            <button class="btn-cont" @click="cancelPage">取消</button>
+            <button class="btn-cont" @click="submitCode">绑定</button>
+        </div>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'  
+import { getMachine,insertApp } from '../../services/back.js';
+import { baseURL } from '@/utils/http'
+const taskInfo = ref({})    
+const maId = ref("")  //编码
+const maCode = ref("")  //编码
+const typeName = ref("")//物资类型
+const materialName = ref("")  //规格型号
+const typeId = ref("")  //类型id
+const maStatusName = ref("")  //状态  
+const bmFileInfos = ref([])//图片数组
+
+//根据编码获取设备类型
+const getMaInfo = () => {
+    console.log(maCode.value)
+    let param={
+        "maCode":maCode.value,
+        "unitId":taskInfo.value.unitId,
+        "proId":taskInfo.value.proId
+    }
+    getMachine(param).then(res => {
+		console.log(res)
+        if(res.code==200){
+            if(res.data&&res.data.length>0){
+                typeName.value = res.data[0].typeName;
+                materialName.value = res.data[0].materialName;
+                maStatusName.value = res.data[0].maStatusName;
+                maId.value = res.data[0].maId;
+                typeId.value = res.data[0].typeId;
+            }else{
+                uni.showToast({ title: '该编码非该单位工程领用，不可退料！', icon: 'none' })
+            }
+        }
+	}).catch(error => {
+		console.log(error) 
+	})  
+}
+// 扫码识别按钮
+const scanStart = () => {
+    console.log('编码识别--')
+    // 只允许通过相机扫码
+    uni.scanCode({
+    	onlyFromCamera: true,
+    	scanType: ['qrCode', 'pdf417'],
+    	success: (res) => {
+    		console.log('扫码结果：' + res.result); 
+			maCode.value = res.result
+    	},
+    	fail: (err) => { 
+    		// uni.showToast({
+    		// 	title: '取消',
+    		// 	icon: 'none'
+    		// });
+    	}
+    });
+}
+//提交
+const submitCode = () => {
+    console.log(taskInfo.value)
+    // console.log(typeList.value)
+    let obj = {
+       "maId":maId.value,
+       "maCode":maCode.value,
+       "typeId":typeId.value, 
+       "bmFileInfos":bmFileInfos.value
+    }
+    let param = {
+        "backApplyInfo":taskInfo.value,
+        "backApplyDetails":obj
+    }
+    insertApp(param).then(res => { 
+        console.log(res)
+        if(res.code==200){
+			uni.showToast({ title: '编辑成功', icon: 'none' })
+			uni.navigateBack({
+				delta: 1 // 返回到已存在的页面
+			});
+		}else{
+			uni.showToast({ title: res.msg, icon: 'none' })
+		}
+	}).catch(error => {
+		console.log(error) 
+	})  
+}
+
+const cancelPage = () => {
+    uni.navigateBack({
+        delta: 1 // 返回到已存在的页面
+    });
+}
+onLoad((options)=>{
+	console.log(options)
+	taskInfo.value = JSON.parse(options.taskInfo)
+    console.log(taskInfo.value)
+})
+</script>
+
+<style lang="scss">
+.accept {
+    padding: 10px;
+    height: 100%;
+    word-break: break-all;
+}
+.card {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 6px;
+    box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1);
+}
+.coding-btn {
+    padding: 5rpx 0;
+    background-color: #409eff;
+    border-radius: 6rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.upload {
+    width: 80px;
+    height: 80px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    color: #ccc;
+    margin-top: 10px;
+}
+.btn {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 30px;
+
+    .btn-cont {
+        width: 40%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background-color: #3784fb;
+        color: #fff;
+        border-radius: 20px;
+        // 取消按钮淡蓝色
+        &:first-child {
+            background-color: #aacefb;
+        }
+    }
+}
+</style>
diff --git a/src/pages/standardBox/index.vue b/src/pages/standardBox/index.vue
new file mode 100644
index 0000000..f2bbcdf
--- /dev/null
+++ b/src/pages/standardBox/index.vue
@@ -0,0 +1,348 @@
+<template>
+    <view class="accept page-common">
+        <view class="complete-btn">
+            <view class="btn" @click="changeTab(1)">
+                <span>已完成</span>
+                <div v-if="active == 1" class="bt-line"></div>
+            </view>
+            <view class="btn" style="margin-left: 120rpx" @click="changeTab(2)">
+                <span>未完成</span>
+                <div v-if="active == 2" class="bt-line"></div>
+            </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="16">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord"/>
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getTableList(true)">搜索</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="addBtn" @click="goAdd()">新增</view>
+            </uni-col>
+        </uni-row>
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
+                <!-- <uni-swipe-action-item :right-options="item.taskStatus==0 ? options:options2" @click="onClick($event,item)"  @change="onSwipeChange"> -->
+                    <div class="title">
+                        <span style="font-size: 15px; font-weight: 800">标准箱</span>
+                        <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span>
+                    </div>
+                    <div class="line"></div>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱名称：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.createTime }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱编号：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.code }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">机具数量：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.typeName }}</div></uni-col
+                        >
+                    </uni-row> 
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建人：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.backPerson }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建时间：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.phone }}</div></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" 
+                                size="small"
+                            />
+                            <uni-tag
+                                text="未录入"
+                                type="success" 
+                                size="small"
+                            />
+                        </uni-col>
+                    </uni-row>
+                <!-- </uni-swipe-action-item> -->
+            </div>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { getBackList,submitBackApply,backApplyRemove } from '../../services/back.js'
+import { getQrCodeBoxListApi } from '../../services/standard.js'
+import { onLoad,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: '', //                     关键字 
+    status: 2,
+    pageNum: 1,
+    pageSize: 5,
+})
+
+// 右滑按钮组-未完成
+const options = ref([
+    {
+        text: '提交',
+        style: {
+            backgroundColor: '#65a1ff',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+    {
+        text: '删除',
+        style: {
+            backgroundColor: '#ed6042',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+]) 
+// 右滑按钮组-已完成
+const options2 = ref([
+{
+        text: '查看',
+        style: {
+            backgroundColor: '#65a1ff',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+    // {
+    //     text: '删除',
+    //     style: {
+    //         backgroundColor: '#ed6042',
+    //         color: '#fff',
+    //         fontSize: '30rpx',
+    //     },
+    // },
+])  
+//点击事件
+const onClick=(e,item)=> {
+    const { index } = e
+    console.log(index)
+    if (index === 0) {
+        if (item.taskStatus == 0) {//未完成-提交
+            console.log(item)
+            let param = {
+                id:item.id,
+                taskId:item.taskId
+            }
+            console.log(param)
+            submitBackApply(param).then(res => { 
+                console.log(res)
+                if(res.code==200){
+                    uni.showToast({ title: '提交成功', icon: 'none' })
+                    getTableList(true)
+                }else{
+                    uni.showToast({ title: '提交失败', icon: 'none' })
+                }
+            }).catch(error => {
+                console.log(error) 
+            })
+        } else if(item.taskStatus == 2) {//已完成-查看
+            handleItem(item)
+        }
+    }
+    // 2. 删除
+    if (index === 1) {
+        console.log(item)
+            let param = {
+                id:item.id
+            }
+            console.log(param)
+            backApplyRemove(param).then(res => { 
+                console.log(res)
+                if(res.code==200){
+                    uni.showToast({ title: '删除成功', icon: 'none' })
+                    getTableList(true)
+                }else{
+                    uni.showToast({ title: '删除失败', icon: 'none' })
+                }
+            }).catch(error => {
+                console.log(error) 
+            })
+    }
+}
+
+//获取列表
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
+    const res  = await getQrCodeBoxListApi(queryParams.value)
+    console.log('res列表数据', res)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
+    } else {
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
+    }
+}
+ 
+// 滚动触底事件
+const onScrollTolower = debounce(() => {
+    if (total.value > tableList.value.length) {
+        queryParams.value.pageNum++
+        getTableList()
+    }
+})
+//切换tab
+const changeTab = (index) => {  
+    active.value = index
+    if (index == 1) {
+        queryParams.value.status = 2 
+    } else if (index == 2) {
+        queryParams.value.status = 0 
+    }
+    queryParams.value.pageNum = 1
+    getTableList(true)
+}
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+//日期选择
+const maskClick = () => {}
+
+//点击新增
+const goAdd = () => { 
+    uni.navigateTo({ url: `/pages/back/addBack` })
+}
+//点击详情
+const handleItem = (item) => {
+    console.log('🚀 ~ handleItem ~ item:', item)
+    uni.navigateTo({ url: `/pages/back/detail?id=${item.id}&taskId=${item.taskId}` })
+}
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+onShow(() => {
+    tableList.value = []
+    total.value = 0
+    getTableList(true)
+})
+</script>
+
+<style lang="scss" scoped>
+.accept {
+    height: 95vh;
+    word-break: break-all;
+    .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;
+    }
+    .addBtn {
+        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;
+}
+</style>
diff --git a/src/pages/standardBox/transferBox.vue b/src/pages/standardBox/transferBox.vue
new file mode 100644
index 0000000..c6e7364
--- /dev/null
+++ b/src/pages/standardBox/transferBox.vue
@@ -0,0 +1,331 @@
+<template>
+    <view class="accept page-common">
+        <view class="complete-btn">
+            <view class="btn" @click="changeTab(1)">
+                <span>已完成</span>
+                <div v-if="active == 1" class="bt-line"></div>
+            </view>
+            <view class="btn" style="margin-left: 120rpx" @click="changeTab(2)">
+                <span>未完成</span>
+                <div v-if="active == 2" class="bt-line"></div>
+            </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="16">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord"/>
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getTableList(true)">搜索</view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="addBtn" @click="goAdd()">新增</view>
+            </uni-col>
+        </uni-row>
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
+                <!-- <uni-swipe-action-item :right-options="item.taskStatus==0 ? options:options2" @click="onClick($event,item)"  @change="onSwipeChange"> -->
+                    <div class="title">
+                        <span style="font-size: 15px; font-weight: 800">标准箱</span>
+                        <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span>
+                    </div>
+                    <div class="line"></div>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱名称：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.createTime }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">标准箱编号：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.code }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">机具数量：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.typeName }}</div></uni-col
+                        >
+                    </uni-row> 
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建人：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.backPerson }}</div></uni-col
+                        >
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">创建时间：</uni-col>
+                        <uni-col :span="16"
+                            ><div class="cont">{{ item.phone }}</div></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" 
+                                size="small"
+                            />
+                            <uni-tag
+                                text="未录入"
+                                type="success" 
+                                size="small"
+                            />
+                        </uni-col>
+                    </uni-row>
+                <!-- </uni-swipe-action-item> -->
+            </div>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { getBackList,submitBackApply,backApplyRemove } from '../../services/back.js'
+import { onLoad,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: '', //                     关键字 
+    status: 2,
+    pageNum: 1,
+    pageSize: 5,
+})
+
+// 右滑按钮组-未完成
+const options = ref([
+    {
+        text: '查看',
+        style: {
+            backgroundColor: '#409EFF',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+    {
+        text: '移交',
+        style: {
+            backgroundColor: '#19BE6B',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
+]) 
+// 右滑按钮组-已完成
+const options2 = ref([
+{
+        text: '查看',
+        style: {
+            backgroundColor: '#65a1ff',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    }
+])  
+//点击事件
+const onClick=(e,item)=> {
+    const { index } = e
+    console.log(index)
+    if (index === 0) {
+        handleItem(item)
+    }
+    // 2. 移交
+    if (index === 1) {
+        console.log(item)
+        uni.showModal({
+        title: '提示',
+        content: '是否确认移交？',
+        confirmText: '确定',
+        cancelText: '取消',
+        success: async (res) => {
+            if (res.confirm) {
+                // 用户点击了确定
+                let param = {
+                    id:item.id
+                }
+                console.log(param)
+                const res = await backApplyRemove(param)
+                if (res.code === 200) {
+                    uni.showToast({
+                        title: '移交成功',
+                        icon: 'none',
+                    })
+                    setTimeout(() => {
+                        getTableList(true)
+                    }, 500)  
+                }else{
+                    uni.showToast({ title: '移交失败', icon: 'none' })
+                }
+            } 
+        }
+        })
+    }
+}
+
+//获取列表
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
+    const res  = await getBackList(queryParams.value)
+    console.log('res列表数据', res)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
+    } else {
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
+    }
+}
+ 
+// 滚动触底事件
+const onScrollTolower = debounce(() => {
+    if (total.value > tableList.value.length) {
+        queryParams.value.pageNum++
+        getTableList()
+    }
+})
+//切换tab
+const changeTab = (index) => {  
+    active.value = index
+    if (index == 1) {
+        queryParams.value.status = 2 
+    } else if (index == 2) {
+        queryParams.value.status = 0 
+    }
+    queryParams.value.pageNum = 1
+    getTableList(true)
+}
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+//日期选择
+const maskClick = () => {}
+
+//点击新增
+const goAdd = () => { 
+    uni.navigateTo({ url: `/pages/back/addBack` })
+}
+//点击详情
+const handleItem = (item) => {
+    console.log('🚀 ~ handleItem ~ item:', item)
+    uni.navigateTo({ url: `/pages/back/detail?id=${item.id}&taskId=${item.taskId}` })
+}
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+onShow(() => {
+    tableList.value = []
+    total.value = 0
+    getTableList(true)
+})
+</script>
+
+<style lang="scss" scoped>
+.accept {
+    height: 95vh;
+    word-break: break-all;
+    .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;
+    }
+    .addBtn {
+        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;
+}
+</style>
diff --git a/src/services/standard.js b/src/services/standard.js
new file mode 100644
index 0000000..8e82b1a
--- /dev/null
+++ b/src/services/standard.js
@@ -0,0 +1,50 @@
+import { http } from '@/utils/http'
+
+ // 列表接口
+ export const getQrCodeBoxListApi = (data) => {
+    return http({
+        method: 'GET',
+        url: '/material/bm_qrcode_box/list',
+        data:data,
+    })
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/utils/http.js b/src/utils/http.js
index 3f882af..b00c2e0 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -6,8 +6,8 @@ import { useMemberStore } from '@/stores'
  *  baseURL 设置请求ip地址和端口
  */
 const ENV = process.env.NODE_ENV
-export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
-// export const baseURL = ENV === 'development' ? '/api' : '***'
+// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : '***'
+export const baseURL = ENV === 'development' ? '/api' : '***'
 /**
  * httpInterceptor 分别拦截 request 和 uploadFile 请求
  */