zyz 7 years ago
parent
commit
4ad1959b2c

+ 1 - 0
api/http-request.js

@ -17,6 +17,7 @@
        server = ""  
    } else { //测试环境配置
        server = "http://172.19.103.88:9092/wlyy/"
//      server = "http://192.168.131.131:8080/"
    }
    function httpGet(url, options) {

+ 35 - 0
app/record/css/article_detail.css

@ -0,0 +1,35 @@
.article_container{position: relative;}
.article-title{font-weight: 700;font-size: 18px;margin-bottom: 0;line-height: 2;}
.app-container{padding: 10px 35px;}
.pc-container{padding: 10px 320px 10px 20px;}
.article-info{margin-bottom: 20px;margin-top: 10px;}
.article-info p{margin-bottom: 0;line-height: 1.5;}
/*手机大小*/
.mobile{width: 240px;position: fixed;right: 30px;top: 50%;margin-top: -242.5px;}
/*手机壳大小*/
.mobile-shell,.mobile-status{width: 100%;height: auto;display: block;}
/*浏览器顶部标题*/
.mobile-browser-top{padding: 5px 10px;font-size: 13px;}
.mobile-browser-title{position: absolute;text-align: center;left: 0;right: 0;}
.mobile-browser-top>.pull-left:before{content: "〈 ";position: absolute;left: -5px;}
.mobile-browser-top>.pull-right{font-size: 14px;font-weight: bold;letter-spacing: 1px;}
/*手机顶部状态*/
.mobile-top{position: absolute;top: 53px;left: 13px;right: 12px;color: #fff;z-index: 2;background-color: #2e2d31;}
/*手机内容载体*/
.mobile-container{zoom:0.8;position: absolute;left: 15px;right: 15px;padding: 0 5px;top: 120px;bottom: 65px;overflow-y: scroll;}
.time-look{color: #888;font-size: 12px;margin-bottom: 0;}
/*颜色渐变*/
.black-grey-black {
  background: -webkit-linear-gradient(left, #1c1a1e , #2c2b30 , #1a1a1d); /* Safari 5.1 - 6.0 */
  background: -o-linear-gradient(right, #1c1a1e , #2c2b30 , #1a1a1d); /* Opera 11.1 - 12.0 */
  background: -moz-linear-gradient(right, #1c1a1e , #2c2b30 , #1a1a1d); /* Firefox 3.6 - 15 */
  background: linear-gradient(to right, #1c1a1e , #2c2b30 , #1a1a1d); /* 标准的语法 */
}
.shadow-gradient{border-radius: 100%;height: 4px;position: relative;top: -2px;margin: 0 5px;}
.btn-return{background: #f96565;color: #fff;width: 100px;margin: 35px auto 20px;}
/* 设置滚动条的样式 */
.scroll-style::-webkit-scrollbar {width: 5px;}/* 滚动槽 */
.scroll-style::-webkit-scrollbar-track {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);border-radius: 10px;}
/* 滚动条滑块 */
.scroll-style::-webkit-scrollbar-thumb {border-radius: 10px;background: rgba(0,0,0,0.1);-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);}
.scroll-style::-webkit-scrollbar-thumb:window-inactive {background: rgba(0,0,0,0.3);}

+ 7 - 0
app/record/css/census.css

@ -0,0 +1,7 @@
.table-responsive{padding: 20px 20px 0;border: none;}
.grayish-bg{background: #f5f5fa;}
.grayish-bg>td{color: #999;}
.family-doctor{vertical-align: middle!important;font-size: 17px;letter-spacing: 1px;color: #353535;}
tr>td{color: #666;border: 1px solid #ddd!important;}
tr>td+td{color: #22bcf6;}
ul{list-style: decimal;padding-left: 35px;}

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

@ -1,9 +1,9 @@
.consultation-list{padding: 10px 20px;margin: 0;}
.consultation-list-item{list-style: none;border: 1px solid #d7dce6;margin-top: 17px;min-height: 72px;border-radius: 8px;overflow: hidden;position: relative;}
.con-user-info{padding: 10px 15px;position: relative;overflow: hidden;}
.con-avatar{width: 40px;height: 40px;border-radius: 100%;position: absolute;top: 15px;left: 17px;}
.consultation-list{padding: 20px 20px 0;margin: 0;}
.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;}
.con-avatar+.con-user-info{padding-left: 68px;}
.article-title,.con-user-name{font-weight: 700;color: #666;font-size: 17px;}
.article-title,.con-user-name{font-weight: 700;color: #333;font-size: 16px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
.guidance-status,.con-status{position: absolute;right: 10px;top: -1px;}
.guidance-status:before,.con-status:before{content: '进行中';background: #ff9630;width: 26px;height: 58px;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;}
.guidance-status:before{padding-top: 12px;}
@ -11,5 +11,5 @@
.guidance-status[data-status="1"]:before{content: "未读";background: #fca701;}
.guidance-status[data-status="2"]:before{content: "已读";background: #12b7f5;}
.start-time{font-weight: 100;font-size: 14px;}
.con-time{margin-left: 20px;}
.con-time{margin-left: 20px;font-size: 12px;color: #999;}
.user-problem{margin-bottom: 0;font-size: 13px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}

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

@ -1,11 +1,12 @@
.consultation-list{padding: 10px 20px;margin: 0;}
.consultation-list-item{list-style: none;border: 1px solid #d7dce6;margin-top: 17px;min-height: 74px;border-radius: 8px;overflow: hidden;position: relative;}
.follow-user-info{padding: 10px 15px;position: relative;overflow: hidden;}
.consultation-list{padding: 20px 20px 0;margin: 0;}
.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: #666;font-size: 17px;border-bottom: 1px solid #d7dce6;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 10px 15px;margin-bottom: 0;}
.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: #ff9630;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: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;}
.start-time{font-weight: 100;font-size: 14px;position: relative;top: 2px;}
.start-time{font-weight: 100;font-size: 14px;}
.completion-time{margin-bottom: 0;font-size: 13px;}
.leave-word{padding-right: 30px;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;}
.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;}

+ 4 - 3
app/record/css/record.css

@ -1,5 +1,6 @@
.service-nav-tabs{margin-bottom: 10px;margin-top: 10px;}
.service-nav-tabs li a{background: #f5f5fa;border-color:#d7dce6;color: #666666;margin-left: 10px;padding: 8px 20px;}
.service-nav-tabs{padding-top: 14px;padding-left: 10px;}
.service-nav-tabs li a{background: #f5f5fa;border-color:#d7dce6;color: #666666;padding: 0;margin-right: 5px;line-height: 32px;width: 80px;text-align: center;}
.service-nav-tabs li.active a{color: #12b7f5;}
.re-title .name{font-size: 18px;font-weight: bold;color: #333;height: 40px;line-height: 40px;display: inline-block;padding: 0px 20px;}
.re-title{border-bottom: 1px solid #ddd;height: 40px;line-height: 40px;}
.re-title .name{font-size: 18px;font-weight: bold;color: #333;display: inline-block;padding: 0px 20px;}
.re-title .select{display: inline-block;       }

+ 5 - 9
app/record/html/census.html

@ -5,14 +5,7 @@
		<title>统计</title>
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css"/>
		<link rel="stylesheet" href="../css/consultation.css" />
		<style type="text/css">
			.table-responsive{padding: 20px 20px 0;}
			.grayish-bg{background: #f5f5fa;}
			.grayish-bg>td{color: #999;}
			.family-doctor{vertical-align: middle!important;font-size: 17px;letter-spacing: 1px;color: #353535;}
			tr>td{color: #666;}
			tr>td+td{color: #22bcf6;}
		</style>
		<link rel="stylesheet" href="../css/census.css" />
	</head>
	<body>
		<div id="app" class="table-responsive">
@ -60,7 +53,10 @@
					</tr>
				</table>
			</div>
			
			<ul>
				<li>年度为本签约年度</li>
				<li>随访为完成量/已计划量</li>
			</ul>
		</div>
		<script type="text/javascript" src="../../../js/vue.js"></script>
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js" ></script>

+ 1 - 1
app/record/html/guidance.html

@ -8,7 +8,7 @@
	</head>
	<body>
		<div id="app">
			<consultation-list :consulta-data="list" @init-data="msgListView"></consultation-list>
			<consultation-list :guidance-data="list" @init-data="msgListView"></consultation-list>
			<navigation :pages="total" :current="currentPage" @navpage="msgListView"></navigation>
		</div>
		<script type="text/javascript" src="../../../js/vue.js"></script>

+ 38 - 0
app/record/html/lay_detail_reserved.html

@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
	<head>
		<meta charset="UTF-8">
		<title>预约详情</title>
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css"/>
		<style type="text/css">
			.detail_content{margin: 0 10px;}
			.res-list{padding: 17px 10px 6px;}
			.res-title{font-weight: 700;margin-bottom: 0;font-size: 16px;color: #333;border-bottom: 1px solid #ececec;line-height: 1;padding-bottom: 10px;}
			.res-list p{margin-bottom: 16px;color: #333;}
			.res-list p>span:first-child{min-width: 70px;text-align: right;display: inline-block;color: #999;}
		</style>
	</head>
	<body>
		<div class="detail_content">
			<div class="res-list">
				<p class="res-title">预约信息</p>
				<p><span>预约状态:</span><span>预约成功</span></p>
				<p><span>挂号时间:</span><span>2018-01-10 21:00</span></p>
				<p><span>就诊时间:</span><span>2018-01-10 21:00:00</span></p>
			</div>
			<div class="res-list">
				<p class="res-title">医生信息</p>
				<p><span>医院名称:</span><span>厦门市仙岳医院</span></p>
				<p><span>科室名称:</span><span>中西医心理科门诊</span></p>
				<p><span>医生姓名:</span><span>陈进东</span></p>
			</div>
			<div class="res-list">
				<p class="res-title">就诊人信息</p>
				<p><span>就诊人:</span><span>阿打算</span></p>
				<p><span>身份证号:</span><span>23423423423523523</span></p>
				<p><span>医保卡号:</span><span>D323e423r</span></p>
				<p><span>手机号码:</span><span>17777777777</span></p>
			</div>
		</div>
	</body>
</html>

File diff suppressed because it is too large
+ 47 - 0
app/record/html/lay_edu_article_detail.html


File diff suppressed because it is too large
+ 43 - 0
app/record/html/lay_gui_article_detail.html


+ 2 - 3
app/record/js/education.js

@ -10,8 +10,7 @@ new Vue({
  		var vm=this;
  		if(page){
  			vm.currentPage=page;
  			var data = {patientCode:'fca8c658ffda42afa5be91e54e0268c8',
					patient:'fca8c658ffda42afa5be91e54e0268c8',
  			var data = {patientCode:'ec7572875d27446cb4f067b13a85d72a',
					teamCode:646,
					page:page,
					pagesize:10}
@ -23,7 +22,7 @@ new Vue({
  							top.toastr.info("啊喔!没有更多内容了");
  					}
  				}else{
  					top.toastr.error(res.msg);
  					top.toastr.error(res.msg||("服务器返回状态码"+res.status));
  				}
  			})
  		}

+ 1 - 1
app/record/js/follow-up.js

@ -23,7 +23,7 @@ new Vue({
  							top.toastr.info("啊喔!没有更多内容了");
  					}
  				}else{
  					top.toastr.error(res.msg);
  					top.toastr.error(res.msg||("服务器返回状态码"+res.status));
  				}
  			})
  		}

+ 3 - 2
app/record/js/guidance.js

@ -11,19 +11,20 @@ new Vue({
  		if(page){
  			vm.currentPage=page;
  			var data = {
//				patientCode:'ec7572875d27446cb4f067b13a85d72a',
					patient:'ec7572875d27446cb4f067b13a85d72a',
					teamCode:646,
					page:page,
					pagesize:10}
  			recordAPI.guidanceList(data).then(function(res){
  				if(res.status==200){ 
  				if(res.status==200){
  					if(res.data.length){  						
  						vm.list=res.data;
  					}else{
  							top.toastr.info("啊喔!没有更多内容了");
  					}
  				}else{
  					top.toastr.error(res.msg);
  					top.toastr.error(res.msg||("服务器返回状态码"+res.status));
  				}
  			})
  		}

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

@ -23,7 +23,7 @@ new Vue({
  							top.toastr.info("啊喔!没有更多内容了");
  					}
  				}else{
  					top.toastr.error("获取数据失败");
  					top.toastr.error(res.msg||("服务器返回状态码"+res.status));
  				}
  			})
  		}

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

@ -4,7 +4,7 @@ Vue.component('consultation-list', {
					<img class="con-avatar" :src="list.patientPhoto" alt="" onerror="onerror=null;src=\'http://www.yihu.com/v3/images/default-female-doc.jpg\'" />
					<div class="con-user-info">
						<span class="con-status" :data-status="list.status" desc="1进行2结束"></span>
						<p><span class="con-user-name">{{list.patientName}}</span><span class="small con-time">{{list.czrq}}</span></p>
						<p class="user-info"><span class="con-user-name">{{list.patientName}}</span><span class="small con-time">{{list.czrq}}</span></p>
						<p class="user-problem">咨询问题:{{list.symptoms}}</p>
					</div>
				</li>

+ 12 - 5
component/record/education-list.js

@ -1,10 +1,10 @@
Vue.component('follow-list', {
	template: `<ul class="consultation-list">
				<li class="consultation-list-item" @click="viewDetail(1)" v-for="(list,index) in eduList">
					<p class="follow-up-doctor"><span class="start-time pull-right">发送时间:{{list.fsrq}}</span>随访医生:{{list.doctor}}</p>
					<p class="follow-up-doctor">{{list.attachedTitle}}</p>
					<div class="follow-user-info leave-word-container">
						<span class="follow-status" :data-status="list.status" desc="1进行2结束"></span>
						<p class="leave-word">医生留言:{{list.ysly}}</p>
						<p class="leave-word">医生留言:{{list.leaveWords?list.leaveWords:"无留言信息"}}</p>
					</div>
				</li>
			</ul>`,
@ -20,14 +20,21 @@ Vue.component('follow-list', {
			top.layer.open({
		      type: 2,
		      maxmin: true,
		      area: ['600px', '360px'],
		      title: '健康教育文章详情',
		      area: ['1000px', '650px'],
		      shadeClose: true,
		      content: 'ddd'
		      moveOut:true,
		      btn:'返回',
		      success: function(layero){
				layero.find('.layui-layer-btn').css({'text-align': 'center','border-top': '1px solid #ececec','padding-top': '7.5px'});
				layero.find('.layui-layer-btn').find('a').addClass("layui-btn").css({background: '#f96565',color: '#fff',width: '100px',border: 'none', height: '34px','line-height':'22px',padding: '6px 12px','font-size': '14px'});
			  },
		      content: '../html/lay_gui_article_detail.html'
		    });
		}
	},
	watch:{
		consultaData:function(val){
		eduData:function(val){
			this.eduList=this.eduData;
		}
	},

+ 1 - 1
component/record/follow-up-list.js

@ -4,7 +4,7 @@ Vue.component('follow-list', {
					<p class="follow-up-doctor"><span class="start-time pull-right">开始时间:{{list.createTime}}</span>随访医生:{{list.doctorName}}</p>
					<div class="follow-user-info">
						<span class="follow-status" :data-status="list.status" desc="1进行2结束"></span>
						<p>方式/类型:{{list.followupTypeName}}{{list.followupClassName?"/"+list.followupClassName:""}}</p>
						<p class="act-type">方式/类型:{{list.followupTypeName}}{{list.followupClassName?"/"+list.followupClassName:""}}</p>
						<p class="completion-time">{{list.status==1?"计划时间:"+list.followupPlanDate:"完成时间:"+list.followupDate}}</p>
					</div>
				</li>

+ 13 - 6
component/record/guidance-list.js

@ -2,9 +2,9 @@ Vue.component('consultation-list', {
	template: `<ul class="consultation-list">
				<li class="consultation-list-item" @click="viewDetail(1)" v-for="(list,index) in guidanceList">
					<div class="con-user-info">
						<span class="guidance-status" :data-status="list.status" desc="1未读2已读"></span>
						<p class="article-title">文章标题:{{list.title}}</p>
						<p class="user-problem">发送时间:{{list.fsrq}}</p>
						<span class="guidance-status" :data-status="list.status?list.status:1" desc="1未读2已读"></span>
						<p class="article-title">{{list.content}}</p>
						<p class="user-problem">发送时间:{{list.createTime}}</p>
					</div>
				</li>
			</ul>`,
@ -19,15 +19,22 @@ Vue.component('consultation-list', {
		viewDetail: function(id) {
			top.layer.open({
		      type: 2,
		      title: '健康指导文章详情',
		      maxmin: true,
		      area: ['600px', '360px'],
		      area: ['1000px', '650px'],
		      shadeClose: true,
		      content: 'ddd'
		      moveOut:true,
		      btn:'返回',
		      success: function(layero){
			  	layero.find('.layui-layer-btn').css({'text-align': 'center','border-top': '1px solid #ececec','padding-top': '7.5px'});
			  	layero.find('.layui-layer-btn').find('a').addClass("layui-btn").css({background: '#f96565',color: '#fff',width: '100px',border: 'none', height: '34px','line-height':'22px',padding: '6px 12px','font-size': '14px'});
			  },
		      content: '../html/lay_gui_article_detail.html'
		    });
		}
	},
	watch:{
		consultaData:function(val){
		guidanceData:function(val){
			this.guidanceList=this.guidanceData;
		}
	},

+ 1 - 1
component/record/inner-tabs.js

@ -17,7 +17,7 @@ Vue.component('inner-tabs', {
	},
	methods: {
		load: function(tab, index) {
//			top.GlobalEventBus.$emit("active-inner-tabs."+this.namespce, tab)
//			top..$emit("active-inner-tabs."+this.namespce, tab)
			this.url = tab.href
			this.activeidx = index
		},

+ 17 - 8
component/record/toBeReserved-list.js

@ -1,30 +1,39 @@
Vue.component('follow-list', {
	template: `<ul class="consultation-list">
				<li class="consultation-list-item" @click="viewDetail(1)" v-for="(list,index) in toBeReservedList">
					<p class="follow-up-doctor"><span class="start-time pull-right">开始时间:{{list.createTime}}</span>随访医生:{{list.doctorName}}</p>
					<p class="follow-up-doctor"><span class="start-time pull-right">开始时间:{{list.czrq}}</span>随访医生:{{list.doctorName}}</p>
					<div class="follow-user-info">
						<p>科室/医院:{{list.followupTypeName}}{{list.followupClassName?"/"+list.followupClassName:""}}</p>
						<p class="completion-time">预约时间:{{list.followupPlanDate}}</p>
						<p>科室/医院:{{list.deptName}}/{{list.orgName}}</p>
						<p class="completion-time">预约时间:{{list.startTime}}</p>
					</div>
				</li>
			</ul>`,
	data: function() {
		return {
			toBeReservedList: "",
			toBeReservedList: [{id:1,photo:'#',dname:'山东省地方',czrq:'2018-12-12 12:12:12',orgName:'xx医院',doctorName:'陈医生',deptName:'心理科室',startTime:'2018-12-12 12:12:12'}],
//			toBeReservedList: "",
			curPage:1
		}
	},
	props:["toBeReservedData"],
	methods: {
		viewDetail: function(id) {
		viewDetail:function(){
			top.layer.open({
		      type: 2,
		      maxmin: true,
		      area: ['600px', '360px'],
		      area: ['1000px', '650px'],
		      shadeClose: true,
		      content: 'ddd'
		    });
		      moveOut:true,
		      btn:'返回',
		      success: function(layero){
			  	layero.find('.layui-layer-btn').css({'text-align': 'center','border-top': '1px solid #ececec','padding-top': '7.5px'});
			  	layero.find('.layui-layer-btn').find('a').addClass("layui-btn").css({background: '#f96565',color: '#fff',width: '100px',border: 'none', height: '34px','line-height':'22px',padding: '6px 12px','font-size': '14px'});
			  },
		      content: '../html/lay_detail_reserved.html'
		   	});
//			top.layer.full(layerTop);
		}
		
	},
	watch:{
		followUpData:function(val){