lincl 3 years ago
parent
commit
1a7d67812a

+ 5 - 1
mini-pro-web/src/components/ProductItem/index.vue

@ -1,5 +1,5 @@
<template>
    <div @click="toSet" class='components-product-item' :class="data.cargoCapacity==data.qty?'pitem-full':''">
    <div @click="toSet" class='components-product-item' :class="{'pitem-full':data.cargoCapacity==data.qty, 'pitem-close': data.cargoState!=1}">
        <div :style="'height: '+ (rate) +'%'" class="pitem-bg"></div>
        <div class="pitem-inner" >
            <div class="kitbox " >
@ -97,5 +97,9 @@ export default{
        bottom: 2px;
        font-size: 12px;
    }
    &.pitem-close{
        background-color: #ff9526;
        color: #fff;
    }
}
</style>

+ 19 - 2
mini-pro-web/src/views/replenishment/device/detail.vue

@ -1,7 +1,11 @@
<template>
    <div class='replenishment-device-detail'>
        <div class="kitbox plr15 ptb10">
            <div class="box-flex-1 box-v-middle fs-14">从上往下数</div>
            <div class="box-flex-1 box-v-middle fs-14">
                <span>从上往下数</span>
                <div class="color-block"></div>
                <span class="ml5 fs-12">已关闭的通道</span>
            </div>
            <div><van-button @click="gotoUrl('/replenishment/start/deviceDetail', {deviceId: deviceId})" type="info" size="small">点击设置商品</van-button></div>
        </div>
@ -9,7 +13,7 @@
            <div v-for="(item, i) in list" :key="i" class="item plr15 bt-e1e1e1 bb-e1e1e1">
                <div class="pt10">第1层</div>
                <div class="item-list ptb10">
                    <div v-for="(data, k) in item.list" :key="k" :class="data.cargoCapacity==data.qty?'pitem-full':''" class="pitem">
                    <div v-for="(data, k) in item.list" :key="k" :class="{'pitem-full':data.cargoCapacity==data.qty, 'pitem-close': data.cargoState!=1}" class="pitem">
                        <div :style="'height: '+ (formatRate(data)) +'%'" class="pitem-bg"></div>
                        <div class="pitem-inner">
                            <div class="kitbox ">
@ -79,6 +83,15 @@ export default{
</script>
<style lang='scss' scoped>
.replenishment-device-detail{
    .color-block{
        background: #ff9526;
        width: 10px;
        height: 10px;
        display: inline-block;
        margin-left: 20px;
        border-radius: 2px;
        
    }
    .list{
        .item{
            margin-bottom: 10px;
@ -128,6 +141,10 @@ export default{
                             background: #ff5e6c;
                        }
                    }
                    &.pitem-close{
                        background-color: #ff9526;
                        color: #fff;
                    }
                }
            }
        }

+ 27 - 3
mini-pro-web/src/views/replenishment/start/deviceDetail.vue

@ -37,11 +37,16 @@
                    <div class="box-flex-1"> 共:{{deviceInfo.layer}}层</div>
                    <div class="box-flex-1 ml5">总货道:{{deviceInfo.aisles}}</div>
                    <div class="box-flex-1 ml5">故障:0</div>
                    <div class="box-flex-1 ml5">关闭:0</div>
                    <div class="box-flex-1 ml5">关闭:{{closeCount}}</div>
                </div>
            </div>
        </van-sticky>
        <div class="fs-14 pl15 ptb10 bgc-fff">从上往下数</div>
        <div class="fs-14 pl15 ptb10 bgc-fff">
            <span>从上往下数</span>
            <div class="color-block"></div>
            <span class="ml5 fs-12">已关闭的通道</span>
        </div>
        <div class="kitbox">
            <div class="left-list">
                <van-sidebar v-model="activeKey">
@ -70,7 +75,9 @@ export default{
            deviceId: this.$route.query.deviceId,
            list: [],
            activeKey: 0,
            curItem: []
            curItem: [],
            openCount: 0,
            closeCount: 0
        }
    },
    watch:{
@ -98,13 +105,19 @@ export default{
                    console.log('findMediicinecabinetInventoryByDeviceId', res)
                    this.$toast.clear()
                    if(res.detailModelList && res.detailModelList.length){
                        var openCount = 0, closeCount = 0
                        var list = _.map(res.detailModelList, v=>{
                            var key = _.keys(v)[0]
                            v[key].forEach(m => {
                                m.cargoState==1? openCount++ : closeCount++
                            });
                            return {
                                index: key,
                                list: v[key],
                            }
                        })
                        this.openCount = openCount
                        this.closeCount = closeCount
                        list = _.sortBy(list, 'index')
                        this.list = list
                        this.curItem = this.list[0]
@ -142,6 +155,8 @@ export default{
    .list{
        display: flex;
        flex-wrap: wrap;
        height: calc(100vh - 153px);
        overflow-y: auto;
        // min-height: calc(100vh - 130px);
        .item{
            margin-left: 5px;
@ -154,5 +169,14 @@ export default{
    .left-list{
        height: calc(100vh - 153px);
    }
    .color-block{
        background: #ff9526;
        width: 10px;
        height: 10px;
        display: inline-block;
        margin-left: 20px;
        border-radius: 2px;
        
    }
}
</style>

+ 1 - 1
mini-pro-web/src/views/replenishment/stockUp/deviceList.vue

@ -22,7 +22,7 @@
                        </div>
                        <div class="lh20 ptb10 kitbox">
                            <div class="box-flex-1">
                                <div>待补商品数量:{{item.unuserdCapacity}}</div>
                                <div>待补商品数量:{{item.daibuQty}}</div>
                                <div>未设商品空货道:{{item.unusedAisles}}</div>
                                <div>设备所属:{{item.community}}</div>
                                <div>设备编号:{{item.equNum}}</div>