Merge remote-tracking branch 'origin/devlop' into devlop

zjj

5 天以前 9884e489c1ba7abbf412e99d4901a223ad2fbb53

Merge remote-tracking branch 'origin/devlop' into devlop

 common/request.js

@@ -15,7 +15,8 @@
    return new Promise((resolve, reject) => {

        const token = uni.getStorageSync('token');

        // const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;

        const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;

        // const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;

        const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;

        uni.request({

            url: URL,

            data: postData,


 pages.json

@@ -524,6 +524,13 @@
            "style": {

                "navigationBarTitleText": "出库确认"

            }

        },

        {

            "path" : "pages/phyz/inStock/inStock",

            "style" : 
            {

                "navigationBarTitleText" : "入库上架"

            }

        }



    ],


 pages/home/index.vue

@@ -91,8 +91,14 @@
                    <text>上架</text>

                </navigator>

            </view>

            <view class="cu-item">

                <navigator hover-class='none' url="/pages/phyz/inStock/inStock" navigateTo>

                    <view class="cuIcon-punch text-blue">

                    </view>

                    <text>入库上架</text>

                </navigator>

            </view>

        </view>





        <view class="padding flex flex-direction">

            <view class="cu-btn bg-red margin-tb-sm lg round" @click="equit">退出登录</view>


 pages/listing/disc.vue

@@ -217,8 +217,8 @@
                const newArr = this.list.map(item => {

                    return {

                        ...item,

                        anfme: item.anfme === null ? 0 : +item.anfme

                        // receiptQty: item.receiptQty === null ? 0 : +item.receiptQty

                        anfme: item.anfme === null ? 0 : + item.anfme,

                        receiptQty: item.anfme === null ? 0 : + item.anfme

                    };

                });




 pages/listing/labour.vue

@@ -89,13 +89,10 @@
            <view class="title">库位码</view>

            <input placeholder="请扫描库位码" v-model="locCode"></input>

        </view>





        <view class="cu-bar btn-group foot">

            <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>

            <button class="cu-btn bg-blue shadow-blur" @click="confirm">上架</button>

        </view>



    </view>

</template>



@@ -135,8 +132,9 @@
                    matnrCode: this.barcode

                })

                if (code === 200) {

                    const find = this.list.find(el => el.id === data.id);

                    !find && this.list.push(data)

                    // const find = this.list.find(el => el.id === data.id);

                    // !find &&
                     this.list.push(data)

                } else {

                    uni.showToast({

                        title: msg,


 pages/phyz/inStock/inStock.vue

New file
@@ -0,0 +1,287 @@
<template>
    <view class="has-foot">
        <form>
            <view class="cu-form-group margin-top">
                <view class="title">容器编号</view>
                <input placeholder="请扫容器编号" v-model="barcode"></input>
                <text class='cuIcon-search text-blue' @click="search"></text>
            </view>
            <view class="cu-form-group margin-bottom">
                <view class="title">目标站点</view>
                <uni-data-select v-model="value" :localdata="range" placement="bottom"
                    @change="selChange"></uni-data-select>
            </view>
            <view class="cu-form-group ">
                <view class="title">目标库位</view>
                <input placeholder="请选择目标库位" v-model="curCode"></input>
                <text class='cu-btn  bg-red tj' @click="open">推荐</text>
            </view>
        </form>
        <view class="cu-list det menu sm-border  padding">
            <block v-for="(item, index) in list" :key="index">
                <view class="cu-bar bg-white solid-bottom margin-top-sm">
                    <view class="action">
                        <view class="index">
                            {{index+1}}
                        </view>
                        <view class="text-blue">
                            {{`${item.maktx}`}}
                        </view>
                    </view>
                    <!--     <view class="action" >
                        <text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
                    </view> -->
                </view>
                <view class="cu-item">
                    <view class="content">
                        <text class="text-black">ASN:</text>
                    </view>
                    <view class="action">
                        <text class="text-grey ">{{item.asnCode}}</text>
                    </view>
                </view>
                <view class="cu-item">
                    <view class="content">
                        <text class="text-black">供应商批次:</text>
                    </view>
                    <view class="action">
                        <text class="text-grey">{{item.splrBatch}}</text>
                    </view>
                </view>
                <view class="cu-item">
                    <view class="content">
                        <text class="text-black">库存批次:</text>
                    </view>
                    <view class="action">
                        <text class="text-grey ">{{item.batch}}</text>
                    </view>
                </view>
                <view class="cu-item">
                    <view class="content">
                        <text class="text-black">收货数量:</text>
                    </view>
                    <view class="action">
                        <text class="text-grey ">{{item.anfme}}</text>
                    </view>
                </view>

            </block>
        </view>
        <view class="cu-bar btn-group foot">
            <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>
            <button class="cu-btn bg-blue shadow-blur" @click="confirm">上架</button>
        </view>
        <uni-popup ref="popup" class="cu-popup">
            <view class="popup-content">
                <view class="head">
                    <text>推荐</text>
                    <text class='cuIcon-close text-red close' @click="close"></text>
                </view>
                <div class="body">
                    <view class="cu-list grid col-3 no-border">
                        <view class="item" v-for="el in locs">
                            <view class="cu-btn round  sm" :class="[el===curCode?'bg-blue':'line-blue']"
                                @click="itemChange(el)">{{el.text}}</view>
                        </view>
                    </view>
                </div>
<!--                 <view class="cu-bar btn-group ">
                    <button class="cu-btn bg-blue shadow-blur" @click="popupSubmit">提交</button>
                </view> -->
            </view>
        </uni-popup>
    </view>
</template>

<script>
    import {
        request
    } from '../../../common/request.js'
    import {
        mapState,
        mapMutations,
        mapActions,
        mapGetters
    } from 'vuex';
    export default {
        data() {
            return {
                barcode: '',
                areaName: '',
                locCode: '',
                container: '',
                list: [],
                range: [],
                locs: [],
                curCode: '',
                selectSite: '',
            }
        },
        computed: {
            ...mapState('user', ['dynamicFields']),
        },
        mounted() {
            this.getRece();
            this.getLocs();
            // this.whAreaId = uni.getStorageSync('whAreaId')
			
        },
        methods: {
            async search() {
                const {
                    code,
                    data,
                    msg
                } = await request(`/pakin/info/${this.barcode}`)
                if (code === 200) {
                    this.list = data;
                    // this.range = data.locArea.locs.map(el => el.code)
                    // this.curCode = this.range[0]
                    // this.areaName = data.locArea.areaName
                } else {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                    })
                }
            },

            remove(index) {
                this.list.splice(index, 1);
            },
            clear() {
                this.list = []
                this.range = []
                this.locs = []
                this.curCode = ''
                this.areaName = ''
                this.barcode = ''
            },

            open() {
                this.$refs.popup.open()
            },

            close() {
                this.$refs.popup.close()
            },

            popupSubmit() {
                this.$refs.popup.close()
            },
            itemChange(el) {
                this.$refs.popup.close()
                this.curCode = el.text
            },
			
            selChange(e) {
                this.selectSite = e
            },

            async confirm() {
                const {
                    code,
                    data,
                    msg
                } = await request(`/pakin/task/`
                    , {
                        site: this.selectSite,
                        locCode: this.curCode,
                        barcode: this.barcode
                    }
                )
                if (code === 200) {
                    uni.showToast({
                        title: '上架成功'
                    })
                    this.clear()
                } else {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                    })
                }
            },
            async getRece() {
                const {
                    code,
                    data,
                    msg
                } = await request('/inStock/sites', {}, 'get')
                if (code === 200) {
                    this.range = data.map(item => ({
                        value: item.id,
                        text: item.name + " -- " + item.site
                    }));
                }
            },
            async getLocs() {
                const {
                    code,
                    data,
                    msg
                } = await request('/locs/list', {}, 'get')
                if (code === 200) {
					
                    this.locs = data.map(item => ({
                        value: item.id,
                        text: item.code
                    }));
                }
            },

        }
    }
