Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/consulting/css/consulting.css

@@ -357,7 +357,8 @@ p{
    font-size: 14px;
    -webkit-user-select: auto;
    user-modify: read-write-plaintext-only;
    -webkit-user-modify: read-write-plaintext-only
    -webkit-user-modify: read-write-plaintext-only;
    outline: none;
}
.info-panel{
    height: 26px;

app/consulting/html/consulting.html

@@ -9,7 +9,6 @@
    <meta name="keywords" content="">
    <meta name="description" content="">
    <link rel="shortcut icon" href="favicon.ico">
    <link rel="stylesheet" type="text/css" href="../../../css/style.min.css"/>
    <link href="../../../css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
    <link href="../../../css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet">
    <link href="../../../css/animate.min.css" rel="stylesheet">

app/consulting/js/consulting.js

@@ -196,7 +196,7 @@ new Vue({
		    consultingAPI.sendMessage(vm.sessionId, {data: params}).then(function(res){
		        console.log(res);
		        vm.count++;
		        if(vm.count==1){//level:1 专科医生 （只记录第一条数据）
		        if(vm.count==1 && JSON.parse(window.localStorage.getItem('wlyyAgent')).doctorType==1 && vm.planDetailId){//level:1 专科医生 （只记录第一条数据）
			        var messages = res.messages[0];
			        var guidanceParams = {
			        	messageId:messages.id,//消息id

app/recover/html/personal-manage.html

@@ -28,7 +28,9 @@
		    					</p>
		    					<p class="m0 p0 mb10">
		    						<span class="c-999">健康情况：</span>{{recoverPatInfo.patientInfo.healthyCondition}}
		    						<span class="c-999 ml10">联系电话：</span><span class="c-12b7f5 cur-pit" v-if="isMobile" @click="changeStatu()">点击查看</span><span v-else>{{recoverPatInfo.patientInfo.mobile}}</span>
		    					</p>
		    					<p class="m0 p0 mb10">
		    						<span class="c-999">联系电话：</span><span class="c-12b7f5 cur-pit" v-if="isMobile" @click="changeStatu()">点击查看</span><span v-else>{{recoverPatInfo.patientInfo.mobile}}</span>
		    					</p>
		    				</div>
		    				<div class="fr set-photo">

app/rehabilitation/css/rehabilitation_management.css

@@ -30,7 +30,7 @@ body,html,.c-container{height: 100%;}
.task-list li{width: 90px;cursor: pointer;text-align: center;display: block;float: left;border-radius: 14px;font-size: 14px;margin-left: 20px;margin-bottom: 20px;color: #333333;border: solid 1px #d7dce6;padding: 3px;}
.task-list li.active{background-color: #12b7f5;color: #fff;}
.btn-search{background-color: #12b7f5;color: #fff;border-radius: 0;width: 120px;margin-top: 30px;}
.btn-search:hover,.btn-search:focus,.btn-search:active,.btn-search:hover:active{background-color: #00ADEE;color: #fff;}
.btn-search:hover,.btn-search:focus,.btn-search:active,.btn-search:hover:active{background-color: #1c9aca;color: #fff;outline: none;outline-color: transparent;}
/*日历*/
.calendar-content{margin: 0 auto;}
/*图例注释*/
@@ -72,7 +72,7 @@ body,html,.c-container{height: 100%;}
.task-icon .icon-check{position: absolute;right: -3px;bottom: 0;width: 15px;height: 15px;}
.day-number{font-size: 28px;color: #999999;margin-bottom: 0;line-height: 1;}
/*进度条*/
.progress-box{position: absolute;bottom: 0;left: 0;right: 0;padding: 5px;}
.progress-box{position: absolute;bottom: 0;left: 0;right: 0;padding: 10px 5px;text-align: center;}
.progress-box .progress{margin-bottom: 9px;background-color: #d7dce6;border-radius: 10px;position: relative;}
.progress-box .progress > span{position: absolute;left: 0;right: 0;text-align: center;color: #333333;top: 2px;}
.progress-box .progress-bar{background-color: #12b7f5;}
@@ -89,17 +89,18 @@ body,html,.c-container{height: 100%;}
.rili,.shijianzhou{width: 40px;height: 28px;display: inline-block;float: left;background-color: #fff;}
.rili.active,.shijianzhou.active,.rili:hover,.shijianzhou:hover{background-color: #12b7f5;border-radius: 5px;}
/*列表展示*/
.time-axis td{border: none !important;color: #999;}
.time-axis td{border: none !important;color: inherit;}
.time-axis th{background-color: #f5f5fa;border-bottom: solid 1px #d7dce6;}
.time-axis td p{color: #999;}
.time-axis td p{color: inherit;}
.ellipsis{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
.time{position: relative;}
.time-box{position: relative;padding: 8px 50px 8px 8px!important;}
.cur-status{position: absolute;z-index: 3;right: 5px;top: 50%;padding: 8px;line-height: 1;margin-top: -12.5px;border-radius: 100%;color: #fff;}
.cur-status:empty{margin-top: -8px;right: 12.5px;background-color: #d7dce6;}
[is-future="1"]{background-color: #dff5fc;}
.time-axis tr:hover{background-color: #f5f5fa;}
.time-axis tr:hover p{color: #333333;}
.time-axis [is-future="1"]{background-color: #dff5fc;color: #12b7f5;}
/*.time-axis [is-future="1"] td p,.time-axis [is-future="1"] td{}*/
.time-axis tr:hover{background-color: #f5f5fa;color: #333333;}
/*.time-axis tr:hover p{}*/
[is-future="1"] .cur-status,[is-future="2"] .cur-status{background-color: #12b7f5;}
[is-future="-1"] .cur-status{background-color: #ff3b30;}
[is-future="3"] .cur-status{background-color: #5cb85c;}

app/rehabilitation/html/guide_the_message.html

@@ -46,8 +46,8 @@
		  </div>
	   		<div class="panel-body">
	      		<div class="service-operation pt10">
	      			<p><span class="pull-right view-detail" :class="{active:isCollapse}" @click="chakan"><i class="icon icon-check mr5 icon-16"></i>{{isCollapse?'收起详情':'查看详情'}}</span>指导与汇报记录</p>
	      			<div class="record-list" :class="{active:isCollapse}">
	      			<p><span class="pull-right view-detail" v-if="service.messageList.length" :class="{active:isCollapse}" @click="chakan"><i class="icon icon-check mr5 icon-16"></i>{{isCollapse?'收起详情':'查看详情'}}</span><span class="pull-right" v-if="!service.messageList.length">暂无记录</span>指导与汇报记录</p>
		      		<div class="record-list" :class="{active:isCollapse}">
	      				<div class="record-item" v-for="item in service.messageList">
	      					<div class="flex-box c-999 f14">
		      					<div class="flex-box-item">
@@ -62,7 +62,6 @@
	      			</div>
	      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
	      				<button class="btn btn-yuyue" v-if="service.reserve==1" @click="qwapp">转诊预约</button>
	      				<button class="btn btn-yuyue" v-if="service.type==0 && service.operate!=1" @click="goToFinish(service.planDetaiId)">上传附件</button>
	      				<button class="btn btn-yuyue" v-if="service.type==2 && service.operate!=1 && !service.isZK" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
	      				<button class="btn btn-yuyue" v-if="service.type==3 && service.operate!=1 && !service.isZK" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
	      				<button class="btn btn-yuyue" v-if="service.type==4 && service.operate!=1 && !service.isZK" @click="qwapp">随访</button>
@@ -71,7 +70,7 @@
	      				<button class="btn btn-fuwuma" v-if="service.type==1 && service.operate!=1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
	      			</div>
	      		</div>
	      		<div class="complete-info pt10">
	      		<div class="complete-info pt10" v-if="service.status==1">
	      			<div class="complete-title">完成情况</div>
	      			<div class="ptb10">
	      				<p class="f14 mb5"><span class="c-999">完成时间：</span>{{service.completeTime}}</p>

app/rehabilitation/js/guide_the_message.js

@@ -10,7 +10,9 @@
			upImgs: [],
			upImgArr: [],
			planid: httpData['planid'],
			service: []
			service: {
				relationRecordImg:{}
				}
		},
		mounted: function() {
			this.getServiceItem();
@@ -121,7 +123,7 @@
					content: '../../consulting/html/consulting.html?otherCode=' + otherCode + '&otherName=' + encodeURI(otherName) + '&planDetailId=' + planDetailId,
					end: function() { // 未点击确定按钮，点击关闭按钮  
						　　　　　　
						vm.getServiceItemList();　　　　
						vm.getServiceItem();　　　　
					}
				});
			},
@@ -182,6 +184,7 @@
				}
			},
			viewDetial:function(type,code){
				var vm=this;
				if(type==4){					
					top.layer.msg('客户端暂不支持查询随访记录');
				}else{
@@ -198,7 +201,7 @@
						shadeClose: false, //点击遮罩关闭层
						content: '../../article/html/article-info.html?articleId=' + code,
						end: function() { // 未点击确定按钮，点击关闭按钮  
							vm.getServiceItemList();　　　　
							vm.getServiceItem();　　　　
						}
					});
					

app/rehabilitation/js/service_item_content.js

@@ -81,7 +81,7 @@
					//				  offset: ['100px'], //右下角弹出
					area: ['80%', '600px'],
					shade: 0.5,
					title: '健康教育',
					title: '健康指导',
					fixed: true, //不固定
					maxmin: true,
					closeBtn: 1,
@@ -129,13 +129,13 @@
					layer.msg('无法与自己聊天',{icon:5}); 
					return ;
				}
				if((data.isMyTask==1) && (loginDoctor.uid==data.specialistDoctorCode)){
					otherCode=data.executeDoctorCode;
					otherName=data.executeDoctorCode;
					planDetailId=data.planDetaiId
				}else{
				if(data.isMyTask==1){
					otherCode=data.specialistDoctorCode;
					otherName=data.specialistDoctorName;
					planDetailId=data.planDetaiId;
				}else{
					otherCode=data.executeDoctorCode;
					otherName=data.executeDoctorCode;
				}
				layer.open({
				  type: 2,