#
whycq
2025-02-19 04839b0c8660e2ba4228a743edf8f784e2470d6c
#
1个文件已添加
8个文件已修改
557 ■■■■■ 已修改文件
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/menuHome.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/orderManage.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/bcp/bcpDbOrderV2.vue 485 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/checkLocDetl/locDetlList.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/checkLocDetl/locDetlList2.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/order/pakinOrderSelectV2.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/orderOut/orderOutSelectV2.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,8 +2,8 @@
    "name" : "中扬WMS",
    "appid" : "__UNI__DA5854D",
    "description" : "",
    "versionName" : "20250217B",
    "versionCode" : 141,
    "versionName" : "20250218C",
    "versionCode" : 143,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages.json
@@ -357,6 +357,13 @@
                "navigationBarTitleText" : "半成品调拨单",
                "enablePullDownRefresh" : false
            }
        },{
            "path" : "pages/phyz/bcp/bcpDbOrderV2",
            "style" :
            {
                "navigationBarTitleText" : "半成品调拨单",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/phyz/bcp/orderCar",
pages/home/menuHome.vue
@@ -99,7 +99,7 @@
            this.token = uni.getStorageSync('token');
            this.menu = uni.getStorageSync('menu');
            // console.log(this.menu);
            this.getAuth2()
            this.getAuth()
            // this.backGroundRepeat()
        },
        methods: {
@@ -164,7 +164,6 @@
                                    url: `${res.data[i].code}`
                                })
                            }
                            console.log(that.elements);
                            that.elements.push({
                                title: '退出登录',
                                name: 'logOut',
pages/home/orderManage.vue
@@ -89,6 +89,13 @@
                        url: `/phyz/bcp/bcpDbOrder`
                    },
                    {
                        title: '半成品调拨单',
                        name: 'bcpDbOrder',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/bcp/bcpDbOrderV2`
                    },
                    {
                        title: '半成品出库单',
                        name: 'bcpOutOrder',
                        color: 'blue',
@@ -183,6 +190,8 @@
                }
                for (let i in secMenu) {
                    this.getIcon(secMenu[i].title)
                    // 兼容2025 02 18 菜单param
                    if (secMenu[i].param) {
                    this.elements.unshift({
                        title: secMenu[i].name,
                        name: secMenu[i].title,
@@ -192,6 +201,18 @@
                        param: JSON.parse(secMenu[i].param),
                        url: `${secMenu[i].code}`
                    })
                    } else {
                        this.elements.unshift({
                            title: secMenu[i].name,
                            name: secMenu[i].title,
                            color: this.colorList[i],
                            cuIcon: this.icon,
                            id: secMenu[i].id,
                            param: JSON.parse(secMenu[i].param),
                            url: `${secMenu[i].code}`
                        })
                    }
                    
                }
                console.log(this.elements);
pages/phyz/bcp/bcpDbOrderV2.vue
New file
@@ -0,0 +1,485 @@
<template>
    <view class="container">
        <view class="code">
            <uni-search-bar :focus="searchValueFocus" v-model="searchValue"
                maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="输入 / 扫描 订单号">
            </uni-search-bar>
            <view class="code-title">
                <view></view>
                <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 总数量:- {{total}} -</view>
                <view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">筛选</view>
            </view>
        </view>
        <view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
            <view class="list-left">
                <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
                <view>主单号:{{orderDetl.orderNo}}</view>
                <view>编号:{{orderDetl.matnr}}</view>
                <view>名称:{{orderDetl.maktx}}</view>
                <view>类型:{{orderDetl.brand}}</view>
                <view>调拨总量:{{orderDetl.anfme}}</view>
                <view>库存数量:{{orderDetl.stock}}</view>
                <view>已调拨数量:{{orderDetl.qty}}</view>
            </view>
            <view class="list-right" @click="goToLocDetl(orderDetl)">
                <uni-icons type="right" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
        <!-- 垫高 -->
        <view style="height: 340rpx;text-align: center;color: #b9b9b9;">
            - 已经到底了 -
        </view>
        <!-- 弹窗 -->
        <view>
            <uni-popup ref="addItem" type="dialog">
                <view class="popup">
                    <!-- 标题 -->
                    <view class="title">入库数量</view>
                    <view class="popup-item">
                        <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="addClose">取消</view>
                        <view class="btn-right" @click="addConfirm()">添加</view>
                    </view>
                </view>
            </uni-popup>
        </view>
        <!-- 筛选弹窗 -->
        <view>
            <uni-popup ref="filter" type="dialog">
                <view class="filter-popup">
                    <!-- 标题 -->
                    <view class="title">筛选</view>
                    <view class="popup-item" style="background-color: #dfdfdf;">
                        <view class="item-cl">
                            <view>销售订单:</view>
                            <input type="text" v-model="searchValue">
                        </view>
                    </view>
                    <view class="popup-item" style="background-color: #dfdfdf;">
                        <view class="item-cl">
                            <view>主订单号:</view>
                            <input type="text" v-model="orderNo">
                        </view>
                    </view>
                    <view class="popup-item" style="background-color: #dfdfdf;">
                        <view class="item-cl">
                            <view>商品编号:</view>
                            <input type="text" v-model="matnr">
                        </view>
                    </view>
                    <view class="popup-item" style="background-color: #dfdfdf;">
                        <view class="item-cl">
                            <view>商品名称:</view>
                            <input type="text" v-model="maktx">
                        </view>
                    </view>
                    <view class="popup-item" style="background-color: #dfdfdf;">
                        <view class="item-cl">
                            <view>商品种类:</view>
                            <input type="text" v-model="brand">
                        </view>
                    </view>
                    <view class="btn filter-btn">
                        <view class="btn-left" @click="filterClose">重置</view>
                        <view class="btn-right" @click="filterConfirm()">确认</view>
                    </view>
                </view>
            </uni-popup>
        </view>
    </view>
</template>
<script>
    export default {
        data(){
            return {
                baseUrl: '',
                token: '',
                searchValueFocus: true,
                searchValue: '',
                orderNo: '',
                matnr: '',
                maktx: '',
                brand: '',
                total: '',
                dataList: [],
                orderCarList: [],
                data: {
                    curr: 1,
                    limit: 100,
                    three_code: '',
                    matnr: '',
                    maktx: '',
                    order_no: '',
                    brand: '',
                    orderType: []
                },
                index: 0,
                count: 0,
                mask: false
            }
        },
        // 下拉刷新
        onReachBottom() {
            this.status = 'more';
            this.getOrderDetlList(this.searchValue,10);
        },
        onLoad() {
            eventChannel.on('param', function(data) {
                var orderType = data.param.orderType
                if (orderType != [] || orderType != null) {
                    uni.setStorageSync('dataOrderTypeBcpDb', orderType);
                    _this.data.orderType = orderType
                } else {
                    orderType = uni.getStorageSync('dataOrderTypeBcpDb');
                    if (orderType != [] || orderType != null) {
                        _this.data.orderType = orderType
                    } else {
                        _this.data.orderType = []
                    }
                }
                _this.baseUrl = uni.getStorageSync('baseUrl');
                _this.token = uni.getStorageSync('token');
                _this.searchValue = uni.getStorageSync('threeCode');
                _this.getOrderDetlList(_this.searchValue,10)
                console.log("onLoad");
            })
        },
        onShow() {
            console.log(uni.getStorageSync('pakinOrderCar'));
        },
        onHide() {
            uni.setStorageSync('pakinOrderCar', this.orderCarList);
        },
        methods: {
            getOrderDetlList(threeCode,limit) {
                uni.showLoading({})
                let _this = this
                _this.mask = true
                _this.data.three_code = threeCode
                _this.data.limit = limit
                uni.request({
                    url: `${_this.baseUrl}/order/bcpDb/detls/pakin/page/auth/v2`,
                    header: {'token': uni.getStorageSync('token')},
                    data: _this.data,
                    method: 'GET',
                    success(res) {
                        uni.hideLoading()
                        res = res.data
                        if (res.code === 200) {
                            for (let k of res.data.records) {
                                if (k.anfme > k.qty && k.qty == 0) {
                                    k['color'] = 'order-sts-start'
                                } else if (k.anfme > k.qty && k.qty != 0) {
                                    k['color'] = 'order-sts-working'
                                } else {
                                    k['color'] = 'order-sts-end'
                                }
                            }
                            let list = res.data.records
                            _this.dataList =  _this.dataList.concat(list);
                            _this.data.curr = _this.data.curr + 1
                            // _this.dataList = res.data.records
                            _this.total = res.data.total
                            _this.mask = false
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            searchValueInput2() {
                this.dataList = []
                this.data.curr = 1
                uni.setStorageSync('bcpDbThreeCode', this.searchValue);
                if (this.searchValue.length == 0) {
                    this.getOrderDetlList(this.searchValue,10)
                } else {
                    this.getOrderDetlList(this.searchValue,10)
                }
            },
            clear() {
                this.dataList = []
                this.data.curr = 1
                setTimeout(()=> {
                    this.getOrderDetlList(this.searchValue,10)
                },300)
            },
            // 添加入库商品至 待组托列表
            addItem(index) {
                // 判断添加的商品是否和已经添加的重复
                let dataList = this.dataList
                for (let k of this.orderCarList) {
                    if (k.orderNo == dataList[index].orderNo
                        && k.threeCode == dataList[index].threeCode
                        && k.matnr == dataList[index].matnr) {
                            uni.showToast({ title: '请勿重复添加商品!', icon: "none", position: 'top' })
                            return
                    }
                }
                this.index = index
                this.$refs.addItem.open()
            },
            addClose() {
                this.$refs.addItem.close()
                this.count = 0
            },
            addConfirm() {
                // if (this.count == 0) {
                //     uni.showToast({ title: '入库数量不合法!', icon: "none", position: 'top' })
                //     return
                // }
                this.dataList[this.index]['used'] = true
                this.dataList[this.index]['pakinQty'] = this.count
                this.orderCarList.push(this.dataList[this.index])
                this.index = 0
                this.count = 0
                this.$refs.addItem.close()
            },
            // 点击前往 待组托列表
            orderCar() {
                let _this = this
                if (_this.orderCarList.length === 0) {
                    uni.showToast({ title: '请添加入库商品!', icon: "none", position: 'top' })
                    return
                }
                uni.navigateTo({
                    url: '../order/orderCar',
                    success(res) {
                        res.eventChannel.emit('item', {
                            item: _this.orderCarList
                        })
                    },
                    events: {
                        acceptDataFromOpenedPage: function(data) {
                            console.log(data);
                            if (data.data == 1) {
                                _this.orderCarList = []
                                _this.getOrderDetlList(uni.getStorageSync('bcpDbThreeCode'),10)
                            }
                        }
                    }
                })
            },
            changeValue(value) {
                this.count = value
            },
            // 筛选
            filter() {
                this.$refs.filter.open('bottom')
            },
            filterConfirm() {
                this.dataList = []
                this.data.curr = 1
                this.data.maktx = this.maktx
                this.data.matnr = this.matnr
                this.data.order_no = this.order_no
                this.data.brand = this.brand
                this.getOrderDetlList(this.searchValue,10)
                this.$refs.filter.close()
            },
            filterClose() {
                this.dataList = []
                this.data.curr = 1
                this.data.maktx = ''
                this.data.matnr = ''
                this.data.order_no = ''
                this.data.brand = ''
                this.getOrderDetlList(this.searchValue,10)
                this.$refs.filter.close()
            },
            goToLocDetl(item) {
                let _this = this
                uni.navigateTo({
                    url: './bcpDbList',
                    success(res) {
                        res.eventChannel.emit('item', {
                            item: item
                        })
                    },
                    events: {
                        acceptDataFromOpenedPage: function(data) {
                            _this.getOrderDetlList(this.searchValue1,10)
                        }
                    }
                })
            },
        }
    }
</script>
<style>
    @import url('../../../static/css/common/order.css');
    .list-font-color {
        color: #fff;
        /* background-color: #33bb44; */
    }
    .order-sts-start {
        background-color: #3eb689;
    }
    .order-sts-working {
        background-color: #ff9d46;
    }
    .order-sts-end {
        background-color: #ff7356;
    }
    .detl-threeCode {
        font-size: 28px;
        font-weight: bold;
    }
    .shop-car {
        position: fixed;
        left: 22rpx;
        bottom: 150rpx;
        background-color: #2299ff;
        width: 260rpx;
        height: 90rpx;
        display: flex;
        align-items: center;
        box-shadow: 0 0 10px 5px rgba(0, 0, 0, .6);
        border-radius: 10rpx;
        color: #fff;
        font-size: 28px;
        font-weight: bold;
    }
    .car-left {
        padding: 16rpx;
        flex: 5;
    }
    .car-right {
        flex: 4;
    }
    .mask {
        position: absolute;
        width: 100%;
        height: 100vh;
        z-index: 999;
        top: 0;
        left: 0;
        background-color: rgba(0, 0, 0, .4);
        display: flex;
        align-items: center;
        justify-content: center;
        font-size: 16px;
        color: #fff;
    }
    .popup {
        width: 80vw;
        min-height: 100rpx;
        background-color: #FFF;
        border-radius: 25rpx;
        position: relative;
    }
    .title {
        height: 100rpx;
        line-height: 100rpx;
        width: 100%;
        color: #606266;
        text-align: center;
        font-size: 16px;
    }
    .popup-item {
        height: 80rpx;
        line-height: 80rpx;
        display: flex;
        align-items: center;
        justify-content: center;
    }
    .popup-item-left {
        width: 16vw;
        padding-right: 20rpx;
        text-align: right;
        color: #606266;
    }
    .popup-item-right {
        display: flex;
        align-items: center;
        width: 50vw;
        height: 50rpx;
        padding: 2px 5px;
        border: 1px solid #E4E7ED;
        border-radius: 5rpx;
    }
    .popup-item-right input{
        color: #606266;
    }
    .btn {
        display: flex;
        height: 90rpx;
        margin-top: 20rpx;
        border-top: 1px solid #DCDFE6;
        justify-content: center;
        align-items: center;
    }
    .btn-left {
        display: flex;
        flex: 1;
        height: 100%;
        justify-content: center;
        align-items: center;
        color: #606266;
        border-right: 1px solid #DCDFE6;
    }
    .btn-right {
        display: flex;
        flex: 1;
        justify-content: center;
        align-items: center;
        color: #409EFF;
    }
    .filter-popup {
        width: 100%;
        height: 80vh;
        background-color: #FFF;
        position: relative;
        border-radius: 30rpx 30rpx 0rpx 0rpx;
    }
    .filter-popup-item {
        height: 100%;
        width: 100%;
        background-color: #c9cdd5;
    }
    .filter-popup-item-left {
        width: 30%;
        height: 100%;
        background-color: #DCDFE6;
    }
    .item-btn {
        width: 100%;
        height: 80rpx;
        line-height: 80rpx;
        background-color: #c9cdd5;
        text-align: center;
    }
    .item-btn:checked {
        background-color: #606266;
    }
    .filter-btn {
        position: absolute;
        left: 0;
        bottom: 0;
        width: 100%;
        background-color: #FFF;
    }
    .item-cl {
        display: flex;align-items: center;
    }
    .item-cl input {
        border-bottom: 1px solid #b9b9b9;
    }
</style>
pages/phyz/checkLocDetl/locDetlList.vue
@@ -92,7 +92,6 @@
            //     _this.dataList = data.item.data
            // })
            eventChannel.on('baseInfo', function(data) {
                console.log(data);
                _this.getLocDetl(data.info.locNo,data.info.barcode)
                _this.locNo = data.info.locNo
                _this.barcode = data.info.barcode
@@ -110,14 +109,15 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        console.log(res);
                        if (res.code === 200) {
                            if (_this.type == 'con') {
                                _this.dataList = res.data.containerCode
                            } else {
                                _this.dataList = res.data.locNo
                            }
                            // for (let k of _this.dataList) {
                            //     k['count'] = k.anfme
                            // }
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
pages/phyz/checkLocDetl/locDetlList2.vue
@@ -116,7 +116,9 @@
                            } else {
                                _this.dataList = res.data.locNo
                            }
                            // for (let k of _this.dataList) {
                            //     k['count'] = k.anfme
                            // }
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
pages/phyz/order/pakinOrderSelectV2.vue
@@ -161,13 +161,13 @@
                        _this.data.orderType = []
                    }
                }
            })
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.searchValue = uni.getStorageSync('threeCode');
            this.getOrderDetlList(this.searchValue,10)
                _this.baseUrl = uni.getStorageSync('baseUrl');
                _this.token = uni.getStorageSync('token');
                _this.searchValue = uni.getStorageSync('threeCode');
                _this.getOrderDetlList(_this.searchValue,10)
            console.log("onLoad");
            })
        },
        onShow() {
            console.log(uni.getStorageSync('pakinOrderCar'));
@@ -186,7 +186,7 @@
                    url: `${_this.baseUrl}/order/detls/pakin/page/auth/v2`,
                    header: {'token': uni.getStorageSync('token')},
                    data: _this.data,
                    method: 'POST',
                    method: 'GET',
                    success(res) {
                        uni.hideLoading()
                        res = res.data
pages/phyz/orderOut/orderOutSelectV2.vue
@@ -133,13 +133,12 @@
                        _this.data.orderType = []
                    }
                }
                _this.baseUrl = uni.getStorageSync('baseUrl');
                _this.token = uni.getStorageSync('token');
                _this.searchValue = uni.getStorageSync('threeCode');
                _this.getOrderDetlList(_this.searchValue,10)
                console.log("onLoad");
            })
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.searchValue1 = uni.getStorageSync('threeCodeOut193');
            this.searchValue2 = uni.getStorageSync('threeCodeOut2');
            this.getOrderDetlList(this.searchValue1,10)
        },
        methods: {
            getOrderDetlList(threeCode,limit) {
@@ -153,7 +152,7 @@
                    url: `${_this.baseUrl}/orderDetl/pakout/list/authV7`,
                    header: {'token': uni.getStorageSync('token')},
                    data: _this.data,
                    method: 'POST',
                    method: 'GET',
                    success(res) {
                        uni.hideLoading({})
                        res = res.data