bug

mini-pro-web/src/components/layout/NavLayout.vue

@@ -9,7 +9,7 @@
			@click-left="onClickLeft"
			>
		</van-nav-bar>
		<div class="main-container" :class="{pt46:hasTop, mainNobotHasTop: hasTop, 'has-bot': hasBot}">
		<div class="main-container" :class="{pt46:hasTop, mainNobotHasTop: hasTop, 'has-bot': hasBot, 'iphone-x': isIphonex}">
			<app-main/>
		</div>
		<AppBotNav v-if="hasBot"></AppBotNav>
@@ -18,7 +18,7 @@
<script>
import { AppMain, AppBotNav } from "./components";
import iphoneUtils from  "@/utils/iphoneUtils"
export default {
	name: "NavLayout",
	components: {
@@ -45,6 +45,10 @@ export default {
	computed: {
		title() {
			return this.$store.state.app.pageTitle
		},
		isIphonex(){
			// return true
			return iphoneUtils.isIphonex()
		}
	},
	methods: {

mini-pro-web/src/views/machine/index.vue

@@ -339,6 +339,10 @@ export default {
			console.log(msg.data)
			var msgobj = JSON.parse(msg.data)
			if (msgobj.type == 'ShipInfo') {
				if(!this.inOut){
					//有可能前端15秒已超时  但是后端还没超时  等了1分钟才返回数据 
					return
				}
				var item = this.orderdetail[this.currindex]
				if (msgobj.mess == ( item.layerNo +";"+ item.wayerNo) ) {
					this.updateOrderOutStatus(item.id, 2, msgobj.mess)
@@ -707,9 +711,7 @@ export default {
			}, 1000)
		},
		clearTimeoutInterval(){
			if(timeoutInterval){
				clearTimeout(timeoutInterval)
			}
			clearTimeout(timeoutInterval)
		},
		clearReadCardCountDown(){
			if(readCardCountDown){

mini-pro-web/src/views/replenishment/start/components/SetStockDialog.vue

@@ -7,7 +7,7 @@
                    <span>{{bussiness==1? '修改容量' : bussiness==2? '矫正库存' : bussiness==4||bussiness==5? '设置库存' : bussiness==6? '新增' : ''}}</span>
                </div>
                <template v-if="bussiness==1||bussiness==4||bussiness==5||bussiness==6">
                    <div class="tc pt30 pb20"><van-stepper v-model="stock" min="1" max="99" /></div>
                    <div class="tc pt30 pb20"><van-stepper v-model="stock" min="1" max="99" button-size="36px" input-width="60px"/></div>
                </template>
                <div class="tc" v-else>
                    <div class="pt10">

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

@@ -1,7 +1,7 @@
<template>
    <div class='replenishment-start-device-detail fs-14' :class="{'is-view': isView}">
        <van-sticky v-if="!isView" :offset-top="offsetTop">
            <div class="bgc-17b3ec c-fff">
        <!-- <van-sticky v-if="!isView" :offset-top="offsetTop"> -->
            <div v-if="!isView" class="bgc-17b3ec c-fff">
                <div class="pt10 plr15 ellipsis_1">当前货柜：{{deviceInfo.device.equName}}</div>
                <van-row>
                    <van-col span="6">
@@ -39,7 +39,7 @@
                    <div class="box-flex-1 ml5">关闭:{{deviceInfo.closedCargo || 0}}</div>
                </div>
            </div>
        </van-sticky>
        <!-- </van-sticky> -->
        <div class="fs-14 pl15 ptb10 bgc-fff kitbox">
            <div class="box-flex-1 lh24">
                <span>从上往下数</span>
@@ -56,7 +56,8 @@
                <van-button @click="gotoUrl('/replenishment/start/deviceDetail', {deviceId: deviceId})" type="primary" color="#17b3ec" size="mini">点击进行入库</van-button>
            </div>
        </div>
        <div class="kitbox">
        <div class=" list-panel">
            <div class="kitbox">
            <div class="left-list">
                <van-sidebar v-model="activeKey">
                    <van-sidebar-item v-for="(item, i) in list" :key="i" :title="i==0? '药品库' : (i)+'层'"  />
@@ -85,15 +86,16 @@
                    </template>
                </template>
            </div>
            </div>
        </div>
        
        <div class="bot-banner">
            <div class="kitbox">
                <div v-if="!isManage" class="box-flex-1 plr5"><van-button @click="changeManage" block plain color="#17b3ec" size="small" type="primary" round>货道管理</van-button></div>
                <div v-if="!isManage" class="box-flex-1 plr5"><van-button @click="changeManage" block plain color="#17b3ec"  type="primary" round>货道管理</van-button></div>
                <template v-else>
                    <div class="box-flex-1 plr5"><van-button @click="openAndCloseCargo" block plain color="#17b3ec" size="small" type="primary" round>关闭/开启货道</van-button></div>
                    <div class="box-flex-1 plr5"><van-button @click="mergeAndSplitCargo" block plain color="#17b3ec" size="small" type="primary" round>合并/拆分货道</van-button></div>
                    <div class="plr5"><van-button @click="changeManage" class="w50" block plain color="red" size="small" round type="primary" >取消</van-button></div>
                    <div class="box-flex-1 plr5"><van-button @click="openAndCloseCargo" block plain color="#17b3ec"  type="primary" round>关闭/开启货道</van-button></div>
                    <div class="box-flex-1 plr5"><van-button @click="mergeAndSplitCargo" block plain color="#17b3ec"  type="primary" round>合并/拆分货道</van-button></div>
                    <div class="plr5"><van-button @click="changeManage" class="w50" block plain color="red"  round type="primary" >取消</van-button></div>
                </template>
            </div>
        </div>
@@ -594,8 +596,17 @@ export default{
</script>
<style lang='scss' scoped>
.replenishment-start-device-detail{
    .van-sidebar{
        // width: 56px;
    display: -webkit-box;
    -webkit-box-orient: vertical;
    height: 100vh;
    .list-panel{
        -webkit-box-flex: 1;
        position: relative;
        >.kitbox{
            height: 100%;
            width: 100%;
            position: absolute;
        }
    }
    .list{
        display: flex;
@@ -618,7 +629,7 @@ export default{
        }
    }
    .left-list, .list{
        height: calc(100vh - 210px);
        height: 100%;
        overflow-y: auto;
    }
    .color-block{
@@ -634,9 +645,6 @@ export default{
    }
    &.is-view{
        .list, .left-list{
            height: calc(100vh - 44px);
        }
        .bot-banner{
            display: none;
        }
@@ -660,7 +668,7 @@ export default{
    .bot-banner{
        padding: 10px 5px;
        position: absolute;
        position: relative;
        bottom: 0;
        width: 100%;
        left: 0;
@@ -668,6 +676,11 @@ export default{
        z-index: 3;
        >div{
            -webkit-box-flex: 1;
            .van-button{
                padding: 0;
                font-size: 13px;
                height: 36px;
            }
        }
    }
}
@@ -676,12 +689,17 @@ export default{
<style lang="scss">
.mainNobotHasTop{
    .replenishment-start-device-detail{
        .list, .left-list{
            height: calc(100vh - 258px);
        }
        &.is-view{
            .list, .left-list{
                height: calc(100vh - 91px);
        height: calc(100vh - 46px);
    }
}
@supports(bottom: env(safe-area-inset-bottom)){
    .replenishment-start-device-detail{
        .bot-banner{
            &::after{
                content: "";
                height: env(safe-area-inset-bottom);
                width: 100%;
                display: block;
            }
        }
    }

mini-pro-web/src/views/replenishment/start/productDetail.vue

@@ -19,10 +19,10 @@
            </div>
        </div>
        <div class="bot-banner  ptb10">
            <div><van-button type="info" @click="bussiness=2;setStockShow=true" round block size="small">矫正库存</van-button></div>
            <div><van-button type="info" @click="bussiness=2;setStockShow=true" round block >矫正库存</van-button></div>
            <div class="kitbox pt10">
                <div class="box-flex-1 pr10"><van-button @click="bussiness=1;setStockShow=true" type="info" round block plain size="small">修改容量</van-button></div>
                <div class="box-flex-1 pl10"><van-button @click="checkRemoveDrug()" type="info" round block plain class="red" size="small">下架药品</van-button></div>
                <div class="box-flex-1 pr10"><van-button @click="bussiness=1;setStockShow=true" type="info" round block plain >修改容量</van-button></div>
                <div class="box-flex-1 pl10"><van-button @click="checkRemoveDrug()" type="info" round block plain class="red" >下架药品</van-button></div>
            </div>
        </div>
        <!-- 修改容量 -->
@@ -230,6 +230,21 @@ export default{
                border-color: #ff5e6c;
            }
        }
        .van-button{
            padding: 0;
            font-size: 13px;
            height: 36px;
        }
    }
}
</style>
<style lang='scss'>
@supports(bottom: env(safe-area-inset-bottom)){
    .replenishment-start-product-detail{
        .bot-banner{
            bottom: env(safe-area-inset-bottom) !important;
        }
    }
}
</style>

mini-pro-web/src/views/replenishment/start/quick.vue

@@ -30,32 +30,35 @@
                <span class="ml5 fs-12">故障</span>
            </div>
        </div>
        <div class="kitbox">
            <div class="left-list">
                <van-sidebar v-model="activeKey">
                    <van-sidebar-item v-for="(item, i) in list" :key="i" :title="(i+1)+'层'"  />
                </van-sidebar>
            </div>
            <div class="list box-flex-1 bgc-fff">
                <template v-if="curItem">
                    <template v-for="(item, k) in curItem.list">
                        <div class="item" v-if="item.state!=20" :key="k">
                            <ProductItem v-longpress="()=>{gotoDetail(item)}" bussuness="quick" @onChange="onChange($event, item)" :data="item" :index="k"/>
                        </div>
                    </template>
                    <!-- <div class="item" v-for="(item, k) in curItem.list" :key="k">
                        <ProductItem v-if="item.state!=20" bussuness="quick" @onChange="onChange($event, item)" :data="item" :index="k"/>
                    </div> -->
                </template>
        <div class="list-panel">
            <div class="kitbox ">
                <div class="left-list">
                    <van-sidebar v-model="activeKey">
                        <van-sidebar-item v-for="(item, i) in list" :key="i" :title="(i+1)+'层'"  />
                    </van-sidebar>
                </div>
                <div class="list box-flex-1 bgc-fff">
                    <template v-if="curItem">
                        <template v-for="(item, k) in curItem.list">
                            <div class="item" v-if="item.state!=20" :key="k">
                                <ProductItem v-longpress="()=>{gotoDetail(item)}" bussuness="quick" @onChange="onChange($event, item)" :data="item" :index="k"/>
                            </div>
                        </template>
                        <!-- <div class="item" v-for="(item, k) in curItem.list" :key="k">
                            <ProductItem v-if="item.state!=20" bussuness="quick" @onChange="onChange($event, item)" :data="item" :index="k"/>
                        </div> -->
                    </template>
                </div>
            </div>
        </div>
        <div class="bot-banner">
            <div class="kitbox">
                <div class="box-flex-1 plr5"><van-button @click="openAndCloseCargo" block plain color="#17b3ec" size="small" type="primary" round>关闭/开启货道</van-button></div>
                <div class="box-flex-1 plr5"><van-button @click="mergeAndSplitCargo" block plain color="#17b3ec" size="small" type="primary" round>合并/拆分货道</van-button></div>
                <div class="box-flex-1 plr5"><van-button @click="sumit" block color="#17b3ec" size="small" type="primary" round>完成补货({{allNum}})</van-button></div>
                <div class="box-flex-1 plr5"><van-button @click="openAndCloseCargo" block plain color="#17b3ec"  type="primary" round>关闭/开启货道</van-button></div>
                <div class="box-flex-1 plr5"><van-button @click="mergeAndSplitCargo" block plain color="#17b3ec"  type="primary" round>合并/拆分货道</van-button></div>
                <div class="box-flex-1 plr5"><van-button @click="sumit" block color="#17b3ec"  type="primary"  round>完成补货({{allNum}})</van-button></div>
            </div>
        </div>
    </div>
@@ -482,6 +485,18 @@ export default{
</script>
<style lang='scss' scoped>
.replenishment-start-quick{
    display: -webkit-box;
    -webkit-box-orient: vertical;
    height: 100vh;
    .list-panel{
        -webkit-box-flex: 1;
        position: relative;
        >.kitbox{
            height: 100%;
            width: 100%;
            position: absolute;
        }
    }
    .drug-item{
        img{
            width: 60px;
@@ -517,7 +532,7 @@ export default{
        
    }
    .left-list, .list{
        height: calc(100vh - 178px);
        height: 100%;
        overflow-y: auto;
    }
    .color-block{
@@ -533,7 +548,7 @@ export default{
    }
    .bot-banner{
        padding: 10px 5px;
        position: absolute;
        position: relative;
        bottom: 0;
        width: 100%;
        left: 0;
@@ -541,6 +556,11 @@ export default{
        z-index: 3;
        >div{
            -webkit-box-flex: 1;
            .van-button{
                padding: 0;
                font-size: 13px;
                height: 36px;
            }
        }
    }
}
@@ -549,8 +569,18 @@ export default{
<style lang="scss">
.mainNobotHasTop{
    .replenishment-start-quick{
        .list, .left-list{
            height: calc(100vh - 225px);
        height: calc(100vh - 46px);
    }
}
@supports(bottom: env(safe-area-inset-bottom)){
    .replenishment-start-quick{
        .bot-banner{
            &::after{
                content: "";
                height: env(safe-area-inset-bottom);
                width: 100%;
                display: block;
            }
        }
    }
}