#
whycq
2024-03-21 8a99f9a7909ffa6711f2926c1997982392c05b55
#
8个文件已修改
3个文件已添加
396 ■■■■ 已修改文件
pages.json 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/menuHome.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/orderManage.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/other.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/AGV/AGVPakin.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/order/purchaseOrder.vue 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVPakin.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/orderList.vue 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/css/common/order.css 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/img/newLogo.png 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -434,6 +434,22 @@
                "navigationBarTitleText" : "AGV组托",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/home/orderManage",
            "style" :
            {
                "navigationBarTitleText" : "单据管理",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/phyz/order/purchaseOrder",
            "style" :
            {
                "navigationBarTitleText" : "采购入库单",
                "enablePullDownRefresh" : false
            }
        }
        
        
pages/home/menuHome.vue
@@ -32,6 +32,13 @@
                        // cuIcon: 'pullup',
                        url: `/home/inOutManage`
                    },
                    {
                        title: '单据管理',
                        name: 'ordeManage',
                        color: 'mauve',
                        // cuIcon: 'pullup',
                        url: `/home/orderManage`
                    },
                    // {
                    //     title: '测试',
                    //     name: 'testView',
pages/home/orderManage.vue
New file
@@ -0,0 +1,22 @@
<template>
    <view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
            }
        },
        methods: {
        }
    }
</script>
<style>
</style>
pages/home/other.vue
@@ -26,39 +26,11 @@
                project: 'tzsk',
                elements2: [
                    {
                        title: '出库拣选',
                        name: 'checkOut',
                        color: 'cyan',
                        title: '采购入库单',
                        name: 'purchaseOrder',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: '/tzsk/pakin/checkOut'
                    },
                    {
                        title: '托盘解绑',
                        name: 'untie',
                        color: 'cyan',
                        // cuIcon: 'pullup',
                        url: '/tzsk/pakin/untie'
                    },
                    {
                        title: '临时入库',
                        name: 'pakin',
                        color: 'cyan',
                        cuIcon: 'pullup',
                        url: '/pakin/pakin2'
                    },
                    {
                        title: '打印',
                        name: 'print',
                        color: 'purple',
                        cuIcon: 'text',
                        url: '/print/print'
                    },
                    {
                        title: '商品打印',
                        name: 'matList',
                        color: 'orange',
                        cuIcon: 'post',
                        url: '/mat/matList'
                        url: `/phyz/AGV/purchaseOrder`
                    },
                ],
                colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
pages/login/login.vue
@@ -9,7 +9,7 @@
        <!-- logo -->
        <view class="logo">
            <view class="logo-box">
                <image src="../../static/img/logo.png" mode="aspectFit"></image>
                <image src="../../static/img/newLogo.png" mode="aspectFit"></image>
            </view>
        </view>
        <view class="content">
pages/phyz/AGV/AGVPakin.vue
@@ -2,18 +2,15 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">订单号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="orderNoFocus"
                <input type="text" placeholder=" 扫码 / 输入 订单号" v-model="orderNo" :focus="orderNoFocus"
                    @input="findOrder()">
            </view>
            <view class="item">
                <view class="code-decs">料箱码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                <input type="text" placeholder=" 扫码 / 输入 货架码" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
            <view class="item">
                <view class="code-decs">物料码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
                <input type="text" placeholder=" 扫码 / 输入 物料码" v-model="matnr" :focus="matFocus" @input="findMat()">
                <view class="item-right">
                    <button></button>
                    <text style="text-align: right;color: #409EFF;" @click="selectMat()">提取+</text>
@@ -87,6 +84,9 @@
                </view>
            </view>
        </scroll-view>
        <view>
        </view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" @click="reset('warn')">重置</button>
