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

app/recover/css/new_recover.css

@@ -151,3 +151,6 @@ ul {
	background: url(../images/zhixiang_icon.png) no-repeat no-repeat right center;
	background-size: 14px 14px;
}
.f-w500 {
	font-weight: 500;
}

app/recover/html/new_recover.html

@@ -38,14 +38,14 @@
		        		<h3 class="ptb10 m0 c-f16">{{patiInfo.name}}</h3>
		        		<span class="c-position-a set-qiehuan cur-pit" @click="selectPatient()"></span>
		        	</div>
		        	<h4 class="h30 m0 c-f14 c-border-b">基本信息</h4>
		        	<h4 class="h30 m0 c-f14 c-border-b f-w500">基本信息</h4>
		        	<ul class="c-333 m0 p0 pb20">
		        		<li class="pt10"><span class="c-999">性&emsp;&emsp;别：</span>{{patiInfo.sex == 1 ? "男" : "女"}}</li>
		        		<li class="pt10"><span class="c-999">年&emsp;&emsp;龄：</span>{{patiInfo.age}}岁</li>
		        		<li class="pt10"><span class="c-999">身份证号：</span>{{patiInfo.idcard}}</li>
		        		<li class="pt10"><span class="c-999">地&emsp;&emsp;址：</span>{{patiInfo.address}}</li>
		        	</ul>
		        	<h4 class="h30 m0 c-f14 c-border-b">家庭医生</h4>
		        	<h4 class="h30 m0 c-f14 c-border-b f-w500">家庭医生</h4>
		        	<ul class="c-333 m0 p0 pb20">
		        		<li class="pt10"><span class="c-999">签约社区：</span>{{patiInfo.ssHospitalName || patiInfo.jtHospitalName}}</li>
		        		<li class="pt10"><span class="c-999">全科医生：</span>{{patiInfo.ssDoctorName || patiInfo.jtDoctorName}}</li>
@@ -65,7 +65,7 @@
	        </div>
	        <div class="fl c-h100 w-100-300">
	        	<div class="c-h100 plr5" v-if="!isPlan">
		        	<h4 class="m0 pl15 lh40 c-border-b c-position-r"><span class="c-position-a set-blue-span"></span>配置康复计划</h4>
		        	<h4 class="m0 pl15 lh40 c-border-b f-w500 c-position-r"><span class="c-position-a set-blue-span"></span>配置康复计划</h4>
		        	<div style="overflow: hidden; height: calc(100% - 41px);">
		        		<div style="overflow: auto; height: 100%;">
				        	<div class="un-select c-t-center pt45" v-if="!patiInfo">
@@ -82,7 +82,7 @@
		        <div class="clearfix c-h100" v-else>
		        	<div class="fl w-100-300 c-h100">
		        		<div class="plr5 c-h100-79">
		        			<h4 class="m0 pl15 lh40 c-border-b set-label c-position-r">
		        			<h4 class="m0 pl15 lh40 c-border-b set-label f-w500 c-position-r">
		        				<em class="c-position-a set-blue-span"></em>
		        				配置康复计划
		        				<span v-for="(label, index) in spanLabel" :key="index" class="fr ml20 pl20 c-f14 c-999 cur-pit" :class="{'active': index == labelIndex}" @click="setLabelIndex(index, label)">{{label.labelName}}</span>
@@ -110,7 +110,7 @@
        										<p class="fl lh18 mb5 mr20 clearfix" v-for="(time, ind) in detail.specialistServiceItemDO.executeTime" :key="ind" v-if="detail.specialistServiceItemDO.executeTime.length">
        											<span class="fl">{{time}}</span><span class="fl ml5 c-red cur-pit" @click="spliceTimeArr(index, ind)">删除</span>
        										</p>
        										<span class="fl c-12b7f5 cur-pit calendar" contenteditable="true" readonly @mousedown="selectTime(index)" class=flatpickr data-enable-time=true data-time_24hr=true>添加</span>
        										<span class="fl c-12b7f5 cur-pit calendar" contenteditable="true" readonly @keyup="setfont()" @keydown="setfont()" @mousedown="selectTime(index)" class=flatpickr data-enable-time=true data-time_24hr=true>{{surefont}}</span>
        										<span class="fl c-12b7f5 cur-pit ml10" v-show="sureIndex == index">确定</span>
        									</div>
		        						</div>
@@ -136,7 +136,7 @@
		        	</div>
		        	<div class="fr w300 c-h100 c-border-l">
		        		<div class="plr5 c-h100">
		        			<h4 class="m0 pl15 lh40 c-border-b c-position-r">
		        			<h4 class="m0 pl15 lh40 c-border-b c-position-r f-w500">
		        				<em class="c-position-a set-blue-span"></em>添加其他项目
		        			</h4>
		        			<div class="clearfix mtb10 c-border">
@@ -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 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>
@@ -216,6 +216,7 @@
			recoverVue = new Vue({
                el: "#app",
                data: {
                	surefont: '添加',
                	isTest: false,
                	pati: null,
                	isPlan: false,
@@ -457,6 +458,10 @@
                		this.templateDetail.push(this.selectProjectDetail)
                		this.projectList[index].item[index2].hospitalServiceItems[index3] = this.selectProjectDetail
                	},
                	setfont: function() {
                		alert(1)
                		this.surefont = "添加"
                	},
                	// 查看项目
                	lookProject: function(o) {
                		selectPatientIndex = layer.open({
@@ -539,10 +544,10 @@
                				currentEle.val(str)
                			},
                			onClose: function(obj, str) {
                				vm.sureIndex = null
                				if(!str) {
                					return false;
                				}
                				vm.sureIndex = null
                				vm.templateDetail[index].specialistServiceItemDO.executeTime.push(str)
                				vm.allFee += Number(vm.templateDetail[index].expense)
                			}