</script>

<style>
    .index {
        border: 1px solid #e54d42;
        color: #e54d42;
        border-radius: 50%;
        display: block;
        width: 50rpx;
        height: 50rpx;
        line-height: 48rpx;
        text-align: center;
        margin-right: 20rpx;
        font-size: 30rpx;
    }

    .text-blue {
        color: #0081ff !important;

    }

    .item {
        position: relative;
        display: flex;
        min-height: 80upx;
        align-items: center;
    }

    .uni-file-picker {
        width: 100%;
        margin-bottom: 10px;
    }

    .uni-select__selector {
        z-index: 999;
    }

    .tj {
        height: auto;
        padding: 6px 8px;
        display: inline-block;
        border-radius: 6px;
    }

    .item {
        display: flex;
        justify-content: center;
    }

    .item .cu-btn {
        font-size: 26upx;
    }
</style>

 pages/rece/other.vue

@@ -60,9 +60,6 @@
                            <text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>

                        </view>

                    </view>







                    <view class="cu-item">

                        <view class="content">

                            <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>

@@ -71,7 +68,6 @@
                            <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>

                        </view>

                    </view>



                    <view class="cu-item">

                        <view class="content">

                            <text class="text-black">采购单位:<text class="text-grey ">{{item.purUnit}}</text></text>

