Browse Source

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

yingzhou 6 years ago
parent
commit
5038fed194

+ 19 - 2
app/jbsc/css/statistics.css

@ -178,12 +178,12 @@ select.form-control{
    margin-left: -25px;
    margin-top: 40px;
}
.numcircle{
/*.numcircle{
	border-radius: 50%;
	background-color: #fff;
	padding: 2px 7px 1px 6px;
    margin-right: 6px;
}
}*/
#sc_table{}
#sc_table tr td:nth-child(2):hover{
	color:#12B7F5;
@ -270,3 +270,20 @@ button.dropdown-toggle:hover .caret {
.right{
	float: right;
}
.numcircle{
	background-repeat: no-repeat;
	background-size: 20px 20px;
}
.bgc1-12B7F5.numcircle{
	background-image: url(../images/1_img.png);
	background-position: 42px;	
}
.bgc1-2DBE55.numcircle{
	background-image: url(../images/2_img.png);	
	background-position: 50px;
}
.bgc1-FF9630.numcircle{
	background-image: url(../images/3_img.png);
	background-position: 50px;	
}

+ 10 - 10
app/jbsc/html/statistics.html

@ -29,8 +29,8 @@
						<div class="table-cell">
							<div class="ui-grid">
								<div class="ui-col-1">
									<div class="bigbox bgc1-12B7F5">
										<span class="numcircle c-12B7F5">1</span>筛查表管理
									<div class="bigbox bgc1-12B7F5 numcircle">
										<span class="pl20 c-12B7F5"></span>筛查表管理
									</div>
									<div class="bgc-D7F3FE c-border-radius-blr plr20 ptb10">
										<div class="border-6FD7FE bgc-6fd7fe">
@ -47,7 +47,7 @@
												已下发问卷
											</div>
											<div class="c-12B7F5 smallbox">
												<span class="c-f20">{{Statics.grantCount}}</span>个
												<span class="c-f20">{{Statics.grantCount}}</span>份
											</div>
										</div>
									</div>
@ -58,8 +58,8 @@
						<div class="table-cell plr30">
							<div class="ui-grid">
								<div class="ui-col-1">
									<div class="bigbox bgc1-2DBE55">
										<span class="numcircle c-2DBE55">2</span>筛查记录
									<div class="bigbox bgc1-2DBE55 numcircle">
										<span class="pl20 c-2DBE55"></span>筛查记录
									</div>
									<div class="bgc-DCFDE6 c-border-radius-blr plr20 ptb10">
										<div class="border-61D882 mb20 bgc-61D882">
@ -67,7 +67,7 @@
												疑似高危
											</div>
											<div class="c-2DBE55 smallbox">
												<span class="c-f20">{{Statics.dangetCount}}</span>个
												<span class="c-f20">{{Statics.dangetCount}}</span>份
											</div>
										</div>
										<div class="border-61D882 bgc-61D882">
@ -75,7 +75,7 @@
												健康跟踪
											</div>
											<div class="c-2DBE55 smallbox">
												<span class="c-f20">{{Statics.followCount}}</span>个
												<span class="c-f20">{{Statics.followCount}}</span>份
											</div>
										</div>
									</div>
@ -86,8 +86,8 @@
							</div>
						</div>
						<div class="table-cell">
							<div class="bigbox bgc1-FF9630">
								<span class="numcircle c-FF9630">3</span>病人服务
							<div class="bigbox bgc1-FF9630 numcircle">
								<span class="pl20 c-FF9630"></span>病人服务
							</div>
							<div class="bgc-FEEEDF c-border-radius-blr plr20 ptb10">
								<div class="border-FAB675 mb20 bgc-FAB675">
@ -95,7 +95,7 @@
										预约转诊
									</div>
									<div class="c-FF9630 smallbox">
										<span class="c-f20">{{Statics.orderCount}}</span>个
										<span class="c-f20">{{Statics.orderCount}}</span>份
									</div>
								</div>
							</div>

BIN
app/jbsc/images/1_img.png


BIN
app/jbsc/images/2_img.png


BIN
app/jbsc/images/3_img.png


+ 2 - 2
app/sign/html/photo_show.html

@ -35,12 +35,12 @@
			.right-arrow:hover {
				background: url(../../../images/right02_pre.png) no-repeat no-repeat center center;
			}
			.bgc-999 {background-color: #999999;}
			.bgc-999 {background-color: #d7dce6;}
			.lh80 {line-height: 80px;}
		</style>
	</head>
	<body>
		<div id="app" class="h-100 bgc-999">
		<div id="app" class="c-position-r h-100 bgc-999">
			<div v-if="photoList.length > 0" class="h-100">
				<div class="h-100-100 c-t-center c-position-r">
					<span v-if="curryIndex != 0" class="c-position-a left-arrow" @click="changeCurryIndex(curryIndex - 1)"></span>

+ 5 - 5
app/sign/html/sign_handle.html

@ -43,7 +43,7 @@
					<span class="fl w-80-1 pl20">{{patientInfo.address ? patientInfo.address : ""}}</span>
				</li>
			</ul>
			<h3>签约信息<span class="c-f12 c-red ml20" style="font-weight: 400;">{{warnMsg}}</span></h3>
			<h3>签约信息<span v-if="renewFlag != 2" class="c-f12 c-red ml20" style="font-weight: 400;">{{warnMsg}}</span></h3>
			<ul class="m0 p0 mb20 lh40 c-border-t c-border-r c-border-l c-t-left c-333">
				<li class="c-border-b clearfix">
					<div class="fl w-50-1">
@ -58,7 +58,7 @@
						</div>
						<div class="m0 c-border-b clearfix">
							<span class="fl w-40 c-border-r pl20 c-999">全科医生</span>
							<span v-if="doctorType == 2" class="fl w-60-1 c-border-r pl20">{{patientInfo.jtSign.doctorName}}</span>
							<span v-if="doctorType == 2" class="fl w-60-1 c-border-r pl20">{{signInfo.doctorName}}</span>
							<div v-if="doctorType == 3" class="c-position-r fl w-60-1 c-border-r">
								<p class="pl20 w-100 set-bg" @click="selectStatus(4)">{{signInfo.doctorName ? signInfo.doctorName : "请选择全科医生"}}</p>
								<ul class="pull-list m0 p0 c-border-l c-border-r c-border-b" v-if="isShowList4">
@ -68,7 +68,7 @@
						</div>
						<div class="m0 c-border-b clearfix">
							<span class="fl w-40 c-border-r pl20 c-999">健康管理师</span>
							<span v-if="doctorType == 3" class="fl w-60-1 c-border-r pl20">{{patientInfo.jtSign.doctorHealthName}}</span>
							<span v-if="doctorType == 3" class="fl w-60-1 c-border-r pl20">{{signInfo.healthDoctorName}}</span>
							<div v-if="doctorType == 2" class="c-position-r fl w-60-1 c-border-r">
								<p class="pl20 w-100 set-bg" @click="selectStatus(2)">{{signInfo.healthDoctorName ? signInfo.healthDoctorName : "请选择健康管理师"}}</p>
								<ul class="pull-list m0 p0 c-border-l c-border-r c-border-b" v-if="isShowList2">
@ -100,9 +100,9 @@
						<div class="lh80 clearfix">
							<span class="fl w-40 c-border-r pl20 c-999">已上传凭证</span>
							<div class="fl w-60 ptb10 pl20">
								<div class="fl mtb5 cur-pit lh0 c-t-center c-12b7f5" v-for="(lis, index) in fileList" :key="index" @click="lookPhoto(lis)">
								<div class="fl mtb5 cur-pit lh0 c-t-center c-12b7f5" style="text-decoration: underline;" v-for="(lis, index) in fileList" :key="index" @click="lookPhoto(lis)">
									<p class="m0 lh24">{{lis.serverTypeName}}</p>
									<span class="lh24" style="text-decoration: underline;">查看</span>
									<span class="lh24">查看附件</span>
								</div>
							</div>
						</div>

+ 5 - 1
app/sign/html/sign_manage.html

@ -260,7 +260,7 @@
							closeBtn: 1,
							shift: 5,
							shadeClose: false, //点击遮罩关闭层
							content: "sign_handle.html?patientCode="+list.patientCode+'&signCode='+list.code + '&status=' + status + '&msgid=' + list.msgid
							content: "sign_handle.html?patientCode="+list.patientCode+'&signCode='+list.code + '&status=' + status + '&msgid=' + list.msgid + "&renewFlag=" + list.renewFlag
						});
			        },
			        looking: function(list) {
@ -294,6 +294,8 @@
			        	}
			        },
			        remainMoney: function(status, list) {
			        	showInfoMessage("功能正在优化中,暂停使用,谢谢!")
			        	return false;
			        	var vm = this,
			        		loading = layer.load(0, {shade: false})
			        		param = {
@ -311,6 +313,8 @@
			        	})
			        },
			        remainFocus: function(status, list) {
			        	showInfoMessage("功能正在优化中,暂停使用,谢谢!")
			        	return false;
			        	var vm = this,
			        		loading = layer.load(0, {shade: false})
			        		param = {

BIN
app/sign/images/guanbi_01_btn.png


+ 1 - 1
app/sign/js/photo_show.js

@ -25,7 +25,7 @@ function showInfoMessage(msg) {
		icon: 6
	})
}
parent.$("#layui-layer" + parent.photoLayerIndex + " .layui-layer-setwin").addClass("set-close-btn")
new Vue({
    el: "#app",
    data: {

+ 44 - 6
app/sign/js/sign_handle.js

@ -43,6 +43,7 @@ top.changeTypeIndex=null;//修改居民标签的窗体
top.handleVue=new Vue({
    el: "#app",
    data: {
    	renewFlag: httpData.renewFlag, // 2 改签
    	justDoc: null,
    	justHDoc: null,
    	doctorType: doctorInfo.doctorType,
@ -70,6 +71,8 @@ top.handleVue=new Vue({
            disease: null,
            patientIDcard: null, // 必填
            adminTeamCode: null,
            teamCode: null,
            mesId: null, // 消息id(必填)
            msgid: null, // 消息id(必填)
            patient: httpData.patientCode,
            doctor: null,
@ -94,6 +97,7 @@ top.handleVue=new Vue({
    	if(!httpData.msgid || httpData.msgid == "undefined" || httpData.msgid == "null") {
    		this.findMsgId()
    	} else {
    		this.signInfo.mesId = httpData.msgid
    		this.signInfo.msgid = httpData.msgid
    	}
    	this.teamLimit();
@ -171,6 +175,7 @@ top.handleVue=new Vue({
			signAPI.findMsgId(params).then(function(res) {
				layer.close(loadding)
				if(res.status == 200) {
					vm.signInfo.mesId = res.data.id
					vm.signInfo.msgid = res.data.id
				} else {
					showErrorMessage(res.msg);
@ -188,6 +193,14 @@ top.handleVue=new Vue({
				if(res.status == 200) {
					vm.patientInfo = res.data
					vm.signInfo.patientIDcard = res.data.idCard
					if(vm.doctorType == 2) {
						vm.signInfo.doctorName = res.data.jtSign.doctorName
						vm.signInfo.doctor = res.data.jtSign.doctor
					}
					if(vm.doctorType == 3) {
						vm.signInfo.healthDoctorName = res.data.jtSign.doctorHealthName
						vm.signInfo.healthDoctor = res.data.jtSign.doctorHealth
					}
				} else {
					showErrorMessage(res.msg);
				}
@ -253,10 +266,19 @@ top.handleVue=new Vue({
				if(res.status == 200) {
					vm.patientInfo = res.data
					vm.signInfo.adminTeamCode = vm.patientInfo.jtSign.adminTeamId
					vm.signInfo.teamCode = vm.patientInfo.jtSign.adminTeamId
					vm.signInfo.healthDoctorName = vm.patientInfo.jtSign.doctorHealthName || ""
					vm.signInfo.healthDoctor = vm.patientInfo.jtSign.doctorHealth || ""
					vm.signInfo.doctor = vm.patientInfo.jtSign.doctor || ""
					vm.signInfo.doctorName = vm.patientInfo.jtSign.doctorName || ""
					if(vm.doctorType == 2) {
						vm.signInfo.doctorName = doctorInfo.name
						vm.signInfo.doctor = doctorInfo.uid
					}
					if(vm.doctorType == 3) {
						vm.signInfo.healthDoctorName = doctorInfo.name
						vm.signInfo.healthDoctor = doctorInfo.uid
					}
					vm.signInfo.expenses = vm.patientInfo.jtSign.expensesType
					vm.judgeTeamToDoc(vm.signInfo.adminTeamCode)
				} else {
@ -274,6 +296,7 @@ top.handleVue=new Vue({
    		}
    		if(!judge) {
    			this.signInfo.adminTeamCode = null
    			this.signInfo.teamCode = null
    			this.warnMsg = "您已不在原签约团队,请选择新的签约团队"
    			if(this.doctorType == 2) {
    				this.justHDoc = this.signInfo.healthDoctorName
@ -384,7 +407,7 @@ top.handleVue=new Vue({
		            		if(!vm.justDoc) {
		            			vm.justDoc = vm.signInfo.doctorName
		            		}
		            		vm.warnMsg = "去年居民续签的全科医生" + vm.justDoc + "已不在您的团队,请重新选择一位全科医生"
		            		vm.warnMsg = "去年签约的全科医生" + vm.justDoc + "已不在您的团队,请重新选择一位全科医生"
							vm.justDoc = null
							vm.signInfo.doctor = null
		            		vm.signInfo.doctorName = null
@ -393,7 +416,7 @@ top.handleVue=new Vue({
							if(!vm.justHDoc) {
		            			vm.justHDoc = vm.signInfo.healthDoctorName
		            		}
		            		vm.warnMsg = "去年居民续签的健管师" + vm.justHDoc + "已不在您的团队,请重新选择一位健管师"
		            		vm.warnMsg = "去年签约的健管师" + vm.justHDoc + "已不在您的团队,请重新选择一位健管师"
		            		vm.justHDoc = null
		            		vm.signInfo.healthDoctor = null
		            		vm.signInfo.healthDoctorName = null
@ -426,6 +449,10 @@ top.handleVue=new Vue({
    			this.isShowList4 = false;
    			this.isShowList3 = !this.isShowList3;
    		} else {
    			if(!this.signInfo.adminTeamCode) {
    				showWarningMessage("请先选择签约团队")
    				return false;
    			}
    			this.isShowList1 = false;
    			this.isShowList2 = false;
    			this.isShowList3 = false;
@ -437,6 +464,7 @@ top.handleVue=new Vue({
        	if(num == 1) { // 选择签约团队
        		this.isShowList1 = false;
	            this.signInfo.adminTeamCode = data.id;
	            this.signInfo.teamCode = data.id;
	            if(this.doctorType == 2) {
	            	this.signInfo.healthDoctor = null
	            	this.signInfo.healthDoctorName = null
@ -497,10 +525,10 @@ top.handleVue=new Vue({
        	}
        },
        lookPhoto: function(data) {
        	layer.open({
        	parent.photoLayerIndex = parent.layer.open({
        		type: 2,
        		area: ['100%', '100%'],
        		title: "凭证预览",
        		area: ['70%', '600px'],
        		title: false,
        		shade: 0.5,
        		shadeClose: true,
        		shift: 2,
@ -534,6 +562,7 @@ top.handleVue=new Vue({
						}
					}
					vm.signInfo.adminTeamCode = 0;
					vm.signInfo.teamCode = 0;
					vm.signInfo.type = 2;
					vm.signInfo.state = 0;
					vm.sign();
@ -545,13 +574,22 @@ top.handleVue=new Vue({
			});
        },
        sign: function() {// type:1签约 2拒签
        	if(this.signInfo.type == 1 && ((this.doctorType == 2 && !this.signInfo.healthDoctor) || (this.doctorType == 3 && !this.signInfo.doctor) || !this.signInfo.sevId || (!this.signInfo.disease && !this.signInfo.healthLabel && !this.signInfo.customLabel))) {
        	if(this.signInfo.type == 1 && (!this.signInfo.expenses || (this.doctorType == 2 && !this.signInfo.healthDoctor) || (this.doctorType == 3 && !this.signInfo.doctor) || !this.signInfo.sevId || (!this.signInfo.disease && !this.signInfo.healthLabel && !this.signInfo.customLabel))) {
        		showWarningMessage("请将填写完整签约信息!");
        		return false;
        	}
        	var vm = this,
    			loadding = layer.load(0, {shade: false});
    		if (httpData.status == 0) {
    			var param = vm.signInfo
    			if(vm.doctorType == 2) {
    				param.doctor = null
    				param.doctorName = null
    			}
    			if(vm.doctorType == 3) {
    				param.doctorHealth = null
    				param.doctorHealthName = null
    			}
				signAPI.sign(vm.signInfo).then(function(res) {
					layer.close(loadding)
					if(res.status == 200) {

+ 6 - 0
css/style.min.css

@ -7474,3 +7474,9 @@ select {
.layui-layer-setwin .layui-layer-maxmin{background-image: url(../images/zuidaohua02_icon.png)!important;}
.layui-layer-setwin .layui-layer-close{background: url(../images/guanbi_icon.png) center center / 30% auto no-repeat;background-color: #f8f8f8!important;background-position: center center!important;}
.layui-layer-setwin .layui-layer-close:hover,.layui-layer-setwin .layui-layer-close:hover{background-color: #f96464!important;}
.layui-layer-setwin.set-close-btn{top: 0!important;right: 0!important;line-height: 33px!important;}
.layui-layer-setwin.set-close-btn a{height: 33px!important;line-height: 33px!important;width: 33px!important;margin-left: 0!important;}
.layui-layer-setwin.set-close-btn .layui-layer-close2 {right: -15px;top: -15px;}
.layui-layer-setwin.set-close-btn .layui-layer-close{background: url(../app/sign/images/guanbi_01_btn.png) center center / 100% auto no-repeat;background-color: transparent!important;background-position: center center!important;}
.layui-layer-setwin.set-close-btn .layui-layer-close:hover,.layui-layer-setwin .layui-layer-close:hover{background-color: transparent!important;}