临时卡

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

@@ -1,5 +1,5 @@
<template>
	<div class="machine-drug-taking c-333 fs-13" :class="'machine-drug-taking-'+ contentType">
	<div class="machine-drug-taking c-333 fs-13" :class="classList">
		<div v-show="contentType==4||contentType==13||contentType==5" class="pt42 order-panel">
			<div  class="panel " :class="{'panel-no-data': (contentType==4)&&(!showSettleInfoList||!showSettleInfoList.length)}">
				<div class="banner">
@@ -35,6 +35,7 @@
									<div class="plr10">
										<div class="title ">
											<div class="box-flex-1"><van-checkbox icon-size="3.46667vw" :name="item">就诊日期：{{item.prescriptionDate? $moment(item.prescriptionDate).format('YYYY-MM-DD') : item.date}}</van-checkbox></div>
											<!-- <div class="box-flex-1"><van-checkbox icon-size="3.46667vw" :name="item">就诊日期：{{item.prescriptionDate? $moment(item.prescriptionDate).format('YYYY-MM-DD') : item.date}}</van-checkbox></div> -->
											<div v-if="contentType==4||isPayed==0" class="c-ff2626 ">{{item.totalAmount}}元</div>
											<div v-else class="c-4ecc8f ">已缴费</div>
											<!-- <div v-else class="c-4ecc8f ">未缴费</div> -->
