1

mini-pro-web/src/views/machine/components/Result.vue

@@ -9,7 +9,7 @@
			<div class="order-list" v-if="rsType==5">
				<div>
					<div class="order-list-inner">
						<div @click="$emit('showOrderDetail', item)" v-for="(item, i) in orderList" :key="i" class="item">
						<div @tap="$emit('showOrderDetail', item)" v-for="(item, i) in orderList" :key="i" class="item">
							处方编号：{{item.num}}
						</div>
					</div>

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

@@ -26,7 +26,6 @@
						</van-swipe-item>
					</template>
					<van-swipe-item v-else>
						<!-- <img class="swipe-item-img" src="./img/banner01.png"> -->
						<video class="swipe-item-video" autoplay loop controls muted src="./img/default.mp4"></video>
					</van-swipe-item>
				</van-swipe>
@@ -188,17 +187,22 @@ export default {
                    console.log('checkOrderAndReturnOrderList', res)
					if(res.status == 200){
						this.$toast.clear()
						if(res.obj && res.obj.orderList && res.obj.orderList.length){
							if(res.obj.orderList.length == 1){
								this.showOrderDetail(res.obj.orderList[0])
							} else {
								this.orderList = res.obj.orderList || []
								this.rsType = 5
								this.step = 3
						if(res.obj && res.obj.orderList){
							var list = _.map(res.obj.orderList, v=>{
								return v.status===0
							}) 
							if(list.length){
								if(list == 1){
									this.showOrderDetail(res.obj.orderList[0])
								} else {
									this.orderList = res.obj.orderList || []
									this.rsType = 5
									this.step = 3
								}
								return
							}
						} else {
							this.$toast('查不到订单信息')
						}
						this.$toast('查不到订单信息')
					} else {
						this.$toast(res.message || '获取订单失败')
					}
@@ -257,7 +261,7 @@ export default {
			console.log("连接错误")
		},
		getMessage: function(msg) {
			console.log(msg.data)
			// console.log(msg.data)
			var msgobj = JSON.parse(msg.data)
			if (msgobj.type == 'ShipInfo') {
				var item = this.orderdetail[this.currindex]
@@ -472,6 +476,7 @@ export default {
		},
		shipComplete(msg){
			this.$toast.clear()
			this.orderList.splice(this.orderList.indexOf(this.orderInfo), 1)
			if(msg){
				this.$dialog.alert({
					title: '',

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

@@ -89,12 +89,13 @@ export default{
                    this.setStockShow = false
                    this.$toast.clear()
                    this.$emitRefreshPage('replenishmentStartDeviceDetail')
                    this.$router.replace({
                        path: '/replenishment/start/productDetail',
                        query: {
                            id: this.trackId
                        }
                    })
                    history.back()
                    // this.$router.replace({
                    //     path: '/replenishment/start/productDetail',
                    //     query: {
                    //         id: this.trackId
                    //     }
                    // })
                })
                .catch(err=>{
                    console.error(err)