Browse Source

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

yezehua 6 years ago
parent
commit
d493a22a1f

+ 4 - 4
api/http-request.js

@ -8,10 +8,10 @@
    localStorage.setItem('WLYY_IMEI', IMEI)
    $.support.cors = true;
    if(publish_version) { // 生产环境配置
        server = "http://www.xmtyw.cn/wlyy/"
        server = "http://www.xmtyw.cn/wlyytest/"
        imserver = "http://27.155.101.77:3000/api/v2";
        socketUrl = "http://27.155.101.77:3000";
        articleServer = "http://www.xmtyw.cn/wlyy/"
        articleServer = "http://www.xmtyw.cn/wlyytest/"
        loginUrl = "../../login/login.html";
        imgServer = "http://www.xmtyw.cn/";
        if(isInner){
@ -48,7 +48,7 @@
            userAgent = JSON.parse(userAgent)
        } catch(e) {
            toastr && toastr.warning("登录失效,请关闭当前弹窗前往PC IM重新登录")
            toLoginPage()
//          toLoginPage()
        }
    } else {
        toLoginPage()
@ -223,7 +223,7 @@
            if(count == 1){
//          	console.log(tip)
				toastr && toastr.warning(tip)
            	toLoginPage()
//          	toLoginPage()
            }
        }
    }

+ 7 - 1
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;
}

+ 20 - 6
app/recover/html/new_recover.html

@ -2,7 +2,7 @@
<html>
	<head>
		<meta charset="UTF-8">
		<title>新增康复安排</title>
		<title>新建计划</title>
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.ui.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
@ -129,8 +129,8 @@
	        				<p class="m0 p0 pl20 ptb10 c-border-b set-label">支付方式:<span class="ml10 pl20 active">按服务支付</span><em class="c-red ml20">(按选择支付方式完成收费)</em></p>
	        				<div class="pl20 lh40">总费用:
	        					<span class="c-red c-f16">¥{{allFee}}</span>
	        					<span class="fr lh30 cur-pit w80 c-t-center c-fff" :class="allFee ? 'bgc-12b7f5' : 'bgc-d7dce6'" @click="createRehabilitationPlan()">生成计划</span>
	        					<span class="fr lh30 cur-pit w80 c-t-center bgc-green c-fff" @click="canclePlan()">取消</span>
	        					<span class="fr lh30 cur-pit plr15 c-t-center bgc-green c-fff" @click="canclePlan()">取消</span>
	        					<span class="fr lh30 cur-pit plr15 c-t-center c-fff" :class="allFee ? 'bgc-12b7f5' : 'bgc-d7dce6'" @click="createRehabilitationPlan()">生成计划</span>
	        				</div>
	        			</div>
		        	</div>
@ -146,7 +146,7 @@
							<div class="c-h100-99" style="overflow: hidden;">
								<ul class="c-h100 p0 m0" style="overflow: auto;">
									<li v-for="(project1, index) in projectList" :key="index">
										<h4 class="set-arrow c-f14 h30 p0 m0 pl20 f-w500 cur-pit" :class="{'active': index == proIndex1}" @click="selectPro(1, index)">{{project1.itemType == 1 ? '康复服务' : '健康服务'}}</h4>
										<h4 class="set-arrow c-f14 h30 p0 m0 pl20 f-w500 cur-pit" :class="{'active': index == proIndex1}" @click="selectPro(1, index)">{{project1.itemType == 1 ? '诊疗服务' : '健康服务'}}</h4>
										<ul class="c-h100 p0 m0 pl10" v-if="index == proIndex1">
											<li v-for="(project2, index2) in project1.item" :key="index2">
												<p class="set-arrow h30 c-f14 pl20 m0 c-333 cur-pit" :class="{'active': index2 == proIndex2}" @click="selectPro(2, index2)">{{project2.itemName}}</p>
@ -175,12 +175,14 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<link rel="stylesheet" href="../../../js/flatpickr/flatpickr.min.css">
		<script src="../../../js/flatpickr/flatpickr.min.js"></script>
		<script src="../../../js/flatpickr/flatpickr.l10n.zh.js"></script>
		<script src="../../../api/http-request.js" type="text/javascript"></script>
		<script src="../../../api/recover_api.js" type="text/javascript"></script>
		<script type="text/javascript">
