Xiao_yanpeng 7 سال پیش
والد
کامیت
93b3c46e3f

+ 1 - 1
app/record/css/consultation.css

@ -1,4 +1,4 @@
.consultation-list{padding: 0px 20px;margin: 0;overflow: hidden;height: calc(100% - 50px);}
.consultation-list{padding: 0px 20px;margin: 0;overflow: hidden;}
.consultation-list-item{cursor: pointer;list-style: none;border: 1px solid #d7dce6;margin-top: 20px;min-height: 80px;border-radius: 8px;overflow: hidden;position: relative;}
.con-user-info{padding: 10px 40px 10px 15px;position: relative;overflow: hidden;}
.con-avatar{width: 40px;height: 40px;border-radius: 100%;position: absolute;top: 20px;left: 20px;}

+ 8 - 3
app/record/css/follow-up.css

@ -1,12 +1,17 @@
.consultation-list{padding: 20px 20px 0;margin: 0;}
.followup-list{padding: 0px 20px;margin: 0;overflow: hidden;}
.consultation-list-item{cursor: pointer;list-style: none;border: 1px solid #d7dce6;margin-top: 20px;min-height: 80px;border-radius: 8px;overflow: hidden;position: relative;}
.follow-user-info{padding: 10px 40px 10px 15px;position: relative;overflow: hidden;height: 80px;}
.leave-word-container{min-height:69px;}
.follow-up-doctor{font-weight: 700;color: #333;font-size: 16px;border-bottom: 1px solid #d7dce6;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 20px;height: 40px;line-height: 40px;margin-bottom: 0;padding-right: 10px;}
.follow-status{position: absolute;right: 10px;top: -1px;}
.follow-status:before{content: '进行中';background: #fca701;width: 26px;height: auto;color: #fff;display: inline-block;line-height: 1.2;font-size: 13px;text-align: center;padding: 5px 5px 8px;border-bottom-left-radius: 13px;border-bottom-right-radius: 13px;}
.follow-status[data-status="2"]:before{content: '已完成';background: #12b7f5;}
.follow-status:before{content: '';width: 26px;height: auto;color: #fff;display: inline-block;line-height: 1.2;font-size: 13px;text-align: center;padding: 5px 5px 8px;border-bottom-left-radius: 13px;border-bottom-right-radius: 13px;}
.follow-status[data-status="1"]:before{content: '已完成';background: #ccc;}
.follow-status[data-status="2"]:before{content: '计划中';background: #19D5C5;}
.follow-status[data-status="3"]:before{content: '进行中';background: #fca701;}
.start-time{font-weight: 100;font-size: 14px;}
.completion-time{margin-bottom: 0;font-size: 13px;}
.act-type{margin-bottom: 20px;}
.leave-word{margin-bottom: 0;font-size: 12px;text-overflow: -o-ellipsis-lastline;text-overflow: -webkit-ellipsis-lastline;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;text-overflow:display: -o-box;-webkit-line-clamp:3;-o-line-clamp:3;-webkit-box-orient: vertical;-o-box-orient: vertical;}
.consultation-list-item:first-child{margin-top: 0px;}
.pagination{margin: 20px 0px 15px;}
.fu-tag{display: inline-block; background-color: #12b7f5; color: #fff; font-size: 12px; height: 20px; line-height: 20px; width: 50px; text-align: center; margin-left: 10px; font-weight: normal; border-radius: 10px;}

+ 3 - 2
app/record/html/follow-up.html

@ -14,10 +14,11 @@
		<script type="text/javascript" src="../../../js/vue.js"></script>
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js" ></script>
		<script src="../../../js/es6-promise.js"></script>
		<script src="../../../component/record/follow-up-list.js"></script>
		<script type="text/javascript" src="../../../component/common/pagination.js" ></script>
		<script src="../../../plugins/slimscroll/jquery.slimscroll.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js"></script>
		<script src="../../../api/record-api.js"></script>
		<script type="text/javascript" src="../../../component/common/pagination.js" ></script>
		<script src="../../../component/record/follow-up-list.js"></script>
		<script src="../js/follow-up.js"></script>
	</body>
</html>

+ 1 - 1
app/record/js/consultation.js

@ -20,7 +20,7 @@ new Vue({
  			}
  			recordAPI.consultList(data).then(function(res){
  				if(res.status==200){ 
						if(res.data.length){  						
						if(res.data.length>0){  						
  						vm.list=res.data;
  						$(".consultation-list").animate({scrollTop:0},0);//滚回顶部
  						$(".slimScrollBar").css('top',0);

+ 15 - 8
app/record/js/follow-up.js

@ -1,34 +1,41 @@
new Vue({
  el: '#app',
  data: {
  	total:1,//总页数
  	total:3,//总页数
  	currentPage:1,//当前页数
  	list:[]//列表集合
  	list:[],//列表集合
  	patient:null,
  	teamCode:null
  },
  methods:{
  	msgListView: function(page){
  		var vm=this;
  		if(page){
  			vm.currentPage=page;
  			var data = {patientCode:'fca8c658ffda42afa5be91e54e0268c8',
					patient:'fca8c658ffda42afa5be91e54e0268c8',
					teamCode:646,
  			var data = {
					patient:vm.patient,
					teamCode:vm.teamCode,
					page:page,
					pagesize:10}
  			recordAPI.followUpList(data).then(function(res){
  				if(res.status==200){ 
					if(res.data.length){  						
						if(res.data.length>0){  						
  						vm.list=res.data;
  						$(".followup-list").animate({scrollTop:0},0);//滚回顶部
  						$(".slimScrollBar").css('top',0);
  					}else{
  							top.toastr.info("啊喔!没有更多内容了");
  							top.toastr.info("没有更多内容了");
  					}
  				}else{
  					top.toastr.error(res.msg||("服务器返回状态码"+res.status));
  					top.toastr.error(res.msg);
  				}
  			})
  		}
  	}
  },
  mounted(){
  	this.patient = localStorage.getItem("severPatientCode");
  	this.teamCode = JSON.parse(localStorage.getItem("severPatientTeam")).id;
  	this.msgListView(this.currentPage);
  },
})

+ 0 - 1
component/record/consultation-list.js

@ -43,6 +43,5 @@ Vue.component('consultation-list', {
	mounted: function() {
		var divH = $("#tab-iframe",parent.document).height() - 75;
		$(".consultation-list").slimScroll({ height: divH,color: '#666'});
//		this.$emit('init-data', this.curPage);
	}
})

+ 11 - 9
component/record/follow-up-list.js

@ -1,17 +1,18 @@
Vue.component('follow-list', {
	template: `<ul class="consultation-list">
				<li class="consultation-list-item" @click="viewDetail(1)" v-for="(list,index) in followUpList">
					<p class="follow-up-doctor"><span class="start-time pull-right">开始时间:{{list.createTime}}</span>随访医生:{{list.doctorName}}</p>
	template: `<ul class="followup-list">
				<li v-for="(list,index) in followUpList" class="consultation-list-item" @click="viewDetail(list)">
					<p class="follow-up-doctor"><span class="start-time pull-right">开始时间:{{list.createTime}}</span>随访医生:{{list.doctorName}}<span v-if="list.prescriptionCode" class="fu-tag">长处方</span></p>
					<div class="follow-user-info">
						<span class="follow-status" :data-status="list.status" desc="1进行2结束"></span>
						<span class="follow-status" :data-status="list.status" desc="3进行2计划中1完成"></span>
						<p class="act-type">方式/类型:{{list.followupTypeName}}{{list.followupClassName?"/"+list.followupClassName:""}}</p>
						<p class="completion-time">{{list.status==1?"计划时间:"+list.followupPlanDate:"完成时间:"+list.followupDate}}</p>
						<p v-if="list.status==1" class="completion-time">完成时间:{{list.followupDate.substr(0,16)}}</p>
						<p v-else class="completion-time">计划时间:{{list.followupPlanDate.substr(0,16)}}</p>
					</div>
				</li>
			</ul>`,
	data: function() {
		return {
			followUpList: "",
			followUpList:[],
			curPage:1
		}
	},
@ -21,8 +22,8 @@ Vue.component('follow-list', {
			top.layer.open({
		      type: 2,
		      maxmin: true,
		      area: ['600px', '360px'],
		      shadeClose: true,
		      area: ['1000px', '600px'],
		      shadeClose: false,
		      content: 'ddd'
		    });
		}
@ -33,6 +34,7 @@ Vue.component('follow-list', {
		}
	},
	mounted: function() {
		this.$emit('init-data', this.curPage);
		var divH = $("#tab-iframe",parent.document).height() - 75;
		$(".followup-list").slimScroll({ height: divH,color: '#666'});
	}
})