1、增加模板回退功能，普通查核项列表回退刷新

2、普通查核项列表筛选器显示数据及筛选功能

manifest.json

@@ -89,22 +89,7 @@
             "Camera" : {},
             "Barcode" : {}
         },
-        "nativePlugins" : {
-            "Wlake-PictureView" : {
-                "__plugin_info__" : {
-                    "name" : "图片查看器",
-                    "description" : "图片查看器，支持多张图片，手势放大缩小，保存图片",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3832",
-                    "android_package_name" : "uni.UNIE410614",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3832",
-                    "parameters" : {}
-                }
-            }
-        }
+        "nativePlugins" : {}
     },
     /* SDK配置 */
     "quickapp" : {},

pages.json

@@ -286,7 +286,7 @@
 		"navigationStyle": "default",
 		// #endif
 		// #ifdef H5
-		"navigationStyle": "custom",
+		"navigationStyle": "default",  //default app  custom  网页
 		// #endif
 		"autoBackButton": true,
 		// "homeButton": true,

pages/checkList/checkList.vue

@@ -131,7 +131,7 @@
 						name: '已完成',
 						count: 0
 					}
-				]
+				]
 
 			};
 		},
@@ -355,6 +355,13 @@
 				uni.navigateTo({
 					url: `/pages/checkMainPoints/checkMainPoints?checkId=${checkId}&deptId=${deptId}&finishedStatus=${finishedStatus}&situationType=${this.situationType}&pageTemplateId=${pageTemplateId}`
 				});
+			},
+			//addy by yfb 20230522 回退刷新
+			ReloadPageData: function(newVal) {
+				//console.log('newval',newVal);
+				if (newVal) {
+					this.getPageList();
+				}
 			},
 			dispatch: function(key, data) {
 				return this.$store.dispatch({

pages/checkMainPoints/checkMainPoints.vue

@@ -266,7 +266,7 @@
 				}
 			}
 		},
-		onBackPress() {
+		goBack() {
 			this.$store.commit('checkList/comChangeState', { //刷新前一页数据
 				key: 'ifReloadPageData',
 				data: true
@@ -288,8 +288,8 @@
 			departmentId,//科室id 用于自查督查
 			systemSituationType, 
 			pointsetType,  //计分方式类型 add by yfb 20230417
-		}) {
-
+		}) {
+		
 			this.deptId = deptId;
 			this.checkId = checkId;
 			this.finishedStatus = finishedStatus;
@@ -309,10 +309,12 @@
 			if (situationType != 2) {
 				this.loadItemData();
 			}
+
 			if(this.currentSelectedInvestigationUser){
 				this.getFilterList(checkId,deptId,this.currentSelectedInvestigationUser.investigationId);
 			}else{
-		        this.getFilterList(checkId,departmentId);
+				this.getFilterList(checkId,deptId?deptId:departmentId);
+		        //this.getFilterList(checkId,departmentId);
 			}
 			
 		},
@@ -355,7 +357,7 @@
 			 * @param {number} responsibleUserId  责任对象id 非必传
 			 */
 			getFilterList(checkId,deptId,responsibleUserId){
-				
+				console.log('2023052302 dept',deptId);
 				this.$store.dispatch({
 					type: 'checkMainPoints/commActions',
 					key: 'getPointConditions',
@@ -365,7 +367,7 @@
 						deptId:deptId
 					}
 				}).then(data=>{
-				    
+				    console.log('2023052205 data',data);
 					const {checkResults=[],checkStatuses=[],others=[]} = data;
 					const _checkResults = checkResults.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value}));
 					const _checkStatuses = checkStatuses.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value}));
@@ -375,6 +377,7 @@
 						{key:'查核结果',list:_checkResults},
 						{key:'其他',list:_others},
 					];
+					console.log('2023052205',this.btnArr);
 				})
 			},
 			//绑定当事人
@@ -447,6 +450,7 @@
 							// filter:
 						}
 					}).then(data => {
+						console.log('2023052306 test',data);
 						if (data) {
 							let renderList = data.checkDetailMapResponses?data.checkDetailMapResponses:[];
 						    							
@@ -454,7 +458,6 @@
 								key: 'detailList',
 								data: renderList
 							});
-							
 							this.isBindResponsible = data.isBindResponsible;
 							this.detailList = renderList;
 							this.copyDetailList = renderList;
@@ -493,7 +496,7 @@
 					return
 				}
 				
-				
+				console.log('20230523',this.situationType,this.currentSelectedInvestigationUser);
 				//非自查督查的情况下
 				if(this.situationType == 2&&!this.currentSelectedInvestigationUser){
 					//分页模式下且未选择访谈对象时拒绝请求数据同时清空历史数据
@@ -501,6 +504,7 @@
 						key: 'detailList',
 						data:[]
 					});
+					
 					this.detailList = [];
 					this.isBindResponsible = false;
 					this.copyDetailList = [];
@@ -624,6 +628,7 @@
 				if(!this.isZichaDucha){
 					//非自查督查
 					let ids = [];
+					console.log('2023052203',item);
 					this.detailList.forEach(item => {
 						//筛选掉已查核项
 						const temp = item.responseList.filter(v => !v.checkResult);

uview-ui/components/u-navbar/u-navbar.vue

@@ -230,7 +230,17 @@
 					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
 					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
 					this.customBack.bind(this.$u.$parent.call(this))();
-				} else {
+				} else {
+					//add by yfb 20230522 回退刷新
+					try{
+						let pages=getCurrentPages();
+						let prevPage=pages[pages.length-2];
+						prevPage.$vm.ReloadPageData(true);
+					}catch(e){
+						//TODO handle the exception
+						console.log('error:',e);
+					}
+					
 					uni.navigateBack();
 				}
 			}