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

app/recover/css/personal-manage.css

@@ -6,6 +6,7 @@
.bgc-orange {background-color: #ff9526;}
.bgc-c1c1c1 {background-color: #ebebf5;}
.lh22 {height: 22px; line-height: 22px;}
.lh30 {height: 30px; line-height: 30px;}
.b-r-11 {border-radius: 11px;}
.w30 {width: 30px;}
.set-dianxian {
@@ -40,8 +41,13 @@
}
.w-100-60 {width: calc(100% - 60px);}
.set-hospital {
	background: url(../images/yiyuan_icon.png) no-repeat no-repeat 5px 5px;
	background: url(../images/yiyuan_icon.png) no-repeat no-repeat 5px 3px;
	background-size: 12px 12px;
}
.h73 {height: 73px;}
.w100 {width: 100px;}
.w96 {width: 96px;}
.w96.active {
	background-color: #12b7f5;
	color: #ffffff;
}

app/recover/html/personal-manage.html

@@ -126,7 +126,7 @@
	    						</div>
	    					</li>
	    					<li class="plr20" v-if="isFinishMore">
	    						<div class="c-border lh40 b-r-3 c-t-center cur-pit" @click="addPage()">点击查看更早时间</div>
	    						<div class="c-border lh40 b-r-3 c-t-center cur-pit" @click="addEventPage()">点击查看更早时间</div>
	    					</li>
	    					<li class="ptb10 c-t-center c-333" v-if="!planDetailList.length">暂无相关记录</li>
	    				</ul>
@@ -135,7 +135,12 @@
	        	<div class="fr w300 c-h100 c-border-l">
	        		<div class="plr5 c-h100">
	        			<h4 class="m0 pl15 pr5 lh40 c-border-b clearfix c-position-r"><em class="c-position-a set-blue-span"></em>就诊记录</h4>
	        			<div style="overflow: hidden; height: calc(100% - 41px);">
	        			<div class="lh30 c-border-b c-t-center clearfix">
	        				<span class="fl w96 cur-pit" :class="{'active':eventType == 1}" @click="selectType(1)">门诊</span>
	        				<span class="fl w96 cur-pit c-border-l" :class="{'active':eventType == 2}" @click="selectType(2)">住院</span>
	        				<span class="fl w96 cur-pit c-border-l" :class="{'active':eventType == 3}" @click="selectType(3)">体诊</span>
	        			</div>
	        			<div style="overflow: hidden; height: calc(100% - 72px);">
	        				<ul class="c-h100 p0 m0" style="overflow: auto;">
	        					<li class="clearfix" v-for="(record, index) in seeRecord" :key="index">
	        						<div class="fl set-dianxian h73 plr10 pt20 clerfix">
@@ -149,10 +154,11 @@
		    								<p class="m0 p0 plr5 c-fff bgc-green lh22 clearfix" v-if="record.eventType == 3">体检<span class="fr">{{record.eventDate}}</span></p>
		    								<p class="m0 p0 plr5 c-fff bgc-orange lh22 clearfix" v-if="record.eventType == 1">门诊<span class="fr">{{record.eventDate}}</span></p>
		    								<p class="m0 p0 plr5 pt5 lh22">{{record.dianosis}}</p>
		    								<p class="m0 p0 pr5 pb5 pl20 lh22 set-hospital">{{record.orgName}}</p>
		    								<p class="m0 p0 pr5 pb5 pl20 set-hospital">{{record.orgName}}</p>
		    							</div>
	    							</div>
	        					</li>
	        					<li class="c-t-center c-12b7f5" v-if="hasMoreRecord">查看更多</li>
	        					<li class="c-t-center ptb10" v-if="!seeRecord.length">无就诊记录</li>
	        				</ul>
	        			</div>
@@ -210,7 +216,9 @@
                	planDetailList: [],
                	isFinishMore: false,
                	page: 1,
                	eventPage: 1
                	eventPage: 1,
                	eventType: 1,
                	hasMoreRecord: null
                },
                mounted: function() {
                	this.patientRehabilitationDetail()
@@ -280,18 +288,26 @@
							}
						})
			    	},
			    	selectType: function(type) {
			    		this.eventType = type
			    		this.seeRecord = []
			    		this.page = 1
			    		this.archivesEvent()
			    	},
			    	archivesEvent: function() {
			    		var vm = this,
			    			loadding = layer.load(0, {shade: false}),
			    			params = {
			    				patient: httpData.patientCode || "e040dd6814b648ceb3ba8d8a04f9f22c",
			    				type: vm.eventType,
			    				page: vm.page,
			    				pageSize: 20
			    			}
						recoverAPI.archivesEvent(params).then(function(res) {
							layer.close(loadding)
							if(res.status == 200) {
								vm.seeRecord = vm.seeRecord.concat(res.data)
								this.hasMoreRecord = res.data.length == 20 ? true : false
								 vm.seeRecord = vm.seeRecord.concat(res.data)
							} else {
								showErrorMessage(res.msg);
							}
@@ -309,10 +325,14 @@
			    			return str
			    		}
			    	},
			    	addPage: function() {
			    	addEventPage: function() {
			    		this.eventPage++;
			    		this.recentPlanDetailRecord()
			    	},
			    	addPage: function() {
			    		this.page++;
			    		this.archivesEvent()
			    	},
			    	setPercent: function(plan) {
			    		return Math.floor(plan.allFinishCount / plan.allCount * 100) + "%"
			    	}

app/recover/html/project-detail.html

@@ -46,12 +46,18 @@
					{{planDetail.node}}
				</div>
				<p class="m0 p0 ptb10 c-333">相关记录</p>
				<ul class="p0 m0 ptb10 plr10 mb20 c-border b-r-3 clearfix">
					<li class="fl set-photo c-border mr10 clearfix" v-for="(record, index) in planDetail.relationRecordImg" :key="index">
				<ul class="p0 m0 ptb10 plr10 mb10 c-border b-r-3 clearfix">
					<li class="fl set-photo c-border mr10 cur-pit clearfix" v-for="(record, index) in planDetail.relationRecordImg" :key="index">
						<img class="fl" :src="handleImg(record)" alt="记录图" @click="lookPhoto(record)" />
					</li>
					<li class="c-t-center" v-if="planDetail.relationRecordImg && !planDetail.relationRecordImg.length">暂无相关记录</li>
				</ul>
				<div class="mb20" v-if="(planDetail.type==2 || planDetail.type==3 || planDetail.type==4) && planDetail.relationRecordCode">
	      			<p class="m0 p0 ptb10 f14 c-333">关联记录</p>
	      			<p class="m0 p0 ptb10 c-border b-r-3 c-t-center cur-pit c-333 clearfix" @click="viewDetial(planDetail.type,planDetail.relationRecordCode)">
	      				<span class="fl"><i class="icon icon-arrow-right"></i></span>{{planDetail.type==2?'健康文章':(planDetail.type==3?'健康指导':'随访记录')}}&emsp;{{planDetail.completeTimeShort}}
	      			</p>
	      		</div>
			</div>
		</div>
	</div>
@@ -143,7 +149,30 @@
			    	handleImg: function(src) {
			    		var str = httpRequest.getImgUrl(src);
			    		return str
			    	}
			    	},
			    	viewDetial:function(type,code){
						var vm=this;
						if (type==3 || type==4){					
							top.layer.msg('客户端暂不支持查询随访记录');
						} else {
							top.layer.open({
								type: 2,
								//				  offset: ['100px'], //右下角弹出
								area: ['80%', '600px'],
								shade: 0.5,
								title: '指导教育',
								fixed: true, //不固定
								maxmin: true,
								closeBtn: 1,
								shift: 5,
								shadeClose: false, //点击遮罩关闭层
								content: '../../article/html/article-info.html?articleId=' + code,
								end: function() { // 未点击确定按钮，点击关闭按钮  
									vm.getServiceItem();　　　　
								}
							});
						}
					}
                }
            })
		</script>

app/rehabilitation/css/management.css

@@ -223,9 +223,9 @@ a {
	width: 320px;
	height: 28px;
	line-height: 28px;
	background-color: #f5f5fa;
	background-color: #a8e6f9;
	border-radius: 5px;
	border: solid 1px #82dcfa;
	/*border: solid 1px #82dcfa;*/
	color: #666666;
	display: inline-block;
	vertical-align: middle;

app/rehabilitation/js/moreplan.js

@@ -248,7 +248,7 @@ layui.use('element', function () {
                    type: 2,
                    area: ['750px', '650px'],
                    shade: 0.5,
                    title: '服务项目内容',
                    title: '居民信息',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn: 1,