1

mini-pro-web/src/views/device/cargoLane/index.vue

@@ -11,15 +11,15 @@
                    <span>货道数</span>
                </div>
                <div class="c-t-center">
                    <div class='c-ff5e6c c-f16 mb5'>{{openCount}}</div>
                    <div class='c-ff5e6c c-f16 mb5'>{{deviceInfo.openedCargo || 0}}</div>
                    <span>启用</span>
                </div>
                <div class="c-t-center">
                    <div class='c-ff5e6c c-f16 mb5'>{{closeCount}}</div>
                    <div class='c-ff5e6c c-f16 mb5'>{{deviceInfo.closedCargo || 0}}</div>
                    <span>禁用</span>
                </div>
                <div class="c-t-center">
                    <div class='c-ff5e6c c-f16 mb5'>{{faultCount}}</div>
                    <div class='c-ff5e6c c-f16 mb5'>{{deviceInfo.faultCargo || 0}}</div>
                    <span>故障</span>
                </div>
            </div>

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

@@ -127,7 +127,8 @@ export default {
			inOut: false,
			eventName: '',
			showPrintComplete: false,
			nextOrderDetail: ''
			nextOrderDetail: '',
			oldCardNo: ''
    	}
  	},
	watch:{
@@ -136,6 +137,7 @@ export default {
				this.countDown()
			}else if(n!=3){
				this.rsType = 0
				this.oldCardNo = ''
			}
		},
		rsType(n){
@@ -157,11 +159,6 @@ export default {
			this.init(1)
		}
		window.SetPrintPage = this.SetPrintPage
		setTimeout(()=>{
			this.showPrintComplete = true
		}, 5000)
	},
  	methods: {
		onPrev(){
@@ -217,6 +214,7 @@ export default {
			this.$toast.clear()
            this.$loading('加载中..')
			this.shippingType = pickUpNum? 1 : 2
			this.oldCardNo = cardNum? cardNo : ''
            let p = {
                deviceId: this.deviceNum, //设备编号
				pickUpNum, //取药码
@@ -432,7 +430,6 @@ export default {
						}
						return
					}
					this.oldCardNo = cardNo
					this.checkOrderAndReturn({cardNum: cardNo})
				}catch(e){
					console.error(e)
@@ -783,7 +780,7 @@ export default {
			}
		},
		checkCardNo(item){
			if(this.shippingType == 2){
			if(this.oldCardNo){
				this.nextOrderDetail = item
				this.sendReadCard()
			} else {

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

@@ -35,7 +35,7 @@
                <div class="kitbox fs-12 plr10 pb5">
                    <div class="box-flex-1"> 共:{{deviceInfo.device.layer}}层</div>
                    <div class="box-flex-1 ml5">总货道:{{deviceInfo.totalCargo}}</div>
                    <div class="box-flex-1 ml5">故障:{{faultCount || 0}}</div>
                    <div class="box-flex-1 ml5">故障:{{deviceInfo.faultCargo || 0}}</div>
                    <div class="box-flex-1 ml5">关闭:{{deviceInfo.closedCargo || 0}}</div>
                </div>
            </div>