Merge branch 'master' of huhongkun/PC-application into master

app/recover/css/new_recover.css

@@ -186,6 +186,7 @@ ul {
}
.el-date-editor .el-range__icon, .el-date-editor .el-range-separator, .el-date-editor .el-range__close-icon {
	line-height: 18px;
	width: 20px;
}
.el-date-editor .el-range-input::-webkit-input-placeholder, .el-input__inner::-webkit-input-placeholder {
   color: #12b7f5;
@@ -209,3 +210,11 @@ ul {
	height: 40px;
	resize: none;
}
.el-date-editor .el-range__close-icon {
    font-size: 14px;
    color: #C0C4CC;
    width: 5px;
    display: inline-block;
    float: right;
    line-height: 20px;
}

app/recover/html/new_recover.html

@@ -87,7 +87,7 @@
		        	</ul>
		        	<h4 class="h30 m0 c-f14 c-border-b c-999">医嘱小结</h4>
		        	<!--<p class="m0 pt10 c-333">依旧本次判断，对新消息进行出院诊断做出以下结论：忧郁啥啥事等等等问题</p>-->
		        	<textarea v-bind:disabled="edit" class="tipText m0 pt10 c-333 mt10" style="width: 100%; border:1px solid #e1e1e1; resize:none;text-indent:28px" v-html="subsidiaryInfo.data.dischargeOrder"></textarea>
		        	<textarea v-bind:disabled="edit" class="tipText m0 pt10 c-333 mt10" style="height: 200px; width: 100%; border:1px solid #e1e1e1; resize:none;text-indent:28px" v-html="subsidiaryInfo.data.dischargeOrder"></textarea>
		        	<button type="button" class="btn btn-default fr" style="width: 60px; background: #12B7F5; border-radius: 0px ;border: 0px ;" @click="editdiagnosis()" v-html="edit == true? '编辑':'保存'"></button>
	        	</div>
	        </div>
@@ -156,7 +156,7 @@
	        											<!--<p class="lh24 pl10 mb5 mr20 clearfix" v-for="(time, ind) in detail.specialistServiceItemDO.selectDateRange" :key="ind" v-if="detail.specialistServiceItemDO.selectDateRange.length">
		        											<span class="pb10 mr10">{{time.startTime}}</span>至<span class="pb10 ml10">{{time.endTime}}</span><span class="pb10 ml5 c-red cur-pit" @click="spliceTimeRange(index, ind)">删除</span>
		        										</p>-->
	        											<el-date-picker v-model="detail.value14" type="daterange" :picker-options="pickerOptions1" value-format="yyyy-MM-dd" @input="getRandgeDate(index)" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
	        											<el-date-picker  v-model="detail.value14" type="daterange" :picker-options="pickerOptions1" value-format="yyyy-MM-dd" @input="getRandgeDate(index)" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
	        										</div>
	        										<span class="fl lh24 mlr10 c-999">或</span>
	        										<div class="fl maxw600 c-border mb10">
@@ -218,8 +218,8 @@
															<span class="fr lh18 b-r-3 c-f12 ml5 bgc-4dcd70 plr5 c-fff" v-if="project3.flag == 1 || project3.flag == 3">社区</span>
															<span class="fr lh18 b-r-3 c-f12 ml5 bgc-55cefc plr5 c-fff" v-if="project3.flag == 2 || project3.flag == 3">医院</span>
														</div>
														<span class="fr h30 btn cur-pit plr10 bgc-12b7f5 c-fff b-r-3" v-if="!project3.isSelect" @click="addProject(index, index2, index3, project3)">添加</span>
														<span class="fr h30 btn plr10 bgc-e1e1e1 c-fff b-r-3" v-else>添加</span>
														<span class="fr h30 btn cur-pit plr10 bgc-12b7f5 c-fff b-r-3" style="padding: 0 10px;" v-if="!project3.isSelect" @click="addProject(index, index2, index3, project3)">添加</span>
														<span class="fr h30 btn plr10 bgc-e1e1e1 c-fff b-r-3" style="padding: 0 10px;" v-else>添加</span>
													</li>
												</ul>
											</li>
@@ -275,7 +275,7 @@
                el: "#app",
                data: {
                	pickerOptions1: {
			        	disabledDate(time) {
			        	disabledDate: function(time) {
			            	return time.getTime() < Date.now() - 8.64e7;
			        	}
			        },