#
whycq
2024-03-18 5b3408993c2f3ddf3e958b92c71decfd35fa5187
#
1 文件已重命名
4个文件已修改
93 ■■■■ 已修改文件
pages.json 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/inOutManage.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/menuHome.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVPakin.vue 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/css/wms.css/wms.css 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -63,7 +63,7 @@
        {
            "path": "pages/tzsk/AGV/AGVPakin",
            "style": {
                "navigationBarTitleText": "AGV组托"
                "navigationBarTitleText": "空板入库"
            }
        },
        {
@@ -356,10 +356,10 @@
            }
        },
        {
            "path" : "pages/home/agvManage",
            "path" : "pages/home/inOutManage",
            "style" : 
            {
                "navigationBarTitleText" : "AGV管理",
                "navigationBarTitleText" : "入出库管理",
                "enablePullDownRefresh" : false
            }
        },
pages/home/inOutManage.vue
File was renamed from pages/home/agvManage.vue
@@ -26,8 +26,8 @@
                project: 'tzsk',
                elements2: [
                    {
                        title: 'AGV组托',
                        name: 'AGVPakin',
                        title: '空板入库',
                        name: 'emptyIn',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/tzsk/AGV/AGVPakin`
pages/home/menuHome.vue
@@ -26,11 +26,11 @@
                project: 'tzsk',
                elements2: [
                    {
                        title: 'AGV管理',
                        name: 'AGVManage',
                        title: '入出库管理',
                        name: 'inOutManage',
                        color: 'cyan',
                        // cuIcon: 'pullup',
                        url: `/home/agvManage`
                        url: `/home/inOutManage`
                    },
                    // {
                    //     title: '测试',
pages/tzsk/AGV/AGVPakin.vue
@@ -2,64 +2,23 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">订单号:</view>
                <view class="code-decs">站点码:</view>
                <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="barcodeInput()">
            </view>
            <view class="item">
                <view class="code-decs">物料码:</view>
                <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>
                    <uni-icons type="right" color="#c1c1c1"></uni-icons>
                </view>
            </view>
        </view>
        <view class="mat-list-title">
            商品列表
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
                    <view class="list-left-item">
                        <view class="desc">No:</view>
                        <view class="left-item">{{i + 1}}</view>
                    </view>
                    <!-- <view class="list-left-item">
                        <view class="desc">箱码:</view>
                        <view class="desc">站点号:</view>
                        <view class="left-item">
                            <input type="text" v-model="item.containerCode">
                            <uni-tag :text="item.containerCode" type="primary"></uni-tag>
                        </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">销售单号:</view>
                        <view class="left-item">
                            <input type="text" v-model="item.csocode">
                            <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
                            <!-- <uni-tag :text="item.matnr" type="primary"></uni-tag> -->
                            ---------------
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">订单行号:</view>
                        <view class="left-item">
                            <input type="text" v-model="item.isoseq">
                            <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">料号:</view>
                        <view class="left-item">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">品名:</view>
                        <view class="desc">站点状态:</view>
                        <view class="left-item">{{item.maktx}}</view>
                    </view>
                    <view class="list-left-item">
@@ -83,16 +42,12 @@
                        <view class="left-item">{{item.anfme}}</view>
                    </view>
                </view>
                <view class="list-right">
                    <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
                    <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
                </view>
            </view>
        </scroll-view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" @click="reset('warn')">重置</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">组托</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">空板入库</button>
        </view>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
@@ -143,7 +98,7 @@
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认组托 -->
        <!-- 确认空板入库 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
@@ -172,7 +127,7 @@
                token: '',
                barcode: '',
                orderNo: '',
                dataList: [],
                dataList: [{}],
                count: 0,
                rowNum: '',
                matnr: '',
@@ -484,7 +439,7 @@
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在组托!'
                this.content = '是否现在空板入库!'
                this.$refs.combConfirm.open()
            },
            combClose() {
@@ -510,7 +465,7 @@
                // }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                        this.messageText = that.dataList[i].matnr + '组托数量不能为0'
                        this.messageText = that.dataList[i].matnr + '空板入库数量不能为0'
                        this.messageToggle('error')
                        return;
                    }
@@ -537,7 +492,7 @@
                            that.findOrder()
                            // that.resst();
                            that.barcode = ''
                            that.messageText = "组托成功"
                            that.messageText = "空板入库成功"
                            that.messageToggle('success')
                            const innerAudioContext = uni.createInnerAudioContext();
                            innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -602,12 +557,12 @@
    }
    .list:first-child {
        margin-top: 340rpx;
        margin-top: 120rpx;
    }
    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        min-height: 70rpx;
        background-color: #FFF;
        z-index: 10;
    }
static/css/wms.css/wms.css
@@ -3,6 +3,7 @@
    min-height: 80rpx;
    background-color: #FFF;
    margin: 20rpx 20rpx;
    padding: 20rpx;
    border-radius: 20rpx;
    box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
@@ -15,25 +16,22 @@
.list-left {
    display: flex;
    flex-direction: column;
    margin-left: 20rpx;
    width: 80vw;
}
.list-left-item {
    min-height: 40rpx;
    line-height: 40rpx;
    display: flex;
    padding: 2rpx;
}
.desc {
    min-height: 40rpx;
    display: flex;
    align-items: center;
    width: 25%;
}
.left-item {
    display: flex;
    flex-wrap: wrap;
    width: 75%;
    margin: 1px 1px 1px 1px;
    /* color: #409EFF; */
}
.left-item input {