药柜内网 - bug修复

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

@@ -452,7 +452,7 @@ export default {
			})
			this.$emit('readcard')
		},
		toolReadcardMsg(msgobj, nextContentType, qrcodeData, CardInfo){
		toolReadcardMsg(msgobj, nextContentType, qrcodeData, CardInfo, mdtrt_cert_type){
			this.CardInfo = CardInfo
			this.nextContentType = nextContentType
            try{
@@ -467,6 +467,9 @@ export default {
							p.ehcCard = qrcodeData.qrcode
						}
					} else {
						if(mdtrt_cert_type == '01') {
							p.mdtrt_cert_type = mdtrt_cert_type
						}
						p.cardNum = this.cardNo
					}
					req.push(this.checkOrderAndReturn(p))
@@ -620,9 +623,15 @@ export default {
					}
				})
		},
		checkOrderAndReturn({pickUpNum="", cardNum="", ehcCard="", contentType}){
		checkOrderAndReturn({pickUpNum="", cardNum="", ehcCard="", contentType, mdtrt_cert_type}){
			return new Promise((resolve, reject)=>{
				this.shippingType = pickUpNum? 1 : 2
				if(pickUpNum || ehcCard || mdtrt_cert_type == '01') {
					this.shippingType = 1
				} else {
					this.shippingType = 2
				}
				console.log('shippingType')
				console.log(this.shippingType)
				this.oldCardNo = cardNum || ''
				let p = {
					patientName: this.userName || '',

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

@@ -332,7 +332,7 @@ export default {
									contentType: 1
								})
							} else {
								this.$refs.DrugTaking.toolReadcardMsg({}, TipsDialog.nextContentType, '', CardInfo)
								this.$refs.DrugTaking.toolReadcardMsg({}, TipsDialog.nextContentType, '', CardInfo, '01')
							}
						})
					})
@@ -347,6 +347,7 @@ export default {
				return
			}  
			if(data==12){
				// 临时卡
				socketUtils.sendReadCard('ReadTempCard')
				return
			}

mini-pro-web/src/views/machine/utils/socket.js

@@ -147,6 +147,7 @@ class SocketUtils extends Vue {
                this.checkOrderAndReturn({pickUpNum: msgobj.mess})
            }
        } else if(msgobj.type == 'CardInfo' || msgobj.type == 'medical_recharge' || msgobj.type == 'PrintComplete' || msgobj.type == 'humidity_temperature'){
            console.log('这边')
            this.$emit('onMessage', msgobj)
        } else if(msgobj.type == 'heart'){
            if(this.heartbitTimeout){