bug

app/rehabilitation/js/guide_the_message.js

@@ -173,10 +173,13 @@ top.rehabilitationGuideVue = new Vue({
			var loadding = top.layer.load(0, {
				shade: false
			}); //0代表加载的风格，支持0-2
			rehaAPI.serviceItem({
			var params = {
				planDetailId: vm.planid,
				recordId: vm.recordId
			}).then(function(res) {
			}
			if(vm.recordId){
				params['recordId'] = vm.recordId
			}
			rehaAPI.serviceItem(params).then(function(res) {
				top.layer.close(loadding);
				if(res.status == 200) {
					vm.service = res.data;

app/rehabilitation/js/rehabilitation_management.js

@@ -229,35 +229,37 @@
					return ;
				}
				if(type==1){ // 单个服务项
					top.layer.open({
					  type: 2,
					  area: ['800px', '700px'],
					  shade: 0.5,
					  title: '服务项目内容',
					  fixed: true, //不固定
					  maxmin: true,
					  closeBtn:1,
					  shift: 5,
					  shadeClose: false, //点击遮罩关闭层
					  content: '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&oprateType=1'+'&pId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
					layer.open({
						type: 2,
						area: ['800px', '700px'],
						shade: 0.5,
						title: '服务项目内容',
						fixed: true, //不固定
						maxmin: true,
						closeBtn:1,
						shift: 5,
						shadeClose: false, //点击遮罩关闭层
						content: '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&oprateType=1'+'&pId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
						end:function(){
							vm.goToLoadData(true);	
						}
					});
					return ;
				}
				layer.open({ // 康复计划的所有服务项
				  type: 2,
				  area: ['800px', '700px'],
				  shade: 0.5,
				  title: '服务项目内容',
				  fixed: true, //不固定
				  maxmin: true,
				  closeBtn:1,
				  shift: 5,
				  shadeClose: false, //点击遮罩关闭层
				  content: '../../rehabilitation/html/service_item_content.html?planids='+planids+'&planId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
				  end:function(){
				  	vm.goToLoadData(true);	
				  }
					
					type: 2,
					area: ['800px', '700px'],
					shade: 0.5,
					title: '服务项目内容',
					fixed: true, //不固定
					maxmin: true,
					closeBtn:1,
					shift: 5,
					shadeClose: false, //点击遮罩关闭层
					content: '../../rehabilitation/html/service_item_content.html?planids='+planids+'&planId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
					end:function(){
						vm.goToLoadData(true);	
					}
				});
			},
			excuteServerItem: function(type, detailId){
@@ -560,7 +562,7 @@
				rehaAPI.calendarPlanDetailList(params).then(function(res){
					if(res.status==200){
						var _currentTimeStamp=+new Date(new Date().setHours(0, 0, 0, 0))
						vm.timeAxisData=_.map(res.data||{},function(o){
						var list=_.map(res.data||{},function(o){
							var _time=o.executeTime.split(' ');
							var thatTime=+new Date(_time[0]);
							var future=_currentTimeStamp>thatTime?0:(_currentTimeStamp==thatTime?1:2);
@@ -568,12 +570,50 @@
							var _html=o.status==2?'预':(future==-1?'逾':'');
							_html=future==1?'今':_html;
							if(_html=='预') future=3;
							// var d = new Date(o.execute_time);
							// if(d.format("yyyy-MM-dd") == new Date().format("yyyy-MM-dd")) {
							// 	o.dateClass = "today";
							// 	o.firstSort = '1'
							// 	o.dateText = "今";
							// 	o.today = true;
							// 	obj = getStatusInfo(o.status);
							// 	future=1
							// 	if(o.status) {
							// 		o.secondSort = '2'
							// 	} else {
							// 		o.secondSort = '1'
							// 	}
							// } else if(d > new Date()) {
							// 	o.firstSort = '3 '
							// 	o.dateText = "";
							// 	o.dateClass = "blue";
							// 	future=2
							// 	if(o.status) {
							// 		o.secondSort = '2'
							// 	} else {
							// 		o.secondSort = '1'
							// 	}
							// } else {
							// 	obj = getStatusInfo(o.status);
							// 	o.firstSort = '2'
							// 	future=0
							// 	if(o.status == 0) {
							// 		o.dateClass = "overlay";
							// 		o.dateText = "逾";
							// 		o.secondSort = '1'
							// 	} else {
							// 		o.dateText = "";
							// 		o.dateClass = "";
							// 		o.secondSort = '2'
							// 	}
							// }
							o.html=_html
							o.date=_time[0];
							o.time=_time[1];
							o.future=future;
							return o;
						})||[];
						vm.timeAxisData = list
					}
				})
			},

component/rehabilitation/server-items-detail.js

@@ -873,7 +873,7 @@ Vue.component('server-items-detail', {
				return ;
			}
			if(type==1){ // 单个服务项
				top.layer.open({
				layer.open({
					type: 2,
					area: ['800px', '700px'],
					shade: 0.5,
@@ -884,6 +884,9 @@ Vue.component('server-items-detail', {
					shift: 5,
					shadeClose: false, //点击遮罩关闭层
					content: '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&oprateType=1'+'&pId='+vm.planid+'&patient='+vm.patientcode+'&patientName='+vm.patientname+'&recordId='+recordId,
					end:function(){ // 未点击确定按钮，点击关闭按钮  
				　　　　vm.getServiceItem() // 刷新
				　　}
				});
				return ;
			}
@@ -899,7 +902,7 @@ Vue.component('server-items-detail', {
				shadeClose: false, //点击遮罩关闭层
				content: '../../rehabilitation/html/service_item_content.html?planids='+planids+'&planId='+vm.planid+'&patient='+vm.patientcode+'&patientName='+vm.patientname,
				end:function(){
				vm.goToLoadData(true);	
					vm.initData();	
				}
				
			});