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

app/sign/html/sign_detail.html

@@ -26,7 +26,7 @@
					<img class="fl w40 h40 b-r-50" :src="setPatImg(patientInfo.photo)" alt="居民头像" />
				</dt>
				<dd class="fl ml10 c-999">
					<p class="m0"><span class="c-333 c-f16">{{patientInfo.name}}</span><span class="ml10 c-f14">({{patientInfo.sex == 1 ? "男" : "女"}}&emsp;{{patientInfo.age && patientInfo.age > 0 ? patientInfo.age : "未知"}}岁{{handleExpensesStatus(patientInfo.expensesStatus)}})</span></p>
					<p class="m0"><span class="c-333 c-f16">{{patientInfo.name}}</span><span class="ml10 c-f14">({{patientInfo.sex == 1 ? "男" : "女"}}&emsp;{{patientInfo.age && patientInfo.age > 0 ? patientInfo.age : "<1"}}岁{{handleExpensesStatus(patientInfo.expensesStatus)}})</span></p>
					<p class="c-f12 m0">
						<img class="mr5" v-if="!patientInfo.openid" height="18" src="../../../images/weixing_zihui_icon.png" alt="" />
						<img class="mr5" v-if="patientInfo.openid" height="18" src="../../../images/weixing_icon.png" alt="" />

app/sign/html/sign_manage.html

@@ -40,7 +40,7 @@
	                    <span class="fl w-14">{{list.patientName || ""}}</span>
	                    <span class="fl w-20-1 c-border-l">{{list.applyDate || "无时间记录"}}</span>
	                    <span class="fl w-10-1 c-border-l">{{list.sex == 1 ? '男' : '女'}}</span>
	                    <span class="fl w-10-1 c-border-l">{{list.age || 0}}岁</span>
	                    <span class="fl w-10-1 c-border-l">{{list.age ? list.age : '<1'}}岁</span>
	                    <span class="fl w-10-1 c-border-l">{{+list.renewFlag ? '续签' : '新签'}}</span>
	                    <span class="fl w-18-1 c-border-l">{{list.mobile || "无联系方式"}}</span>
	                    <p class="fl w-18-1 c-border-l">
@@ -141,8 +141,11 @@
                methods: {
                	signCount: function() {
                		var vm = this,
                			param = {
                				patientInfo: this.keyword
                			},
                			loadding = layer.load(0, {shade: false});
						signAPI.signCount().then(function(res) {
						signAPI.signCount(param).then(function(res) {
							layer.close(loadding)
							if(res.status == 200) {
								vm.allCount = res.data;
@@ -238,7 +241,7 @@
			        },
			        suosou: function() {
			        	this.page = 1;
			        	this.signList();
			        	this.signCount();
			        },
			        handle: function(list) {
			        	var status;

app/sign/js/sign_handle.js

@@ -381,12 +381,18 @@ top.handleVue=new Vue({
		            });
		            if(!judge && httpData.status == 1) {
		            	if(vm.doctorType == 3) {
		            		if(!vm.justDoc) {
		            			vm.justDoc = vm.signInfo.doctorName
		            		}
		            		vm.warnMsg = "去年居民续签的全科医生" + vm.justDoc + "已不在您的团队，请重新选择一位全科医生"
							vm.justDoc = null
							vm.signInfo.doctor = null
		            		vm.signInfo.doctorName = null
		            	}
						if(vm.doctorType == 2) {
							if(!vm.justHDoc) {
		            			vm.justHDoc = vm.signInfo.healthDoctorName
		            		}
		            		vm.warnMsg = "去年居民续签的健管师" + vm.justHDoc + "已不在您的团队，请重新选择一位健管师"
		            		vm.justHDoc = null
		            		vm.signInfo.healthDoctor = null