@@ -165,6 +166,14 @@ export default {
		},
		title(){
			return this.num
		},
		classList(){
			var { isPayed, contentType } = this
			var list = ['machine-drug-taking-'+ contentType]
			if(contentType==4 || isPayed!=1){
				list.push('wait-pay-list')
			}
			return list.join(" ")
		}
	},
	created(){
@@ -345,11 +354,11 @@ export default {
			this.jiesuanLoaing = true
			var curSettleList
			if(item == 1){
				if(!this.checkedList.length){
					this.jiesuanLoaing = false
					return
				}
				curSettleList = this.checkedList
				// if(!this.checkedList.length){
				// 	this.jiesuanLoaing = false
				// 	return
				// }
				curSettleList = this.waitPayList
			} else {
				curSettleList = [item]
			}

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

@@ -86,8 +86,8 @@
						<div><img class="icon" src="../img/i-shibao.png" alt=""></div>
						<div class="lh30 pt10 pb40">结算失败！</div>
						<div class="bottom-button ">
							<div class=""><van-button class="c-999" color="#fff" block type="primary">返回</van-button></div>
							<div><van-button color="#22a9fa" block type="primary">重试</van-button></div>
							<div class=""><van-button @click="onClose" class="c-999" color="#fff" block type="primary">返回</van-button></div>
							<div><van-button @click="onClose" color="#22a9fa" block type="primary">重试</van-button></div>
						</div>
					</div>
@@ -170,6 +170,20 @@
							</div>
						</div>
					</div>
					<div v-else-if="contentType==20" >
						<div class="title fs-17 c-333 tc ptb20">请选择医保卡种类</div>
						<div class="pick-content plr26 pt14 pb30">
							<div @click="readcard(11)" class="pick-item">
								<div><img src="../img/yibaoka.png" alt=""></div>
								<div class="pick-item-text">医保卡</div>
							</div>
							<div class="pick-split">或</div>
							<div @click="readcard(12)" class="pick-item green">
								<div><img src="../img/linshika.png" alt=""></div>
								<div class="pick-item-text">临时医保卡</div>
							</div>
						</div>
					</div>
					
				</div>
				<div class="num-panel" v-if="contentType==18">
@@ -195,7 +209,7 @@ export default {
  	data() {
    	return {
			isShow: false,
			contentType: 1, //1选择取药方式  2订单查询中  3提示  4门诊结算  5结算清单 6选择支付方式  7支付二维码 8结算成功 9结算失败  10出药中 11出药成功 12出药失败  13自助取药 14结算中 15出药超时 16充值成功 17选择取药方式2
			contentType: 1, //1选择取药方式  2订单查询中  3提示  4门诊结算  5结算清单 6选择支付方式  7支付二维码 8结算成功 9结算失败  10出药中 11出药成功 12出药失败  13自助取药 14结算中 15出药超时 16充值成功 17选择取药方式2 20选择取药卡类型
			nextContentType: 0,//4门诊结算 13自助取药 20预交金充值
			hasTimer: false,
			hasClose: true,
@@ -343,7 +357,13 @@ export default {
		},
		readcard(type){
			var { nextContentType } = this
			if(type==3){
			if(type==11 || type==12){
				this.show({
					contentType: 2,
				})
				this.$emit('readcard', type==12? 12 : '')
			} 
			else if(type==3){
				//取药码
				this.show({
					contentType: 18
@@ -371,13 +391,16 @@ export default {
			} else {
				if(type == 1){
					playAudio(8)
					this.show({
						contentType: 2,
					})
					this.$emit('readcard', type)
				} else if(!type){
					playAudio(16)
					this.show({
						contentType: 20,
					})
					return
				}
				this.show({
					contentType: 2,
				})
				this.$emit('readcard', type)
			}
		},
		removeIptThread(){

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

@@ -182,8 +182,9 @@ export default {
		playTest(){
			return
			this.showTipsDialog({
				contentType: 7,
				payUrl: "aaa"
				contentType: 1,
				payUrl: "aaa",
				nextContentType: 20
			})
			return
			playAudio(test)
@@ -268,6 +269,10 @@ export default {
					})
				return
			}  
			if(data==12){
				socketUtils.sendReadCard('ReadTempCard')
				return
			}
			if(data){
				var TipsDialog = this.$refs.TipsDialog
				this.$refs.DrugTaking.toolReadcardMsg({}, TipsDialog.nextContentType, data)

mini-pro-web/src/views/machine/scss/DrugTaking.scss

@@ -350,4 +350,25 @@
        left: 0;
    }
    
    &.wait-pay-list{
        .order-list{
            .item{
                padding-bottom: 20px;
            }
            .botton-group{
                display: none;
            }
        }
        
        
        ::v-deep .van-checkbox__icon{
            display: none;
            &+.van-checkbox__label{
                margin-left: 0;
            }
        }
        .select{
            display: none;
        }
    }
}

mini-pro-web/src/views/machine/scss/TipsDialog.scss

@@ -26,7 +26,7 @@
        }
        
        
        .content-type-1 {
        .content-type-1, .content-type-20 {
            .pick-content{
                display: -webkit-box;
                -webkit-box-pack: justify;
@@ -75,6 +75,18 @@
            }
        }
        .content-type-20{
            .pick-content{
                .pick-item{
                    padding-top: 30px;
                }
                img{
                    width: 85px;
                    height: 54px;
                }
            }
        }
        .content-type-2{
            padding-top: 40px;
            img{

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

@@ -166,14 +166,14 @@ class SocketUtils extends Vue {
        }, 2000)
    }
    sendReadCard() {
    sendReadCard(type) {
        if(process.env.NODE_ENV==='development'){
            setTimeout(()=>{
                    this.getMessage({
                        data: JSON.stringify({
                            type: 'CardInfo',
                            // mess: '未插卡',
                            mess: '卡号：DF2792514\n姓名：王志南\n身份证号：350524199405230613\n类型：01\n电话：\n发卡机构编号：3502\n性别：1\n生日：19940523\n公司：\n地址：\n卡基本信息警告：\n卡识别码：350200D156000005F314ECAA51F5F34D'
                            mess: '卡号：DH6542392\n姓名：王志南\n身份证号：350524199405230613\n类型：01\n电话：\n发卡机构编号：3502\n性别：1\n生日：19940523\n公司：\n地址：\n卡基本信息警告：\n卡识别码：350200D156000005F314ECAA51F5F34D'
                        })
                    })
            }, 1950)
@@ -181,7 +181,7 @@ class SocketUtils extends Vue {
        }
        var obj = {
            type: "ReadCard",
            type: type || "ReadCard",
            mess: ""
        }
        this.send(obj);