pang.jiabao
2024-12-02 65256395588a29f150b41576fbeece0de533e288
项目框架搭建完成
4个文件已修改
117 ■■■■ 已修改文件
pages/home/home.vue 99 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/pakin/WarehouseIn.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/warehouse/outMats.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue
@@ -69,55 +69,56 @@
                        cuIcon: 'pullup',
                        url: '/warehouse/orderList'
                    },
                    {
                        title: '订单组托',
                        name: 'orderComb',
                        color: 'olive',
                        cuIcon: 'pulldown',
                        url: '/order/orderComb'
                    },
                    {
                        title: '并板入库',
                        name: 'orderPickConfirm',
                        color: 'green',
                        cuIcon: 'pulldown',
                        url: '/order/orderPickConfirm2'
                    },
                    {
                        title: '并板途中拣料',
                        name: 'ParallelBoard',
                        color: 'green',
                        cuIcon: 'pulldown',
                        url: '/order/orderListParallelBoard'
                    },
                    {
                        title: '拣料途中并板',
                        name: 'PickBoard',
                        color: 'orange',
                        cuIcon: 'pulldown',
                        url: '/order/orderListPickBoard'
                    },
                    {
                        title: '多次并板',
                        name: 'BoardMany',
                        color: 'yellow',
                        cuIcon: 'pulldown',
                        url: '/order/mergeBoardManyTimes'
                    },
                    {
                        title: '制令入库',
                        name: 'pakin',
                        color: 'green',
                        cuIcon: 'pulldown',
                        url: '/order/zlOrderPakin'
                    },
                    {
                        title: '商品信息查询',
                        name: 'MatInformation',
                        color: 'red',
                        cuIcon: 'pulldown',
                        url: '/mat/matInformation'
                    },
                    // {
                    //     title: '订单组托',
                    //     name: 'orderComb',
                    //     color: 'olive',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderComb'
                    // }
                    // ,
                    // {
                    //     title: '并板入库',
                    //     name: 'orderPickConfirm',
                    //     color: 'green',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderPickConfirm2'
                    // },
                    // {
                    //     title: '并板途中拣料',
                    //     name: 'ParallelBoard',
                    //     color: 'green',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderListParallelBoard'
                    // },
                    // {
                    //     title: '拣料途中并板',
                    //     name: 'PickBoard',
                    //     color: 'orange',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderListPickBoard'
                    // },
                    // {
                    //     title: '多次并板',
                    //     name: 'BoardMany',
                    //     color: 'yellow',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/mergeBoardManyTimes'
                    // },
                    // {
                    //     title: '制令入库',
                    //     name: 'pakin',
                    //     color: 'green',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/zlOrderPakin'
                    // },
                    // {
                    //     title: '商品信息查询',
                    //     name: 'MatInformation',
                    //     color: 'red',
                    //     cuIcon: 'pulldown',
                    //     url: '/mat/matInformation'
                    // },
                    // {
                    //     title: '库存查询',
                    //     name: 'stockQuery',
pages/login/login.vue
@@ -76,13 +76,13 @@
                        <view class="popup-item-left">项目:</view>
                        <view class="popup-item-right"><input type="text" v-model="url.project"></view>
                    </view>
                    <view class="popup-item">
<!--                     <view class="popup-item">
                        <view class="popup-item-left">仓库:</view>
                        <view class="popup-item-right" style="border:none;padding: 0;">
                            <uni-combox style="height: 34rpx;" :candidates="storeList" placeholder="选择仓库" v-model="store" 
                            @input="getStore" />
                        </view>
                    </view>
                    </view> -->
                    <view class="btn">
                        <view class="btn-left" @click="close">取消</view>
                        <view class="btn-right" @click="settingConfirm">确认</view>
@@ -201,10 +201,10 @@
            },
            onLogin() {
                let that = this
                if (that.url.storeId == null) {
                    uni.showToast({ icon: 'error', title: '请选择仓库' })
                    return
                }
                // if (that.url.storeId == null) {
                //     uni.showToast({ icon: 'error', title: '请选择仓库' })
                //     return
                // }
                uni.request({
                    url: that.baseUrl + '/login.action',
                    fail(result) {
pages/pakin/WarehouseIn.vue
@@ -212,6 +212,7 @@
                            var res = result.data
                            if (res.code === 200) {
                                that.dataList = res.data;
                                console.log(res);
                            } else if (res.code == 403) {
                                uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                                setTimeout(() => {
pages/warehouse/outMats.vue
@@ -44,8 +44,8 @@
                        <text class="desc_connect">{{item.maktx}}</text>
                    </view>
                    <view>
                        <text class="desc_name">订单号:</text>
                        <text class="desc_connect">{{item.orderNo}}</text>
                        <text class="desc_name">批次:</text>
                        <text class="desc_connect">{{item.batch}}</text>
                    </view>
                    <view style="display: flex;">
                        <text class="desc_name">数量:</text>
@@ -196,7 +196,6 @@
                }
                let optDataList = []
                for (let k of that.dataList) {
                    console.log(k);
                    if (k.checked) {
                        optDataList.push(k)
                    }