#
whycq
2023-07-11 7cd5d552d48389b70328ab2804fcb5ef3f023ec9
#
4个文件已修改
81 ■■■■ 已修改文件
pages/AGV/AGVPakin.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/AGVPakinBing.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/AGVPakinOn.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/AGVStart.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/AGVPakin.vue
@@ -27,7 +27,7 @@
                        <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">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
@@ -46,12 +46,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量:</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -76,20 +76,20 @@
                    <!-- 标题 -->
                    <view class="title">修改</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-left">料号:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="matnr" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <!-- <view class="popup-item">
                    <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    </view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -207,6 +207,13 @@
            // 搜索物料
            findMat() {
                let that = this
                // 判断物料长度是否为1
                if (that.dataList.length >= 1) {
                    this.messageText = "只能添加一种物料"
                    this.messageToggle('warn')
                    that.matnr = ''
                    return
                }
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
@@ -451,6 +458,9 @@
<style>
    @import url('../../static/css/wms.css/wms.css');
    .list:first-child {
        margin-top: 360rpx;
    }
    .code {
        width: 100%;
        position: fixed;
pages/AGV/AGVPakinBing.vue
@@ -27,7 +27,7 @@
                        <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">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
@@ -46,12 +46,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量:</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -66,7 +66,7 @@
        <!-- 底部操作按钮 -->
        <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>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
@@ -76,20 +76,20 @@
                    <!-- 标题 -->
                    <view class="title">修改</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-left">料号:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="matnr" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <!-- <view class="popup-item">
                    <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    </view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -117,7 +117,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"
@@ -363,7 +363,7 @@
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在上架!'
                this.content = '是否现在绑定!'
                this.$refs.combConfirm.open()
            },
            combClose() {
@@ -391,7 +391,7 @@
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            that.messageText = "上架成功"
                            that.messageText = "绑定成功"
                            that.messageToggle('success')
                            // const innerAudioContext = uni.createInnerAudioContext();
                            // innerAudioContext.src = '/static/music/pakinOk.mp3';
pages/AGV/AGVPakinOn.vue
@@ -147,7 +147,7 @@
                token: '',
                barcode: '',
                stationCode: '',
                dataList: [{}],
                dataList: [],
                count: 0,
                rowNum: '',
                matnr: '',
@@ -217,6 +217,12 @@
            // 搜索物料
            findMat() {
                let that = this
                if (that.dataList.length >= 1) {
                    this.messageText = "只能添加一种物料"
                    this.messageToggle('warn')
                    that.matnr = ''
                    return
                }
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
@@ -402,7 +408,7 @@
                    url: that.baseUrl + '/agvMobile/comb/auth',
                    data: JSON.stringify({
                        barcode: that.barcode,
                        stationCode: that.stationCode,
                        locno: that.stationCode,
                        combMats: that.dataList
                    }),
                    method: 'POST',
pages/AGV/AGVStart.vue
@@ -26,7 +26,7 @@
            <view style="width: 200rpx;"><button size="mini" type="primary" @click="getChecked">提取</button></view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
            <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
                <view class="aside">
                    <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
                </view>
@@ -135,6 +135,7 @@
                removeNum: 0,
                floorList: [1,3],
                floor: "",
                devNo: []
            }
        },
        onLoad() {
@@ -170,9 +171,14 @@
                    },
                    method: 'POST',
                    success(res) {
                        console.log(res);
                        res = res.data
                        for(var i = 0; i < res.data.length; i++) {
                            if (res.data[i].locSts === 'F') {
                                res.data[i]["color"] = "red"
                            }
                        }
                        that.dataList = res.data
                        console.log(that.dataList);
                    }
                });
            },
@@ -384,6 +390,9 @@
            comb() {
                uni.vibrateShort();
                let that = this;
                for (var i = 0; i < that.dataList.length; i++) {
                    that.devNo.push(that.dataList[i].devNo)
                }
                uni.request({
                    url: that.baseUrl + '/agvMobile/pakin/auth',
                    data: JSON.stringify({
@@ -450,6 +459,14 @@
<style>
    @import url('../../static/css/wms.css/wms.css');
    .bg-red {
        background-color: #e54d42;
        color: #ffffff;
    }
    .bg-white {
        background-color: #ffffff;
        color: #666666;
    }
    .list:first-child {
        margin-top: 260rpx;
    }