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

app/recover/html/new_recover.html

@@ -209,7 +209,7 @@
				})
			}
			// 初始化加载flatpickr插件
			$(".calendar").flatpickr();
//			$(".calendar").flatpickr();
			
			recoverVue = new Vue({
                el: "#app",
@@ -519,8 +519,6 @@
                		this.labelCode = label.code
                	},
                	selectTime: function(index) {
                		event.cancelBubble = true;
                		event.stopPropagation();
                		var currentEle = $(event.target),
                			vm = this;
                		currentEle.flatpickr({

app/rehabilitation/html/guide_the_message.html

@@ -124,13 +124,14 @@
	      				</div>
	      			</div>
	      			<div class="flex-box btns-group" v-if="service.isMyTask==1 || service.isCreate">
		      				<button class="btn btn-yuyue" v-if="service.reserve==1" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1" @click="zwkf">随访</button>
		      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isZD">指导留言</button>
		      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isCK">查看留言</button>
		      			</div>
	      				<button class="btn btn-yuyue" v-if="service.reserve==1 && !service.isZK" @click="qwapp">转诊预约</button>
	      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1 && !service.isZK" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
	      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1 && !service.isZK" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
	      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1 && !service.isZK" @click="qwapp">随访</button>
	      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isZD">指导留言</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" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
	      			</div>
	      		</div>
	      		<div class="complete-info pt10">
	      			<div class="complete-title">完成情况</div>
@@ -245,11 +246,26 @@
						},
						getServiceItem:function(){
							var vm=this;
							var loginDoctor = JSON.parse(window.localStorage.getItem('wlyyAgent'));
							var loadding = top.layer.load(0, {shade: false}); //0代表加载的风格，支持0-2
							rehaAPI.serviceItem({planDetailId:vm.planid}).then(function(res){
								top.layer.close(loadding);
								if(res.status==200){
									vm.service=res.data;
									if(vm.service.isMyTask==1){//执行者										
									if(loginDoctor.doctorType!=1){//说明是家医
											vm.service.isCK=true;//无法显示按钮
										}else{//专科
											vm.service.isCK=false;
											vm.service.isZD=true;
											vm.service.isZK=true;
										}
									}else{
										if(loginDoctor.doctorType==vm.service.specialistDoctorCode){//说明我自己是创建者
											vm.service.isZD=false;//无法显示按钮
											vm.service.isCreate=true;
										}
									}
								}else{
									top.layer.msg(res.msg,{icon:5});
								}

app/rehabilitation/html/service_item_content.html

@@ -117,14 +117,13 @@
		      				</div>
	      				</div>
		      			<div class="flex-box btns-group" v-if="service.isMyTask==1 || service.isCreate">
		      				<button class="btn btn-yuyue" v-if="service.reserve==1" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1" @click="zwkf">随访</button>
		      				<button class="btn btn-yuyue" v-if="service.reserve==1 && !service.isZK" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1 && !service.isZK" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1 && !service.isZK" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1 && !service.isZK" @click="qwapp">随访</button>
		      				<button class="btn btn-zhidao" @click="zdly(service)" v-if="service.isZD">指导留言</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" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
		      				<!--<button class="btn btn-fuwuma" @click="fwm(service.planDetaiId,service.patient)">服务码</button>-->
		      				<button class="btn btn-fuwuma" v-if="service.operate==1" @click="goToFinish(service.planDetaiId)">完成</button>
		      			</div>
		      		</div>
@@ -186,6 +185,7 @@
											}else{//专科
												o.isCK=false;
												o.isZD=true;
												o.isZK=true;//为了隐藏一切不必要的按钮
											}
										}else{
											if(loginDoctor.doctorType==o.specialistDoctorCode){//说明我自己是创建者