From be2da4fca67170389b365bb72a22547a2436ee26 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 19 Nov 2024 14:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |   3 +-
 src/pages.json                               |  23 ++
 src/pages/picking/outbound/code-outbound.vue | 247 +++++++++++++++++++
 src/pages/picking/outbound/details.vue       | 174 +++++++++++++
 src/pages/picking/outbound/index.vue         | 136 ++++++----
 src/pages/picking/outbound/num-outbound.vue  | 247 +++++++++++++++++++
 src/services/picking/outbound.js             |   9 +
 src/utils/http.js                            |   4 +-
 vite.config.js                               |   2 +-
 9 files changed, 793 insertions(+), 52 deletions(-)
 create mode 100644 src/pages/picking/outbound/code-outbound.vue
 create mode 100644 src/pages/picking/outbound/details.vue
 create mode 100644 src/pages/picking/outbound/num-outbound.vue

diff --git a/.gitignore b/.gitignore
index 7ce6e50..68e1aef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ dist
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
\ No newline at end of file
+*.sw?
+vite.config.js
diff --git a/src/pages.json b/src/pages.json
index 431b25f..a471aca 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -64,11 +64,34 @@
             }
         },
         /* 领料及其页面 */
+
+        // 1. 主列表
         {
             "path": "pages/picking/outbound/index",
             "style": {
                 "navigationBarTitleText": "领料出库"
             }
+        },
+        // 2. 详情
+        {
+            "path": "pages/picking/outbound/details",
+            "style": {
+                "navigationBarTitleText": "出库详情"
+            }
+        },
+        // 3. 编码出库
+        {
+            "path": "pages/picking/outbound/code-outbound",
+            "style": {
+                "navigationBarTitleText": "编码出库"
+            }
+        },
+        // 4. 数量出库
+        {
+            "path": "pages/picking/outbound/num-outbound",
+            "style": {
+                "navigationBarTitleText": "数量出库"
+            }
         }
     ],
     "tabBar": {
diff --git a/src/pages/picking/outbound/code-outbound.vue b/src/pages/picking/outbound/code-outbound.vue
new file mode 100644
index 0000000..8c6f68b
--- /dev/null
+++ b/src/pages/picking/outbound/code-outbound.vue
@@ -0,0 +1,247 @@
+<template>
+    <!-- 编码出库-->
+    <view class="page-container">
+        <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="12">
+                <view>
+                    <uni-datetime-picker
+                        v-model="dateArray"
+                        type="daterange"
+                        @maskClick="maskClick"
+                        @change="onChangeDate"
+                        placeholder="选择日期范围"
+                    />
+                </view>
+            </uni-col>
+            <uni-col :span="8">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getTableList()">搜索</view>
+            </uni-col>
+        </uni-row>
+
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <view
+                class="table-list-item"
+                v-for="(item, index) in tableList"
+                :key="index"
+                @click="handleItem(item)"
+            >
+                <div class="line"></div>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">申请时间：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.createTime }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料单号：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.code }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料物资：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.purchaseMaTypeName }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料单位：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.purchaseMaNumber }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料工程：</uni-col>
+                    <uni-col :span="18"><div class="cont"></div></uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料人：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.leasePerson }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">预领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">已领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">待领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">状态：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">未完成</div>
+                    </uni-col>
+                </uni-row>
+            </view>
+            <view class="loading-text"> {{ finish ? '没有更多数据了~' : '正在加载...' }} </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { getPickingOutboundListAPI } from '@/services/picking/outbound.js'
+import { onLoad } from '@dcloudio/uni-app'
+const active = ref(1)
+const tableList = ref([])
+const statusList = ref(['3', '13', '4', '14', '19'])
+const finish = ref(false) // 判断数据是否加载完毕
+// 查询参数
+const queryParams = ref({
+    startTime: '', // 开始时间
+    endTime: '', // 结束时间
+    keyWord: '',
+    pageNum: 1,
+    pageSize: 3,
+})
+const dateArray = ref([]) //日期范围
+
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+
+// 获取列表数据
+const getTableList = async () => {
+    console.log('queryParams.value查询参数', queryParams.value)
+    const res = await getPickingOutboundListAPI(queryParams.value)
+    if (res.total > tableList.value.length) {
+        tableList.value = [...tableList.value, ...res.rows]
+    } else {
+        finish.value = true
+    }
+}
+
+// 页面加载完毕
+onLoad(() => {
+    getTableList()
+})
+
+// 滚动触底事件
+const onScrollTolower = () => {
+    if (!finish.value) {
+        queryParams.value.pageNum++
+    }
+    getTableList()
+}
+
+// tap 栏切换
+const changeTab = (index) => {
+    active.value = index
+    if (index == 1) {
+        statusList.value = ['3', '13', '4', '14', '19']
+        getTableList()
+    } else if (index == 2) {
+        statusList.value = ['2', '12']
+        getTableList()
+    }
+}
+// 点击跳转
+const handleItem = (item) => {
+    console.log('🚀 ~ handleItem ~ item:', item)
+    // uni.navigateTo({ url: '/pages/new-purchase/accept/acceptDetails' })
+}
+
+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;
+    }
+
+    .search {
+        height: 65rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 65rpx;
+        color: #fff;
+    }
+
+    .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/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue
new file mode 100644
index 0000000..d33453e
--- /dev/null
+++ b/src/pages/picking/outbound/details.vue
@@ -0,0 +1,174 @@
+<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" @click="getTableList()">查询</view> -->
+            </uni-col>
+        </uni-row>
+
+        <scroll-view scroll-y class="scroll-container">
+            <view v-for="(item, index) in detailsList" :key="index" class="table-list-item">
+                <div class="line"></div>
+                <uni-row :gutter="24">
+                    <uni-col :span="2">{{ index + 1 }}</uni-col>
+                    <uni-col :span="6">物资名称：</uni-col>
+                    <uni-col :span="16"
+                        ><div class="cont">{{ item.maTypeName }}</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"
+                        ><div class="cont">{{ item.typeName }}</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"
+                        ><div class="cont">{{ item.preNum }}</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"
+                        ><div class="cont">{{ item.alNum }}</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">
+                        <div class="cont">{{ item.preNum - item.alNum }}</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">
+                        <div class="cont">{{ item.unitName }}</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"
+                            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">
+                        <uni-tag
+                            text="未完成"
+                            type="warning"
+                            size="small"
+                            v-if="item.status == 0 || item.status == 1"
+                        />
+                        <uni-tag
+                            text="已完成"
+                            type="success"
+                            size="small"
+                            v-if="item.status == 2"
+                        />
+                    </uni-col>
+                </uni-row>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { getOutboundDetailsAPI } from '@/services/picking/outbound.js'
+import { onLoad } from '@dcloudio/uni-app'
+const detailsList = ref([])
+const query = defineProps() // 获取上级页面传递的路由参数
+
+// 获取列表详情
+const getOutboundDetailsData = async () => {
+    const { data: res } = await getOutboundDetailsAPI(query.id)
+    detailsList.value = res.leaseApplyDetailsList
+    console.log('详情数据', res)
+}
+
+// 页面加载完毕
+onLoad(() => {
+    getOutboundDetailsData()
+})
+</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;
+    }
+
+    .scroll-container {
+        .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/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue
index ccf7b8d..d2d764e 100644
--- a/src/pages/picking/outbound/index.vue
+++ b/src/pages/picking/outbound/index.vue
@@ -1,9 +1,5 @@
 <template>
     <!-- 领料出库 -->
-    <!-- <view class="accept page-common">
-      
-    </view> -->
-
     <view class="page-container">
         <view class="complete-btn">
             <view class="btn" @click="changeTab(1)">
@@ -40,68 +36,100 @@
         <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
             <view
                 class="table-list-item"
-                v-for="(item, index) in tableList"
                 :key="index"
                 @click="handleItem(item)"
+                v-for="(item, index) in tableList"
             >
-                <view class="title">
-                    <span style="font-size: 15px; font-weight: 800">新购验收</span>
-                    <span :style="{ color: item.status == 1 ? '#ff4d4f' : '#3784fb' }">{{
-                        item.taskStatus == 2 ? '未完成' : '已完成'
-                    }}</span>
-                </view>
                 <div class="line"></div>
                 <uni-row :gutter="24">
-                    <uni-col :span="6">到货时间：</uni-col>
+                    <uni-col :span="6">申请时间：</uni-col>
                     <uni-col :span="18"
-                        ><div class="cont">{{ item.arrivalTime }}</div></uni-col
+                        ><div class="cont">{{ item.createTime }}</div></uni-col
                     >
                 </uni-row>
                 <uni-row :gutter="24">
-                    <uni-col :span="6">采购单号：</uni-col>
+                    <uni-col :span="6">领料单号：</uni-col>
                     <uni-col :span="18"
                         ><div class="cont">{{ item.code }}</div></uni-col
                     >
                 </uni-row>
                 <uni-row :gutter="24">
-                    <uni-col :span="6">采购物资：</uni-col>
-                    <uni-col :span="18"
-                        ><div class="cont">{{ item.purchaseMaTypeName }}</div></uni-col
-                    >
+                    <uni-col :span="6">领料物资：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.maTypeNames }}</div>
+                    </uni-col>
                 </uni-row>
                 <uni-row :gutter="24">
