Explorar o código

修复测试bug

lulihong %!s(int64=5) %!d(string=hai) anos
pai
achega
6fb6d1ae2f

+ 4 - 0
app/rehabilitation/css/stop_special_service.css

@ -1,6 +1,7 @@
body {
	font-family: "microsoft yahei";
	color: #333333;
	height: 100%;
}
.w180 {width: 180px;}
.w820 {width: 820px;}
@ -25,3 +26,6 @@ body {
	background-color: #12b7f5;
}
.btn-12b7f5:hover {color: #fff;}
.bgc-c8c8c8{
	background-color: #c8c8c8;
}

+ 2 - 2
app/rehabilitation/html/rehabilitation_management.html

@ -103,7 +103,7 @@
						<div class="ui-grid mt15 pb15">
							<div class="ui-col-1 c-f16 c-333">冠心病康复计划</div>
							<div class="ui-col-1 c-f14 c-999">总进度:</div>
							<div class="ui-col-0 div-patient-comfirm c-f14 c-fff bgc-12b7f5" v-show="planInfo.status==2" @tap="weiXinConfirmClick">邀请居民确认</div>
							<div class="ui-col-0 div-patient-comfirm c-f14 c-fff bgc-12b7f5" v-show="planInfo.status==2 && !planInfo.patientImg" @tap="weiXinConfirmClick">邀请居民确认</div>
						</div>
						<div class="ui-grid">
							<div class="ui-col-1">
@ -146,7 +146,7 @@
							</div>
						</div>-->
					</div>
					<div class="nav-content-center bgc-fff c-position-r c-h100 div-right ui-col-1" style="margin-left: 460px;" v-show="tabStatus==3">
					<div class="nav-content-center bgc-fff c-position-r c-h100 div-right ui-col-1" style="margin-left: 460px;height: 100%;" v-show="tabStatus==3">
						<iframe id="framePage" src="" style="width: 100%;height: 100%;border: 0;"></iframe>
					</div>
					<div class="nav-content-center bgc-fff c-position-r c-h100 div-right ui-col-1" style="margin-left: 460px;" v-show="tabStatus!=3">

+ 1 - 0
app/rehabilitation/html/stop_special_service.html

@ -72,6 +72,7 @@
			<!--endprint-->
			<div class="c-t-center c-f14 pt100 pb40">
				<span class="btn b-r-3 btn-12b7f5 c-fff" id="printBtn">打印</span>
				<span class="btn b-r-3 bgc-c8c8c8 c-fff ml30 c-hide" id="seeQianShou">查看签收</span>
			</div>
		<script type="text/javascript" src="../../../js/vue.js"></script>
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>

+ 3 - 0
app/rehabilitation/js/rehabilitation_management.js

@ -61,6 +61,9 @@
			            //patientImg:居民签名照/证件照,如果不为null的话说明居民已确认,显示康复完成明细
			            if(vm.planInfo.status==2 && !vm.planInfo.patientImg){//任务全部完成时,显示完成提示框
							vm.showCompleteDailog();
			            }else if(vm.planInfo.status==2 && vm.planInfo.patientImg){//居民已确认计划完成
			            	vm.tabStatus=3;
							$("#framePage").attr("src","stop_special_service.html?planids="+vm.planId+"&completePlan=true")
			            }
			        }else{
			        	layer.msg(res.msg,{icon:5});

+ 24 - 1
app/rehabilitation/js/stop_special_service.js

@ -1,5 +1,6 @@
!function(){
	var httpData=GetRequest();
	var patientImg = "";
	var userInfo = JSON.parse(window.localStorage.getItem(httpRequest.agentName));
	//设置网页打印的页眉页脚为空 
	function PageSetup_Null() {
@ -27,6 +28,24 @@
		    window.document.body.innerHTML = prnhtml; 
		    PageSetup_Null();
		})
		//查看签收
		$("#seeQianShou").click(function() {
			var imgUrl = httpRequest.getImgUrl(patientImg);
			parent.layer.open({
	    		type: 1,
		      	title:false,
		      	shadeClose: true,
		      	content:'<img style="width:360px;height:500px;" src="'+imgUrl+'">'
	    	})
//	        parent.layer.open({
//	          type:1,
//	          shift: 2,
//	          shade:0.6,
//	          title:false,
//	          shadeClose:true,
//	          content:'<img style="width:360px;height:500px;" src="'+imgUrl+'">'
//	        });
		})
	}
	new Vue({
		el:"#app",
@ -35,7 +54,10 @@
		},
		mounted:function(){
			this.getServiceItemsAfterStop()
			bindEvent()
			bindEvent();
			if(httpData.completePlan){//居民已确认完成计划,显示“查看签收”按钮
				$("#seeQianShou").show();
			}
		},
		methods:{
			getServiceItemsAfterStop: function() {
@ -45,6 +67,7 @@
					layer.close(loadding);
					if(res.status==200){
						vm.accountList = res.data
						patientImg = res.data.patient_img;
					}else{
						layer.msg(res.msg,{icon:5});
					}