Forráskód Böngészése

增加出院状态判断就诊卡

chenyue 5 éve
szülő
commit
f7cb0850e8

+ 2 - 2
html/payment/html/electronicHealthCard.html

@ -51,7 +51,7 @@
                        <div class="mt15 c-f14 c-333">就诊码</div>
                    </div>                    
                </div>
                <!--<div class="c-border-tb flex bgc-fff mt10 c-positon-r">
                <div class="c-border-tb flex bgc-fff mt10 c-positon-r">
                    <div class="f_g_1 ptb12 plr15" @click="gotoPay(data.id)">
                        <img src="../images/feiyong_icon.png" style="width: 19px;margin-top: 2px;"/>
                        <span class="c-f17 pl20 c-positon-a" >健康卡账户</span>
@ -64,7 +64,7 @@
                        <span class="c-f17 pl20 c-positon-a" >缴费结算</span>
                        <img src="../images/tiaozhuan_icon.png" width="7" height="14" class="fr mr15 mt5" />                       
                    </div>
                </div>-->
                </div>
			</div>			
		</div>

+ 1 - 1
html/payment/html/patientIDCards-pay.html

@ -40,7 +40,7 @@
						</div>
					</div>
				</div>
				<div class="labelIcon mt10 zhuyuan2 c-radius-5 c-fff" v-show="data.inpCardNo && (data.HospitalizationStatus==0||data.HospitalizationStatus==1)">
				<div class="labelIcon mt10 zhuyuan2 c-radius-5 c-fff" v-show="data.inpCardNo && (data.inpStatus==0||data.inpStatus==1)">
					<div class="c-f14 pt12 pl10">
						<span class="c-f17" style="line-height: 20px;">{{data.inpCardNo}}&nbsp;({{data.name}})&nbsp;</span>
						<span v-if="data.isDefault==1" class="c-f12 morenSpan">默认</span>

+ 1 - 1
html/payment/js/changeCards.js

@ -33,7 +33,7 @@ var checktype=false;
			        	if(Request.paytype==2){			        		
			        		vm.dataList=res.data.filter(function(item){
			        			item.cardNo=item.inpCardNo
			        			var isInpStatus=item.HospitalizationStatus==0||item.HospitalizationStatus==1    //
			        			var isInpStatus=item.inpStatus==0||item.inpStatus==1    //
			        			return item.inpCardNo && isInpStatus
			        		})
			        		_.each(vm.dataList,function(item){

+ 2 - 1
html/payment/js/patientIDCards-pay.js

@ -23,7 +23,8 @@ var loading = dialog({
		        "isDefault": 0,
		        "createDate": "",
		        "cardMoney": "",
		        "cardInpMoney": null
		        "cardInpMoney": null,
		        "inpStatus":"",   //住院状态 0 - 在院  1 - 已出院未结算  2 - 已结算 -1 错误状态
		   },
			BtnClass:"p-fix-bottom-0",
			length:1,

+ 5 - 1
html/payment/js/payment.js

@ -275,7 +275,11 @@ var loading = dialog({
		    hasInpCardNo:function(item){
		    	var ispass=true
		    	if(Request.paytype==2){
		    		ispass=item.inpCardNo?true:false
		    	    if(item.inpCardNo&&(item.inpStatus==0||item.inpStatus==1)){
		    	        ispass=true
		    	    }else{
		    	        ispass=false
		    	    }
		    	}
		    	return ispass
		    },