-                    <uni-col :span="6">到货数量：</uni-col>
-                    <uni-col :span="18"
-                        ><div class="cont">{{ item.purchaseMaNumber }}</div></uni-col
-                    >
+                    <uni-col :span="6">领料单位：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.leaseUnit }}</div>
+                    </uni-col>
                 </uni-row>
                 <uni-row :gutter="24">
-                    <uni-col :span="6">验收数量：</uni-col>
-                    <uni-col :span="18"><div class="cont"></div></uni-col>
+                    <uni-col :span="6">领料工程：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.leaseProject }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料人：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.leasePerson }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">预领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.preCountNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">已领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">待领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.preCountNum - item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">状态：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">
+                            <uni-tag text="未完成" type="warning" v-if="item.taskStatus === 3" />
+                            <uni-tag text="已完成" type="success" v-if="item.taskStatus === 4" />
+                        </div>
+                    </uni-col>
                 </uni-row>
             </view>
-            <view class="loading-text"> {{ finish ? '没有更多数据了~' : '正在加载...' }} </view>
+            <view class="loading-text">
+                {{ finish ? '没有更多数据了~' : '正在加载...' }}
+            </view>
         </scroll-view>
     </view>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue'
+import { ref, computed } from 'vue'
 import { getPickingOutboundListAPI } from '@/services/picking/outbound.js'
 import { onLoad } from '@dcloudio/uni-app'