@@ -617,15 +617,8 @@
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }
    .item input {
        height: 50rpx;
        line-height: 50rpx;
        /* font-family: PingFang SC; uniapp 默认字体不居中 */
        font-size: 36upx;
        font-family: PingFang SC;
        width: 55vw;
        flex: 1;
    }
    .code-decs {
pages/phyz/order/purchaseOrder.vue
New file
@@ -0,0 +1,197 @@
<template>
    <view>
        <view class="code">
            <uni-search-bar :focus="searchValueFocus" v-model="searchValue"  @input="searchValueInput()"
                maxlength="500" ancel="cancel" @clear="clear" placeholder="输入 / 扫描 订单号">
            </uni-search-bar>
            <view class="code-title">
                <view></view>
                <view>单据列表</view>
                <view></view>
                <!-- <view @click="allChecked">{{allCheckBtnTitle}}</view> -->
            </view>
        </view>
        <view class="list" v-for="(item,i) in dataList">
            <view class="list-left">
                <view>编号:{{item.matnr}}</view>
                <view>名称:{{item.maktx}}</view>
                <view>规格:{{item.specs}}</view>
                <view>数量:{{item.anfme}}</view>
                <view class="card-id">{{i + 1}}</view>
            </view>
            <!-- <view class="list-right" @click="checkboxChange(item)">
                <label >
                    <checkbox :value="item.orderNo" :checked="item.checked" color="#FFCC33" style="transform:scale(0.7)" /><text></text>
                </label>
            </view> -->
            <view class="list-right">
            </view>
        </view>
        <view style="height: 100rpx;"></view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                searchValueFocus: true,
                searchValue: '',
                checck: true,
                dataList: [
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931255',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z',
                        checked: true
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931225',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                    {
                        orderNo: 'cg0931241',
                        matnr: 'cg0931241',
                        maktx: '你好',
                        anfme: 10,
                        specs: '10-z'
                    },
                ],
                oldDataList: [],
                newDataList: [],
                allCheck: false,
                allCheckBtnTitle: '全选'
            }
        },
        onShow() {
            this.oldDataList = [...this.dataList]
        },
        methods: {
            searchValueInput() {
                let count = 0
                let sign = 0
                this.dataList = [...this.oldDataList]
                this.newDataList = []
                for (let k in this.dataList) {
                    if (!this.dataList[k].matnr.includes(this.matnr)) {
                        count++;
                    } else {
                        this.newDataList.push(this.dataList[k])
                    }
                }
                if (this.matnr != '') {
                    for (let j in this.dataList) {
                        if (!this.dataList[j].maktx.includes(this.matnr)) {
                        } else {
                            for (let i in this.newDataList) {
                                if (this.newDataList[i].matnr ==  this.dataList[j].matnr) {
                                    sign++
                                }
                            }
                            if (sign == 0) {
                                this.newDataList.push(this.dataList[j])
                            }
                        }
                    }
                }
                this.dataList = this.newDataList
            },
            checkboxChange(e) {
                let items = this.dataList,
                values = e.orderNo;
                if (e.checked) {
                    this.$set(e,'checked',false)
                } else {
                    this.$set(e,'checked',true)
                }
            },
            allChecked() {
                if (this.allCheck) {
                    this.allCheck = false
                    this.allCheckBtnTitle = '全选'
                } else {
                    this.allCheck = true
                    this.allCheckBtnTitle = '取消'
                }
                for (let item of this.dataList) {
                    if (this.allCheck) {
                        this.$set(item,'checked',true)
                    } else {
                        this.$set(item,'checked',false)
                    }
                }
            },
            clear() {
                this.matnr = ''
                this.dataList = [...this.oldDataList]
            }
        }
    }
</script>
<style>
    @import url('../../../static/css/common/order.css');
</style>
pages/tzsk/AGV/AGVPakin.vue
@@ -2,8 +2,7 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">站点码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="orderNoFocus"
                <input type="text" placeholder=" 扫码 / 输入 站点码" v-model="orderNo" :focus="orderNoFocus"
                    @input="findOrder()">
            </view>
        </view>
pages/tzsk/AGV/orderList.vue
@@ -188,50 +188,6 @@
</script>
<style>
    .code {
        background-color: #d9d9d9;
        z-index: 99;
        position: sticky;
        top: 80rpx;
        left: 0;
    }
    .code-title {
        display: flex;
        justify-content: space-around;
        height: 50rpx;
    }
    .list {
        margin: 20rpx;
    @import url('../../../static/css/common/order.css');
        
        background-color: #fff;
        border-radius: 20rpx;
        border: 1px solid #eeeeee;
        display: flex;
        position: relative;
    }
    .card-id {
        position: absolute;
        right: 10rpx;
        top: 5rpx;
        height: 30rpx;
        line-height: 30rpx;
        width: 30rpx;
        text-align: center;
        color: #eeeeee;
        background-color: #ddd844;
        border-radius: 50%;
        font-size: 10px;
    }
    .list-left {
        flex: 1;
        padding: 20rpx;
        position: relative;
    }
    .list-right {
        width: 100rpx;
        border-left: 1px solid #eeeeee;
        display: flex;
        align-items: center;
        justify-content: center;
    }
</style>
static/css/common/order.css
New file
@@ -0,0 +1,46 @@
.code {
        background-color: #d9d9d9;
        z-index: 99;
        position: sticky;
        top: 80rpx;
        left: 0;
    }
    .code-title {
        display: flex;
        justify-content: space-around;
        height: 50rpx;
    }
    .list {
        margin: 20rpx;
        background-color: #fff;
        border-radius: 20rpx;
        border: 1px solid #eeeeee;
        display: flex;
        position: relative;
    }
    .card-id {
        position: absolute;
        right: 10rpx;
        top: 5rpx;
        height: 30rpx;
        line-height: 30rpx;
        width: 30rpx;
        text-align: center;
        color: #eeeeee;
        background-color: #ddd844;
        border-radius: 50%;
        font-size: 10px;
    }
    .list-left {
        flex: 1;
        padding: 20rpx;
        position: relative;
    }
    .list-right {
        width: 100rpx;
        border-left: 1px solid #eeeeee;
        display: flex;
        align-items: center;
        justify-content: center;
    }
static/img/newLogo.png