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

app/guidance/css/index.css

@@ -32,7 +32,7 @@ ul {
	float: right;
}
.ui-popup-full { width: 50%; }
/*.ui-popup-full { width: 50%; }*/
#app>.ui-grid, #app>.ui-grid .ui-grid {
	height: 100%;

app/rehabilitation/html/service_item_content.html

@@ -65,7 +65,7 @@
		      				<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 && service.isMyTask==1" @click="fwm(service.planDetaiId,service.patient)">服务码</button>
		      				<button class="btn btn-fuwuma" v-if="service.operate==1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">确认完成</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==0 && service.operate!=1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">完成</button>
		      				<button class="btn btn-fuwuma" v-if="service.itemType==0 && service.operate!=1 && service.isMyTask==1" @click="goToFinish(service.planDetaiId)">确认完成</button>
		      			</div>
		      			<div class="complete-info pt10" v-if="service.status==1">
			      			<div class="complete-title">完成情况</div>