@ -507,8 +509,19 @@
						});
                	},
                	canclePlan: function(obj) {
                		this.isPlan = false
                		this.allFee = 0
                		var vm = this
                		layer.msg('是否确认删除此计划?', {
                			time: 10000,
                			btn: ['是', '否'],
                			yes: function(index, layero) {
                				vm.isPlan = false
                				vm.allFee = 0
                				layer.close(index)
                			},
                			btn2: function(index, layero) {
                				layer.close(index)
                			}
                		})
                	},
                	newPlan: function(disease, templateId) {
                		this.diseaseObj = disease
@ -537,6 +550,7 @@
                			vm = this;
                		this.sureIndex = index
                		currentEle.flatpickr({
                			locale: 'zh',
                			defaultDate: currentEle.val(),
                			minDate: "today",
                			enableTime: true,

+ 27 - 6
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>
@ -165,6 +171,7 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
@ -210,7 +217,9 @@
                	planDetailList: [],
                	isFinishMore: false,
                	page: 1,
                	eventPage: 1
                	eventPage: 1,
                	eventType: 1,
                	hasMoreRecord: null
                },
                mounted: function() {
                	this.patientRehabilitationDetail()
@ -280,18 +289,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 +326,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) + "%"
			    	}

+ 51 - 8
app/recover/html/project-detail.html

@ -20,10 +20,10 @@
			<div class="plr15 c-999" style="overflow: auto; height: 100%;">
				<p class="p0 m0 ptb10 c-border-b">项目内涵:{{planDetail.content}}</p>
				<div class="ptb10 c-border-b clearfix">
					<span class="fl w-50 mb5">地点:{{planDetail.hospitalName}}</span>
					<span class="fl w-50 mb5">执行:{{handleArr(planDetail.executeDoctorList)}}</span>
					<span class="fl w-50">时间:{{handleTime(planDetail.executeTime)}}</span>
					<span class="fl w-50">收费:{{planDetail.expense}}元</span>
					<span class="fl w-50 mb5">服务地点:{{planDetail.hospitalName}}</span>
					<span class="fl w-50 mb5">执&ensp;行&ensp;人:{{handleArr(planDetail.executeDoctorList)}}</span>
					<span class="fl w-50">服务时间:{{handleTime(planDetail.executeTime)}}</span>
					<span class="fl w-50">服务费用:{{planDetail.expense}}元</span>
				</div>
				<p class="p0 m0 ptb10 c-333 clearfix">指导与汇报记录<span class="fr pl15 set-show c-12b7f5" :class="{'active':isShowMore}" @click="changeShow()">{{isShowMore ? "收起详情" : "查看详情"}}</span></p>
				<ul class="p0 m0" v-show="isShowMore">
@ -32,7 +32,7 @@
							<span class="fl w-50">{{record.doctorName}}&emsp;{{record.adminTeamName}}</span>
							<span class="fl w-50">{{record.createTime}}</span>
						</p>
						<p class="m0 p0 c-333">{{record.content}}</p>
						<p class="m0 p0 c-333" v-html="getContent(item.content,item.contentType)"></p>
					</li>
					<li class="c-t-center" v-if="!planDetail.messageList.length">暂无记录</li>
				</ul>
@ -46,18 +46,25 @@
					{{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>
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
@ -143,7 +150,43 @@
			    	handleImg: function(src) {
			    		var str = httpRequest.getImgUrl(src);
			    		return str
			    	}
			    	},
			    	getContent: function(value,type) {
						var res=value;
						if(type==2 || type==9){
							res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
						}else if(type==3){
							res = '【语音】';
						}else if(type==19){
							res = '【聊天记录】';
						}else if(type==12){
							res = '【视频】';
						}
						return res;
					},
			    	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>

+ 1 - 0
app/recover/html/select-disease.html

@ -22,6 +22,7 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 0
app/recover/html/select-patient.html

@ -76,6 +76,7 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 0
app/recover/html/select-project.html

@ -37,6 +37,7 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js"></script>
        <script src="../../../plugins/layer/layer.min.js"></script>
        <script src="../../../plugins/toastr/toastr.min.js"></script>
        <script src="../../../js/bootstrap.min.js"></script>
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>

+ 2 - 2
app/rehabilitation/css/guide_the_message.css

@ -60,6 +60,6 @@
.add-img{font-size: 40px;line-height: 60px;font-weight: 500;width: 60px;height: 60px;display: block;text-align: center;border: 1px dashed #d7dce6;color: #bec8d2;}
.yslb>span:after{content: '、';}
.yslb>span:last-child:after{display: none;}
.btns-group{padding-left: 20px;}
.btns-group .btn{margin-right: 20px;}
.btns-group{padding: 20px 0 10px 185px;}
.btns-group .btn{margin-right: 185px;}
.c-999{color: #999;}

+ 20 - 9
app/rehabilitation/css/health_control.css

@ -30,7 +30,17 @@ ul,
li {
    margin: 0;
}
.all img{
    cursor: pointer;
}
.recoveryPlan{
    border: 1px solid #12b7f5;
     background-color: white;
     padding: 2px 4px;
     color: #12b7f5;
     font-size: 14px;
     margin: 2px;
}
.flex-box {
    display: -webkit-box;
    display: -ms-flexbox;
@ -209,25 +219,26 @@ li {
    margin-bottom: 10px;
}
.datad button:nth-child(1) {
.datad button:nth-child(3) {
    background-color: #02cfb9;
    margin-right: 20px;
}
.datad button:nth-child(1):hover{
.datad button:nth-child(3):hover{
    background-color: #03c0ad;
}
.datad button:nth-child(2) {
.datad button:nth-child(1) {
    background-color: #12b7f5;
}
.datad button:nth-child(2):hover {
.datad button:nth-child(1):hover {
    background-color: #14afe7;
}
.datad button:nth-child(3) {
.datad button:nth-child(2) {
    background-color: #ff3b30;
    margin-right: 20px;
}
.datad button:nth-child(3):hover {
.datad button:nth-child(2):hover {
    background-color: #ec382e;
}
@ -253,7 +264,7 @@ li {
.dataa {
    width: 355px;
    width: 370px;
    justify-content: space-between;
}

+ 3 - 1
app/rehabilitation/css/moreplan.css

@ -15,7 +15,9 @@ p {
body{
    font-family: 微软雅黑;
}
.dac img{
    cursor: pointer;
}
.flex-box {
    display: -webkit-box;
    display: -ms-flexbox;

+ 2 - 2
app/rehabilitation/css/service_item_content.css

@ -52,8 +52,8 @@
.view-detail{color: #12b7f5;cursor: pointer;}
.yslb>span:after{content: '、';}
.yslb>span:last-child:after{display: none;}
.btns-group{padding-left: 20px;}
.btns-group .btn{margin-right: 20px;}
.btns-group{padding: 20px 0 10px 185px;}
.btns-group .btn{margin-right: 185px;}
.fuwuma-model{position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 9;}
.fuwuma-layer{position: absolute;top: 0;left: 0;right: 0;bottom: 0;background-color: rgba(0,0,0,.35);}
.fuwuma-content{width: 260px;height: 260px;top: 50%;position: absolute;margin-top: -130px;left: 50%;margin-left: -130px;}

+ 28 - 21
app/rehabilitation/html/guide_the_message.html

@ -32,12 +32,12 @@
		      		<div class="service-address ptb20">
		      			<div class="flex-box">
		      				<div class="flex-box-item">
		      					<p class="m0">地点:{{service.hospitalName}}</p>
		      					<p class="m0">时间:{{service.executeTime | formatDate}}</p>
		      					<p class="m0">服务地点:{{service.hospitalName}}</p>
		      					<p class="m0">服务时间:{{service.executeTime | formatDate}}</p>
		      				</div>
		      				<div class="flex-box-item">
		      					<p class="m0 yslb">执行:<span v-for="(doctor,index) in service.executeDoctorList">{{doctor}}</span></p>
		      					<p class="m0">收费:{{service.expense}}元</p>
		      					<p class="m0 yslb">执行人:<span v-for="(doctor,index) in service.executeDoctorList">{{doctor}}</span></p>
		      					<p class="m0">服务收费:{{service.expense}}元</p>
		      				</div>
		      			</div>
		      		</div>
@ -45,32 +45,39 @@
	       </div>
		  </div>
	   		<div class="panel-body">
	      		<div class="service-operation pt10">
	      			<p><span class="pull-right view-detail" v-if="service.messageList && 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 && !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">
		      						{{item.adminTeamName}}
		      					</div>
		      					<div class="flex-box-item">
		      						{{item.createTime}}
		      					</div>
	      		<div class="service-operation">
	      			<div style="border-bottom: 1px solid #D7D4F0;">
	      				<div class="pb10">
		      				指导与汇报记录&emsp;<span class="view-detail" v-if="service.messageList && service.messageList.length" :class="{active:isCollapse}" @click="chakan"><i class="icon icon-check mr5 icon-16"></i>{{isCollapse?'收起详情':'查看详情'}}</span>
		      				<div class="pull-right" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
		      					<span class="view-detail" @click="zdly(service)" v-if="service.isCreate && (service.isMyTask!=1)">指导留言</span>
		      					<span class="view-detail" @click="zdly(service)" v-if="service.isCK && service.isMyTask==1">查看留言</span>
		      				</div>
			      			<div class="f14 c-333" v-html="item.content | getContent(item.contentType)"></div>
	      				</div>
			      		<div class="record-list mb10" :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">
			      						{{item.adminTeamName}}
			      					</div>
			      					<div class="flex-box-item">
			      						{{item.createTime}}
			      					</div>
			      				</div>
				      			<div class="f14 c-333" v-html="getContent(item.content,item.contentType)"></div>
		      				</div>
		      			</div>
		      			<p class="c-999" style="margin-top: -10px;" v-if="service.messageList && !service.messageList.length">暂无记录</p>
	      			</div>
	      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
	      			<div class="flex-box btns-group clearfix" 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 && service.status!=2 && service.isMyTask==1" @click="qwapp">转诊预约</button>
	      				<button class="btn btn-yuyue" v-if="service.type==2 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
	      				<button class="btn btn-yuyue" v-if="service.type==3 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
	      				<button class="btn btn-yuyue" v-if="service.type==4 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="qwapp">随访</button>
	      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isCreate && (service.isMyTask!=1)">指导留言</button>
	      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isCK && service.isMyTask==1">查看留言</button>
	      				<button class="btn btn-fuwuma" v-if="service.type==1 && service.operate!=1 && service.isMyTask==1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
	      				<button class="btn btn-zhidao" v-if="service.type==1 && service.operate!=1 && service.isMyTask==1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
	      			</div>
	      		</div>
	      		<div class="complete-info pt10" v-if="service.status==1">
	      		<div class="complete-info" 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>

+ 8 - 7
app/rehabilitation/html/health_control.html

@ -70,14 +70,14 @@
            </div>
            
            <div class="neironglef">
                <button @click="newRecover()">新康复安排</button>
                <button @click="newRecover()">新建计划</button>
                <button @click="modelControl()">模版管理</button>
            </div>
        </div>
        <div class="neirong2">
            <ul class="c-blocks-3 ul">
                <li>患者信息</li>
                <li>医生及计划信息</li>
                <li>计划信息</li>
                <li>操作</li>
            </ul>
            <!-- table -->
@ -87,10 +87,10 @@
                        <div class="all flex-box">
                            <div class="dataa flex-box">
                                <div :class="{ quote: isActive}"></div>
                                <img :src="setImgSrc(data.photo)" width="40" height="40" class="c-images-cycle" />
                                <img :src="setImgSrc(data.photo)" @click="checkPatient(data)" width="40" height="40" class="c-images-cycle" />
                                <p class="xinxi">
                                    <span>{{data.patientName}}
                                    </span>&nbsp;&nbsp;(&nbsp;{{data.sex}}&nbsp;{{data.age}}岁&nbsp;)
                                    </span>&nbsp;&nbsp;(&nbsp;{{data.sex}}&nbsp;{{data.age}}岁&nbsp;) <button class="recoveryPlan" @click="recoveryPlan(data)">康复管理</button>
                                    <br><span :id="'hospitalName_'+data.id" style="font-size: 14px;color: #999999;">{{data.hospitalName}}</span></p>
                                <p class="biaoqian" :id="'quote_'+data.id">
                                    <span class="span"></span> <span>{{data.healthyCondition}}</span>
@ -115,13 +115,14 @@
                                </p>
                            </div>
                            <div class="datad flex-box">
                                <button @click="morePlan(data)">
                                    <a href="javascript: void(0)">更多计划</a>
                                </button>
                               
                                <button>
                                    <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                                </button>
                                <button class="stopBtn" @click="stop(data)" :data-id="data.id" :id="'stopBtn_'+data.id">中止计划</button>
                                <button @click="morePlan(data)">
                                    <a href="javascript: void(0)">更多计划</a>
                                </button>
                            </div>
                        </div>
                    </td>

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

@ -37,7 +37,7 @@
                                    <div class="dataatop">
                                        <div class="dac flex-box">
                                            <p>
                                           <img :src="setImgSrc(dat.patientPhoto)" width="40" height="40" class="c-images-cycle" />
                                           <img :src="setImgSrc(dat.patientPhoto)" @click="checkPatient()" width="40" height="40" class="c-images-cycle" />
            
                                            </p>
                                            <div class="xinxi">
@ -139,7 +139,7 @@
                                </p>
                            </div>
                            <div class="detaild">
                                <a href="javascript: void(0)" @click="checkPatient()">查看患者</a>
                                <!-- <a href="javascript: void(0)" @click="checkPatient()">查看患者</a> -->
                                <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                                <a href="javascript: void(0)"  @click="stop(data)" :id="'stopBtn_'+data.planId">中止计划</a>
        

+ 31 - 24
app/rehabilitation/html/service_item_content.html

@ -29,45 +29,52 @@
		    <div class="panel-collapse collapse" :class="{in:collapseIndex==index}"  role="tabpanel" aria-labelledby="headingOne">
		      	<div class="panel-body">
		      		<div class="service-content">{{service.content}}</div>
		      		<div class="service-address ptb20">
		      		<div class="service-address ptb20 mb10">
		      			<div class="flex-box">
		      				<div class="flex-box-item">
		      					<p class="m0">地点:{{service.hospitalName}}</p>
		      					<p class="m0">时间:{{service.executeTime | formatDate}}</p>
		      					<p class="m0">服务地点:{{service.hospitalName}}</p>
		      					<p class="m0">服务时间:{{service.executeTime | formatDate}}</p>
		      				</div>
		      				<div class="flex-box-item">
		      					<p class="m0 yslb">执行:<span v-for="(doctor,index) in service.executeDoctorList">{{doctor}}</span></p>
		      					<p class="m0">收费:{{service.expense}}元</p>
		      					<p class="m0 yslb">执行人:<span v-for="(doctor,index) in service.executeDoctorList">{{doctor}}</span></p>
		      					<p class="m0">服务收费:{{service.expense}}元</p>
		      				</div>
		      			</div>
		      		</div>
		      		<div class="service-operation pt10">
		      			<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">
			      						{{item.adminTeamName}}
			      					</div>
			      					<div class="flex-box-item">
			      						{{item.createTime}}
			      					</div>
		      		<div class="service-operation">
		      			<div style="border-bottom: 1px solid #D7D4F0;">
		      				<div class="pb10">
			      				指导与汇报记录&emsp;<span class="view-detail" v-if="service.messageList && service.messageList.length" :class="{active:isCollapse}" @click="chakan"><i class="icon icon-check mr5 icon-16"></i>{{isCollapse?'收起详情':'查看详情'}}</span>
			      				<div class="pull-right" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
			      					<span class="view-detail" @click="zdly(service)" v-if="service.isCreate && (service.isMyTask!=1)">指导留言</span>
			      					<span class="view-detail" @click="zdly(service)" v-if="service.isCK">查看留言</span>
			      				</div>
		      				</div>
		      				<div class="record-list mb10" :class="{active:isCollapse}">
			      				<div class="record-item mb10" v-for="item in service.messageList">
			      					<div class="flex-box c-999 f14">
				      					<div class="flex-box-item">
				      						{{item.adminTeamName}}
				      					</div>
				      					<div class="flex-box-item">
				      						{{item.createTime}}
				      					</div>
				      				</div>
				      				<div class="f14 c-333" v-html="getContent(item.content,item.contentType)"></div>
			      				</div>
			      				<div class="f14 c-333" v-html="item.content | getContent(item.contentType)"></div>
		      				</div>
		      				<p class="c-999" style="margin-top: -10px;"  v-if="service.messageList && !service.messageList.length">暂无记录</p>
	      				</div>
		      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
		      			<div class="flex-box btns-group clearfix" 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 && service.status!=2 && service.isMyTask==1" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1 && !service.isZK && service.isMyTask==1" @click="qwapp">随访</button>
		      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isCreate && (service.isMyTask!=1)">指导留言</button>
		      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isCK">查看留言</button>
		      				<button class="btn btn-fuwuma" v-if="service.itemType==1 && service.operate!=1 && service.isMyTask==1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
		      				<button class="btn btn-fuwuma" v-if="service.operate==1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">确认完成</button>
		      				<button class="btn btn-fuwuma" v-if="service.itemType==0 && service.operate!=1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">确认完成</button>
		      				<button class="btn btn-zhidao" v-if="service.itemType==1 && service.operate!=1 && service.isMyTask==1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
		      				<button class="btn btn-fuwuma" v-if="service.operate==1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">记录服务</button>
		      				<button class="btn btn-fuwuma" v-if="service.itemType==0 && service.operate!=1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">记录服务</button>
		      			</div>
		      			<div class="complete-info pt10" v-if="service.status==1">
		      			<div class="complete-info" 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>

+ 13 - 11
app/rehabilitation/js/guide_the_message.js

@ -260,6 +260,19 @@
					}
				})
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '【语音】';
				}else if(type==19){
					res = '【聊天记录】';
				}else if(type==12){
					res = '【视频】';
				}
				return res;
			}
		},
		filters: {
			formatDate: function(value, format) {
@ -287,17 +300,6 @@
			getImgUrl: function(value) {
				var url = httpRequest.getImgUrl(value);
				return url;
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '[语音](只能在聊天窗口里查看)';
				}else if(type==19){
					res = '[聊天记录](只能在聊天窗口里查看)';
				}
				return res;
			}
		}
	})

+ 22 - 0
app/rehabilitation/js/health_control.js

@ -348,6 +348,28 @@ layui.use('element', function () {
            modelControl: function () {
                location.href = "../../rehabilitation/html/management.html"
            },
            checkPatient: function (data) {
                var vm = this
                layer.open({
                    type: 2,
                    area: ['750px', '650px'],
                    shade: 0.5,
                    title: '居民信息',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn: 1,
                    shift: 5,
                    shadeClose: false, //点击遮罩关闭层
                    content: '../../temporary/html/userInfo.html?patient=' + data.patientCode
                })
               
                // location.href = "" + 
            },
            recoveryPlan:function (data){
                location.href = "../../recover/html/personal-manage.html?patientCode="+data.patientCode
                    
            }
        }

+ 13 - 11
app/rehabilitation/js/service_item_content.js

@ -242,6 +242,19 @@
					}
				})
				
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '【语音】';
				}else if(type==19){
					res = '【聊天记录】';
				}else if(type==12){
					res = '【视频】';
				}
				return res;
			}
		},
		filters:{
@ -270,17 +283,6 @@
			getImgUrl: function(value) {
				var url = httpRequest.getImgUrl(value);
				return url;
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '[语音](只能在聊天窗口里查看)';
				}else if(type==19){
					res = '[聊天记录](只能在聊天窗口里查看)';
				}
				return res;
			}
		}
	})

+ 33 - 0
js/flatpickr/flatpickr.l10n.zh.js

@ -0,0 +1,33 @@
/* flatpickr v4.5.2, @license MIT */
(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
    typeof define === 'function' && define.amd ? define(['exports'], factory) :
    (factory((global.zh = {})));
}(this, (function (exports) { 'use strict';
    var fp = typeof window !== "undefined" && window.flatpickr !== undefined ? window.flatpickr : {
      l10ns: {}
    };
    var Mandarin = {
      weekdays: {
        shorthand: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
        longhand: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]
      },
      months: {
        shorthand: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
        longhand: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
      },
      rangeSeparator: " 至 ",
      weekAbbreviation: "周",
      scrollTitle: "滚动切换",
      toggleTitle: "点击切换 12/24 小时时制"
    };
    fp.l10ns.zh = Mandarin;
    var zh = fp.l10ns;
    exports.Mandarin = Mandarin;
    exports.default = zh;
    Object.defineProperty(exports, '__esModule', { value: true });
})));