yht2016 4 anos atrás
pai
commit
e1a98e389a

+ 1 - 1
app/rehabilitation/html/guide_the_message.html

@ -167,7 +167,7 @@
				        <img id="bigimg" style="border:5px solid #fff;" src="" />
				    </div>
				</div>
	      		<div class="text-center ptb50" v-if="service.status!=1 && service.isMyTask==1 && service.status!=1 && service.type==1">
	      		<div class="text-center ptb50" v-if="islimit&&service.planStatus!=0 && service.status!=1 && service.isMyTask==1 && service.type==1">
	      			<button class="btn btn-zhidao" @click="qrwc(service.patient,service.type)">确认完成</button>
	      		</div>
	      	</div>

+ 8 - 1
app/rehabilitation/js/guide_the_message.js

@ -44,7 +44,6 @@ top.rehabilitationGuideVue = new Vue({
			messageList:{},
		},
		pId: httpData['pId'], // 康复计划id
		oprateType: httpData['oprateType'], // oprateType 1 查看单个服务项
		patient: httpData['patient'],
		patientName: decodeURI(httpData['patientName']),
		layerIndex: undefined,
@ -310,6 +309,14 @@ top.rehabilitationGuideVue = new Vue({
		},
		qrwc: function(patient,type) {
			var vm = this;
			if(!vm.service.node){
				showErrorMessage('请填写服务记录')
				return
			}
			if(!vm.upImgs.length){
				showErrorMessage('请上传相关记录')
				return
			}
			vm.saveRehabilitationOperateRecord(vm.planid,type);
		},
		saveRehabilitationOperateRecord:function(planDetailId, type, relationCode, flag){

+ 5 - 5
app/rehabilitation/js/rehabilitation_management.js

@ -245,7 +245,7 @@
						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,
						content: '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&pId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
						end:function(){
							vm.goToLoadData(true);	
						}
@ -555,8 +555,8 @@
				var lastDay=(__days.concat()).pop().day;
				lastDay=lastDay>9?lastDay:'0'+lastDay;
				var params={
					executeEndTime:__days[0].date+'-'+__days[0].day+' 00:00:00',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
					executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 23:59:59',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
					executeEndTime:__days[0].date+'-'+__days[0].day+' 23:59:59',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
					executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 00:00:00',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
					planId:vm.planId,//计划id
					searchTask:vm.searchTask,//快速查找任务:(1、我的任务,2、随访,3、复诊,4、健康教育)
					status:vm.status,//任务状态(0未完成,1已完成,2已预约)
@ -636,8 +636,8 @@
				var lastDay=(__days.concat()).pop().day;
				lastDay=lastDay>9?lastDay:'0'+lastDay;
				var params={
					executeEndTime:__days[0].date+'-'+__days[0].day+' 00:00:00',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
					executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 23:59:59',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
					executeEndTime:__days[0].date+'-'+__days[0].day+' 23:59:59',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
					executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 00:00:00',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
					planId:vm.planId,//计划id
					searchTask:vm.searchTask,//快速查找任务:(1、我的任务,2、随访,3、复诊,4、健康教育)
					status:vm.status,//任务状态(0未完成,1已完成,2已预约)

+ 1 - 1
app/rehabilitation/js/service_item_content.js

@ -331,7 +331,7 @@ methods:{
			closeBtn:1,
			shift: 5,
			shadeClose: false, //点击遮罩关闭层
			content: '../../rehabilitation/html/guide_the_message.html?planid='+planDetaiId,
			content: '../../rehabilitation/html/guide_the_message.html?planid='+planDetaiId+'&pId='+vm.planId+'&patient='+vm.patient+'&patientName='+vm.patientName,
			end: function() { // 未点击确定按钮,点击关闭按钮  
				vm.getServiceItemList();    
			}

+ 3 - 3
component/rehabilitation/server-items-detail.js

@ -621,8 +621,8 @@ Vue.component('server-items-detail', {
			var lastDay=(__days.concat()).pop().day;
			lastDay=lastDay>9?lastDay:'0'+lastDay;
			var params={
				executeEndTime:__days[0].date+'-'+__days[0].day+' 00:00:00',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
				executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 23:59:59',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
				executeEndTime:__days[0].date+'-'+__days[0].day+' 23:59:59',//日历开始时间(格式:yyyy-MM-dd HH:mm:ss)
				executeStartTime:(__days.concat()).pop().date+'-'+lastDay+' 00:00:00',//日历结束时间(格式:yyyy-MM-dd HH:mm:ss)
				planId:vm.planid,//计划id
				searchTask:vm.service.type, // 服务项
				status: null, //任务状态(0未完成,1已完成,2已预约)
@ -937,7 +937,7 @@ Vue.component('server-items-detail', {
				return ;
			}
			if(type==1){ // 单个服务项
				var s = '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&oprateType=1'+'&pId='+vm.planid+'&patient='+vm.patientcode+'&patientName='+vm.patientname
				var s = '../../rehabilitation/html/guide_the_message.html?planid='+planids+'&pId='+vm.planid+'&patient='+vm.patientcode+'&patientName='+vm.patientname
				if(recordId){
					s += '&recordId='+ recordId
				}