-const active = ref(1)
-const tableList = ref([])
-const statusList = ref(['3', '13', '4', '14', '19'])
-const finish = ref(false) // 判断数据是否加载完毕
+
+const total = ref(0) //                 数据总量
+const active = ref(1) //                tap索引
+const tableList = ref([]) //            列表数据源
+const dateArray = ref([]) //            日期范围
 // 查询参数
 const queryParams = ref({
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
-    keyWord: '',
+    startTime: '', //                   开始时间
+    endTime: '', //                     结束时间
+    keyWord: '', //                     关键字
+    statusList: [4], //                 状态
     pageNum: 1,
     pageSize: 3,
 })
-const dateArray = ref([]) //日期范围
 
 // 日期 change 事件
 const onChangeDate = (val) => {
@@ -111,13 +139,19 @@ const onChangeDate = (val) => {
 }
 
 // 获取列表数据
-const getTableList = async () => {
-    console.log('queryParams.value查询参数', queryParams.value)
+const getTableList = async (isTap = false) => {
+    // console.log('queryParams.value查询参数', queryParams.value)
     const res = await getPickingOutboundListAPI(queryParams.value)
-    if (res.total > tableList.value.length) {
-        tableList.value = [...tableList.value, ...res.rows]
+    console.log('res列表数据', res)
+    total.value = res.total
+    if (isTap) {
+        tableList.value = res.rows
     } else {
-        finish.value = true
+        if (res.rows.length == 0) {
+            tableList.value = []
+        } else {
+            tableList.value.push(...res.rows)
+        }
     }
 }
 
@@ -128,29 +162,35 @@ onLoad(() => {
 
 // 滚动触底事件
 const onScrollTolower = () => {
-    if (!finish.value) {
+    if (total.value > tableList.value.length) {
         queryParams.value.pageNum++
+        getTableList()
     }
-    getTableList()
 }
 
 // tap 栏切换
 const changeTab = (index) => {
     active.value = index
     if (index == 1) {
-        statusList.value = ['3', '13', '4', '14', '19']
-        getTableList()
+        queryParams.value.statusList = [4] // 查已完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
     } else if (index == 2) {
-        statusList.value = ['2', '12']
-        getTableList()
+        queryParams.value.statusList = [3] // 查未完成的
+        queryParams.value.pageNum = 1
+        getTableList(true)
     }
 }
-// 点击跳转
+// 点击跳转详情
 const handleItem = (item) => {
-    console.log('🚀 ~ handleItem ~ item:', item)
-    // uni.navigateTo({ url: '/pages/new-purchase/accept/acceptDetails' })
+    uni.navigateTo({ url: `/pages/picking/outbound/details?id=${item.id}` })
 }
 
+// 判断数据是否加载完毕
+const finish = computed(() => {
+    if (total.value === tableList.value.length) return true
+})
+
 const maskClick = () => {}
 </script>
 
diff --git a/src/pages/picking/outbound/num-outbound.vue b/src/pages/picking/outbound/num-outbound.vue
new file mode 100644
index 0000000..432a549
--- /dev/null
+++ b/src/pages/picking/outbound/num-outbound.vue
@@ -0,0 +1,247 @@
+<template>
+    <!-- 数量出库 -->
+    <view class="page-container">
+        <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="12">
+                <view>
+                    <uni-datetime-picker
+                        v-model="dateArray"
+                        type="daterange"
+                        @maskClick="maskClick"
+                        @change="onChangeDate"
+                        placeholder="选择日期范围"
+                    />
+                </view>
+            </uni-col>
+            <uni-col :span="8">
+                <view>
+                    <uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
+                </view>
+            </uni-col>
+            <uni-col :span="4">
+                <view class="search" @click="getTableList()">搜索</view>
+            </uni-col>
+        </uni-row>
+
+        <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
+            <view
+                class="table-list-item"
+                v-for="(item, index) in tableList"
+                :key="index"
+                @click="handleItem(item)"
+            >
+                <div class="line"></div>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">申请时间：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.createTime }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料单号：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.code }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料物资：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.purchaseMaTypeName }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料单位：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.purchaseMaNumber }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料工程：</uni-col>
+                    <uni-col :span="18"><div class="cont"></div></uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">领料人：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.leasePerson }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">预领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">已领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">待领数量：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">{{ item.alNum }}</div>
+                    </uni-col>
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">状态：</uni-col>
+                    <uni-col :span="18">
+                        <div class="cont">未完成</div>
+                    </uni-col>
+                </uni-row>
+            </view>
+            <view class="loading-text"> {{ finish ? '没有更多数据了~' : '正在加载...' }} </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { getPickingOutboundListAPI } from '@/services/picking/outbound.js'
+import { onLoad } from '@dcloudio/uni-app'
+const active = ref(1)
+const tableList = ref([])
+const statusList = ref(['3', '13', '4', '14', '19'])
+const finish = ref(false) // 判断数据是否加载完毕
+// 查询参数
+const queryParams = ref({
+    startTime: '', // 开始时间
+    endTime: '', // 结束时间
+    keyWord: '',
+    pageNum: 1,
+    pageSize: 3,
+})
+const dateArray = ref([]) //日期范围
+
+// 日期 change 事件
+const onChangeDate = (val) => {
+    const [val_1, val_2] = val
+    queryParams.value.startTime = val_1
+    queryParams.value.endTime = val_2
+}
+
+// 获取列表数据
+const getTableList = async () => {
+    console.log('queryParams.value查询参数', queryParams.value)
+    const res = await getPickingOutboundListAPI(queryParams.value)
+    if (res.total > tableList.value.length) {
+        tableList.value = [...tableList.value, ...res.rows]
+    } else {
+        finish.value = true
+    }
+}
+
+// 页面加载完毕
+onLoad(() => {
+    getTableList()
+})
+
+// 滚动触底事件
+const onScrollTolower = () => {
+    if (!finish.value) {
+        queryParams.value.pageNum++
+    }
+    getTableList()
+}
+
+// tap 栏切换
+const changeTab = (index) => {
+    active.value = index
+    if (index == 1) {
+        statusList.value = ['3', '13', '4', '14', '19']
+        getTableList()
+    } else if (index == 2) {
+        statusList.value = ['2', '12']
+        getTableList()
+    }
+}
+// 点击跳转
+const handleItem = (item) => {
+    console.log('🚀 ~ handleItem ~ item:', item)
+    // uni.navigateTo({ url: '/pages/new-purchase/accept/acceptDetails' })
+}
+
+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;
+    }
+
+    .search {
+        height: 65rpx;
+        background-color: #3784fb;
+        text-align: center;
+        line-height: 65rpx;
+        color: #fff;
+    }
+
+    .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/picking/outbound.js b/src/services/picking/outbound.js
index 6d49af8..3cd6c98 100644
--- a/src/services/picking/outbound.js
+++ b/src/services/picking/outbound.js
@@ -10,3 +10,12 @@ export const getPickingOutboundListAPI = (data) => {
         data,
     })
 }
+/**
+ * 领料出库  ---- 列表详情
+ */
+export const getOutboundDetailsAPI = (id) => {
+    return http({
+        method: 'GET',
+        url: `/material/lease_apply_info/${id}`,
+    })
+}
diff --git a/src/utils/http.js b/src/utils/http.js
index b08770f..794e46f 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -6,7 +6,7 @@ import { useMemberStore } from '@/stores'
  *  baseURL 设置请求ip地址和端口
  */
 const ENV = process.env.NODE_ENV
-const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
+const baseURL = ENV === 'development' ? '/api' : '***'
 
 /**
  * httpInterceptor 分别拦截 request 和 uploadFile 请求
@@ -89,7 +89,7 @@ export const http = (options) => {
             fail(err) {
                 uni.showToast({
                     icon: 'none',
-                    title: err,
+                    title: '请求失败',
                 })
                 console.log(err, '请求失败')
                 reject(err)
diff --git a/vite.config.js b/vite.config.js
index 0b37f6c..4f23216 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -20,7 +20,7 @@ export default defineConfig({
         proxy: {
             // 在此处编写代理规则
             '/api': {
-                target: 'http://192.168.2.246:18080',
+                target: 'http://192.168.2.76:18080',
                 changeOrigin: true,
                 rewrite: (path) => {
                     return path.replace(/\/api/, '')