@@ -80,7 +76,6 @@
                            <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>

                        </view>

                    </view>



                    <view class="cu-item">

                        <view class="content">

                            <text class="black">计划收货数量:<text class="text-grey ">{{item.anfme}}</text></text>

@@ -90,9 +85,7 @@
                            <text class="black">已收货数量:<text class="text-grey ">{{item.qty}}</text></text>

                        </view>

                    </view>



                    <view class="cu-item">



                        <view class="content" v-if="!isconfirm">

                            <view class="cu-form-group padding-lr-0">

                                <view class="title text-blue"><text

@@ -104,7 +97,6 @@
                            <text class="text-black">收货数量:<text class="text-grey ">{{item.receiptQty}}</text></text>

                        </view>

                    </view>



                    <view class="cu-item">

                        <view class="content" v-if="!isconfirm">

                            <view class="cu-form-group padding-lr-0">

@@ -133,7 +125,6 @@
                            <text class="text-black">生产日期:<text class="text-grey ">{{item.prodTime}}</text></text>

                        </view>

                    </view>



                    <view class="cu-item grid  col-1" v-if="!isconfirm">

                        <view v-for="el in dynamicFields" :key="el.id">

                            <view class="cu-form-group padding-lr-0">

@@ -142,16 +133,12 @@
                            </view>

                        </view>

                    </view>



                    <view class="cu-item grid  col-2" v-if="isconfirm">

                        <view class="item" v-for="el in dynamicFields" :key="el.id">

                            <text class="text-black">{{el.fieldsAlise}}:

                                <text class="text-grey ">{{item[el.fields]}}</text></text>

                        </view>



                    </view>





                </view>

            </block>

        </view>

@@ -165,7 +152,6 @@
            <uni-data-select v-model="whAreaId" :localdata="range" placement="top"

                @change="selChange"></uni-data-select>

        </view>





        <view class="cu-bar btn-group foot" v-show="!isconfirm">

            <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>

@@ -263,7 +249,9 @@
            prev() {

                this.isconfirm = false

            },

            selChange(val) {

            selChange(val) {
                console.log('-------->')
                console.log(val)

                uni.setStorageSync('whAreaId', val)

            },

            async complete(id) {

@@ -322,7 +310,6 @@
                            icon: "none",

                        })

                    }



                }

            },

            async getRece() {

@@ -334,7 +321,7 @@
                if (code === 200) {

                    this.range = data.map(item => ({

                        value: item.id,

                        text: item.name

                        text: item.warehouseId$ + "-- " + item.name

                    }));

                }

            },