Browse Source

问卷返回重选问题解决

zyz 6 years ago
parent
commit
644b5c2f95
2 changed files with 25 additions and 12 deletions
  1. 16 4
      app/jbsc/html/filter_type.html
  2. 9 8
      app/jbsc/html/questionnaire.html

+ 16 - 4
app/jbsc/html/filter_type.html

@ -88,7 +88,7 @@
										</p>
									</div>
								</li>
								<li v-if="!denizenList.length">暂无居民信息</li>
								<li v-else>暂无居民信息</li>
							</ul>
							<div class="text-center ptb10" v-if="!noDenizen" @click="getScreenList('more')">						
								<button class="btn btn-default">更多居民</button>
@ -125,15 +125,17 @@
					noDenizen:false,
					denizenList:[],//居民列表
					doctorList:[],//医生团队列表
					currentType:(httpData['goDenizen'] || 0),// 当前是在选择类型还是选择居民
					screeningType:{},//当前问卷类型
					currentType:0,// 当前是在选择类型还是选择居民
					screeningType:{code:httpData['fliter_code'],title:decodeURI(httpData['fliter_title'])},//当前问卷类型
					screeningResidents:{},//选中居民
					keyWord:'',//关键字
					teamCode:'',
					denizenName:'',
					isSearch:false,
					isReLoad:httpData['isReLoad']!=undefined?1:0
				},
				mounted: function(){
					this.currentType=(httpData['goDenizen'] || 0)
					this.getScreenList();
				},
				methods: {
@ -193,11 +195,13 @@
			    			pagesize: vm.pageSize
			    		}
			    		jbscAPI.patientsByTeam(data).then(function(res){
			    			console.log(res)
			    			if(res.status==200){
			    				var list=vm.denizenList;
			    				var _length=res.data && res.data.length || 0;
			    				_length && (list=list.concat(res.data));
			    				vm.denizenList=list;
			    				console.log(vm.denizenList)
			    				if(_length<vm.pageSize){
			    					vm.noDenizen=true;
			    				}
@ -220,8 +224,16 @@
//			   		选择好类型自动下一步
					goDenizen:function(item){
						var vm=this;
						vm.currentType=1;
						vm.screeningType=item;
						console.log(vm.isReLoad)
						if(vm.isReLoad==1){
							console.log('进来了')
							parent.question.screeningType=vm.screeningType.code
							parent.question.screeningTitle=vm.screeningType.title
							var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
							parent.layer.close(index); //再执行关闭
						}
						vm.currentType=1;
				    },
//				    开始筛查
					startScreening:function(){

+ 9 - 8
app/jbsc/html/questionnaire.html

@ -45,17 +45,17 @@
						<span class="w-70">
							类型
						</span>
						<div class="flex-box-item" v-text="screeningTitle" @click="goBack">
						<a class="flex-box-item" :alt="screeningTitle" v-text="screeningTitle" @click="goBack">
							--
						</div>
						</a>
					</div>
					<div class="flex-box right-triangle">
						<span class="w-70">
							对象
						</span>
						<div class="flex-box-item" v-text="screeningResidentsName" @click="goBack(1)">
						<a class="flex-box-item" :alt="screeningResidentsName" v-text="screeningResidentsName" @click="goBack(1)">
							--
						</div>
						</a>
					</div>
					<div class="flex-box">
						<span class="w-70">
@ -99,6 +99,7 @@
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		 <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
	    <!--<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>-->
	    <script type="text/javascript" src="../../../plugins/layer/layer.min.js" ></script>
	    <script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
	    <script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
	    <script type="text/javascript" src="../../../api/jbsc-api.js" ></script>
@ -106,7 +107,7 @@
		<script type="text/javascript">
			var httpData=GetRequest();
			var wlyyAgentForDoc=JSON.parse(window.localStorage.getItem('wlyyAgentForDoc'));
			new Vue({
			var question=new Vue({
				el: "#app",
				data: {
					//数据结果
@ -263,11 +264,11 @@
							top.layer.msg(content, {icon: 5});
							return ;
						}
						var content='../../jbsc/html/filter_type.html';
						var content='../../jbsc/html/filter_type.html?isReLoad=1';
						if(number===1){//选择居民
							content+='?goDenizen=1';
							content+='&goDenizen=1&fliter_code='+vm.screeningType+'&fliter_title='+vm.screeningTitle;
						}
						top.layer.open({
						layer.open({
						  type: 2,
						  offset: 'rb', //右下角弹出
						  id:"filter_type",