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

app/recover/css/personal-manage.css

@@ -1,4 +1,5 @@
.bgc-f2fcfe {background-color: #f2fcfe;}
.bgc-f5f5fa {background-color: #f5f5fa;}
.bgc-dff5fc {background-color: #dff5fc;}
.w350 {width: 350px;}
.w-100-350 {width: calc(100% - 351px);}
.c-orange {color: orange;}
@@ -43,3 +44,4 @@
	background-size: 12px 12px;
}
.h73 {height: 73px;}
.w100 {width: 100px;}

app/recover/html/personal-manage.html

@@ -17,8 +17,8 @@
		<div class="content clearfix">
	        <div class="fl c-h100 w350 person_info c-border-r">
	        	<div class="plr5 c-h100">
		        	<h4 class="m0 pl10 lh40 c-border-b">个人基础信息</h4>
	    			<div class="bgc-f2fcfe mt10 ptb10 plr10">
		        	<h4 class="m0 pl15 lh40 c-border-b c-position-r"><em class="c-position-a set-blue-span"></em>个人基础信息</h4>
	    			<div class="bgc-f5f5fa mt10 ptb10 plr10">
	    				<div class="clearfix">
		    				<div class="fl w-100-66">
		    					<p class="m0 p0 mb10">
@@ -44,9 +44,9 @@
    						<span class="c-999">康复机构：</span>{{recoverPatInfo.patientInfo.rehabilitationOrg}}
    					</p>
	    			</div>
	    			<h4 class="m0 pl10 lh40 c-border-b">服务医生</h4>
	    			<h4 class="m0 pl15 lh40 c-border-b c-position-r"><em class="c-position-a set-blue-span"></em>服务医生</h4>
	    			<!--<div class="pt10 pb10" style="overflow: hidden; height: 190px;">-->
	    			<div class="pt10 pb10" style="overflow: hidden; height: calc(100% - 231px);">
	    			<div class="pt10 pb10" style="overflow: hidden; height: calc(100% - 271px);">
		    			<ul class="p0 m0 c-h100" style="overflow: auto;">
		    				<li class="clearfix plr20 ptb10 doc-li" v-for="(docInfo, index) in recoverPatInfo.serviceDoctorList" :key="index">
		    					<div class="fl set-photo">
@@ -56,7 +56,7 @@
		    						<p class="m0 p0 c-f16">{{docInfo.doctorName}}</p>
		    						<p class="m0 p0 mt10 c-999">{{docInfo.type}}</p>
		    					</div>
		    					<div class="fl ml40 lh18">
		    					<div class="fr w100 ml40 lh18">
		    						<p class="m0 p0">完成项目：<span class="c-orange">{{docInfo.finishedItem}}</span></p>
		    						<p class="m0 p0 mt10">服务次数：<span class="c-orange">{{docInfo.serviceCount}}</span></p>
		    					</div>
@@ -71,7 +71,7 @@
	    							<span class="fl">冠心病诊断</span>
	    							<span class="fr">2018-08-01</span>
	    						</p>
	    						<div class="bgc-f2fcfe plr5 ptb10" style="line-height: 20px;">
	    						<div class="bgc-f5f5fa plr5 ptb10" style="line-height: 20px;">
	    							&emsp;&emsp;这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容这是诊断内容
	    						</div>
	    					</li>
@@ -82,7 +82,7 @@
	        <div class="fl c-h100 w-100-350">
	        	<div class="fl w-100-300 c-h100">
	        		<div class="plr5">
		        		<h4 class="m0 pl10 lh40 c-border-b clearfix">康复计划<span class="fr w80 c-333 c-f12 c-t-center">进行中：{{recoverPatInfo.planUnderway}}</span><span class="fr w80 c-333 c-f12 c-t-center">已完成：{{recoverPatInfo.planFinish}}</span></h4>
		        		<h4 class="m0 pl15 lh40 c-border-b c-position-r clearfix"><em class="c-position-a set-blue-span"></em>康复计划<span class="fr w80 c-333 c-f12 c-t-center">进行中：{{recoverPatInfo.planUnderway}}</span><span class="fr w80 c-333 c-f12 c-t-center">已完成：{{recoverPatInfo.planFinish}}</span></h4>
		        		<div class="pb10" style="overflow: hidden; height: 230px;">
			    			<ul class="p0 m0 c-h100" style="overflow: auto;">
			    				<li class="clearfix plr5 ptb10 mt10 plan-li cur-pit c-border b-r-3" v-for="(plan, index) in recoverPatInfo.planList" :key="index" @click="jumpPlan(plan)">
@@ -105,10 +105,10 @@
			    			</ul>
		    			</div>
	    			</div>
	    			<h4 class="m0 pl10 pr5 lh40 c-border-tb clearfix">康复相关记录<span class="fr w80 c-333 c-f12 c-t-center">已完成：{{finishData.planDetailFinish}}</span></h4>
	    			<div class="plr10" style="overflow: hidden; height: calc(100% - 323px);">
	    			<h4 class="m0 pl15 pr5 lh40 c-border-tb clearfix c-position-r"><em class="c-position-a set-blue-span"></em>康复相关记录<span class="fr w80 c-333 c-f12 c-t-center">已完成：{{finishData.planDetailFinish}}</span></h4>
	    			<div style="overflow: hidden; height: calc(100% - 323px);">
	    				<ul class="p0 m0 c-h100 c-999" style="overflow: auto;">
	    					<li class="clearfix cur-pit record-li" v-for="(plan, index) in planDetailList" @click="lookProject(plan)">
	    					<li class="clearfix plr10 cur-pit record-li" v-for="(plan, index) in planDetailList" :class="{'bgc-dff5fc c-12b7f5':plan.istaDay}" @click="lookProject(plan)">
	    						<div class="fl w80 ptb10 c-t-right">
	    							<p class="p0 m0 lh18">{{plan.executeTime}}</p>
	    						</div>
@@ -134,7 +134,7 @@
	        	</div>
	        	<div class="fr w300 c-h100 c-border-l">
	        		<div class="plr5 c-h100">
	        			<h4 class="m0 pl10 pr5 lh40 c-border-b clearfix">就诊记录</h4>
	        			<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);">
	        				<ul class="c-h100 p0 m0" style="overflow: auto;">
	        					<li class="clearfix" v-for="(record, index) in seeRecord" :key="index">

app/rehabilitation/js/health_control.js

@@ -107,7 +107,6 @@ layui.use('element', function () {
                        var ishospitalName = val[i].hospitalName
                        vm.planCreateUser = val[i].planCreateUser
                        if (ishospitalName == null) {
                            $("#hospitalName_" + val[i].id).html("暂无社区信息")
                        }
@@ -171,7 +170,6 @@ layui.use('element', function () {
        },
        mounted() {
            var vm = this
            // vm.getModal()
            vm.getDatas()
            vm.gettypes()
@@ -205,7 +203,8 @@ layui.use('element', function () {
                            vm.wujilu = true
                        }
                        vm.docInfo = JSON.parse(window.localStorage.getItem('wlyyAgent'))
                        vm.docCode=vm.docInfo.code
                        console.log(vm.docCode)
                        vm.doctorType = vm.docInfo.doctorType
                        if (vm.doctorType != 1) {
                            $(".neironglef>button:nth-child(1)").attr('disabled', "true")
@@ -215,19 +214,25 @@ layui.use('element', function () {
                        }
                        healthAPI.doctorBaseinfo().then(function (res) {
                            vm.isLeader = res.data.isLeader
                            vm.isLeader = res.data.isLeader//0非团队长 1团队长
                            vm.level=res.data.level//1专科医生，2全科医生，3健康管理师
                            vm.planCreateUser //创建者跟登录者相等可中止操作
                            console.log(vm.doctorType)
                            for (var i = 0; i < vm.tablelist.length; i++) {
                                if (vm.isLeader == 0) {
                                if(vm.docCode!=vm.planCreateUser){
                                    $("#stopBtn_" + vm.tablelist[i].id).attr('disabled', "true")
                                    $("#stopBtn_" + vm.tablelist[i].id).addClass("falsebutton")
                                    $(".neironglef>button:nth-child(2)").attr('disabled', "true")
                                    $(".neironglef>button:nth-child(2)").addClass("falsebutton")
                                    $(".neironglef>button:nth-child(2)").css("color", "white")
                                }
                               
                            }
                            if (vm.isLeader == 0||vm.level != 1) {
                                $(".neironglef>button:nth-child(2)").attr('disabled', "true")
                                $(".neironglef>button:nth-child(2)").addClass("falsebutton")
                                $(".neironglef>button:nth-child(2)").css("color", "white")
                            }
                        })