1

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

@@ -322,12 +322,10 @@ export default {
			console.log(msg.data)
			var msgobj = JSON.parse(msg.data)
			if (msgobj.type == 'ShipInfo') {
				debugger
				var item = this.orderdetail[this.currindex]
				if (msgobj.mess == ( item.layerNo +";"+ item.wayerNo) ) {
					this.updateOrderOutStatus(item.id, 2, msgobj.mess)
						.then(res=>{
							debugger
							this.currindex++;
							if (this.orderdetail.length > this.currindex) {
								this.$loading(`正在出第${this.currindex+1}个药..`)
@@ -340,7 +338,6 @@ export default {
							}
						})
						.catch(err=>{
							debugger
							console.error(err)
							this.shipComplete("更新订单状态失败："+ (err&&err.message))
						})
@@ -579,7 +576,6 @@ export default {
		},
		updateOrderOutStatus(shipmentLogId, status, msg){
			return new Promise((resolve, reject)=>{
				debugger
				var p = {
					shipmentLogId: shipmentLogId || '',
					status: status || '',
@@ -590,7 +586,6 @@ export default {
				medicineAbinetApi
					.updateOrderOutStatus(p)
					.then(res=>{
						debugger
						if(res.status == 200){
							resolve()
							return
@@ -598,7 +593,6 @@ export default {
						reject()
					})
					.catch(err=>{
						debugger
						console.error(err)
						reject()
					})
@@ -659,7 +653,6 @@ export default {
			}
		},
		resetTimeoutInterval(){
			return
			this.clearTimeoutInterval()
			timeoutInterval = setTimeout(()=>{
				var msg = "出药超时，请联系管理员"

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

@@ -9,8 +9,8 @@
                    <div class="fs-15 ellipsis_1 c-333">{{query.drugName}}</div>
                    <div class="fs-14 c-666 kitbox">
                        <div class="box-flex-1">
                            <div>设备库存：{{query.qty}}</div>
                            <div v-if="outDetailId">申领数量：{{query.quantity}}</div>
                            <div>当前库存量：{{query.qty}}</div>
                            <div v-if="outDetailId">未放置数量：{{query.quantity}}</div>
                        </div>
                        <div class="stepper kitbox">
                            <van-stepper v-model="num" integer min="0" max="99" />
@@ -206,6 +206,10 @@ export default{
                    return
                }
            }
            if(this.query.quantity < this.allNum){
                this.$toast('当前补货数量超过了未放置数量，请重新设置')
                return
            }
            this.$dialog.confirm({
                title: '补货设置',
                message: `确定进行补货？`,