bug

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

@@ -18,7 +18,7 @@
			<div class="content" v-else>
				<div class="bold">处方药品清单：</div>
				<div class="list">
					<div class="kitbox" v-for="(item, i) in orderdetail" :key="i" :style="item.success? 'color: green' : ''">
					<div class="kitbox" v-for="(item, i) in drugList" :key="i" :style="item.success? 'color: green' : ''">
						<div class="box-flex-1 ellipsis_1" ><van-icon v-if="item.success" style="vertical-align: text-top;" name="passed"/> {{i+1}}、{{item.goodsName || item.drugName}}</div>
						<div v-if="item.orderState==1||rsType==1||rsType==3||rsType==4">x{{item.quantity || 1}} （{{item.unit}}）</div>
						<div v-else class="c-red">药柜无货</div>
@@ -44,9 +44,30 @@ export default {
	props: ['rsType', 'orderdetail', 'orderList'],
  	data() {
    	return {
			drugList: []
			// rsType: 1 //1:订单信息 2订单错误  3订单成功  4出药完成  5订单列表
    	}
  	},
	watch:{
		orderdetail:{
			handler(){
				// this.drugList
				if(this.rsType==1){
					var g = _.groupBy(this.orderdetail, 'drugCode')
					var list = []
					for(var k in g){
						var tmp = g[k]
						tmp[0].quantity = tmp.length
						list.push(tmp[0])
					}
					this.drugList = list
				} else if(this.rsType==2){
					this.drugList = this.orderdetail
				}
			},
			deep: true
		}	
	},
	created(){
		
	},

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

@@ -193,7 +193,7 @@ export default {
					if(res.status == 200){
						this.$toast.clear()
						if(res.obj && res.obj.orderList){
							var list = _.map(res.obj.orderList, v=>{
							var list = _.filter(res.obj.orderList, v=>{
								return v.status===0
							}) 
							if(list.length){
@@ -266,7 +266,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]
@@ -314,7 +314,7 @@ export default {
					return
				}
				this.clearReadCardCountDown()
				if (msgobj.mess.indexOf("异常") != -1) {
				if (msgobj.mess.indexOf("异常") != -1 || msgobj.mess.indexOf("读取信息失败") != -1) {
					this.$toast(msgobj.mess)
					return
				}
@@ -344,7 +344,7 @@ export default {
			// }
		},
		sendReadCard: function() {
			this.$loading('加载中..')
			this.$loading('读取中..')
			this.clearReadCardCountDown()
			readCardCountDown = setTimeout(()=>{
				this.$toast('读取医保卡失败')