接单筛选bug修复

package-lock.json

@@ -12,7 +12,7 @@
         "big.js": "^6.2.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.10",
-        "js-base64": "^3.7.5",
+        "js-base64": "^3.0.0",
         "spinkit": "^2.0.1",
         "weixin-jsapi": "^1.1.0"
       },
@@ -222,9 +222,9 @@
       }
     },
     "node_modules/js-base64": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.7.tgz",
-      "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.0.0.tgz",
+      "integrity": "sha512-mm6+q5LzUWw8jABsLkg7J5A0YL/SL3RgkzIKQaXN+LTaH3x3LQ+ALPM0jnINUtdsVNNpJuKubtecczlHIi92uQ=="
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
@@ -465,4 +465,4 @@
       "dev": true
     }
   }
-}
+}

package.json

@@ -17,7 +17,7 @@
     "big.js": "^6.2.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
-    "js-base64": "^3.7.5",
+    "js-base64": "^3.0.0",
     "spinkit": "^2.0.1",
     "weixin-jsapi": "^1.1.0"
   },

pages/receiptpage/receiptpage.vue

@@ -1121,26 +1121,40 @@
 				});
 			},
 			closeDrawer() {
-				this.execFilterReset()
 				this.isShowExecFilter = false;
+				let data = uni.getStorageSync("admStore")
+				data.isSearch = false
+				uni.setStorageSync("admStore",data)
 			},
       // 执行中筛选
       execFilter() {
 				this.getTaskData()
         this.isShowExecFilter = true;
       },
+			// 筛选确定之后数据操作
+			setScreenData(){
+				let data = {
+					deptName:this.deptName,
+					deptId:this.deptId,
+					currentId:this.currentId, //工单状态
+					taskType:this.taskTypeId, //任务类型
+					selectedLabelSlots:this.selectedLabelSlots, //tab选中状态
+					taskData:JSON.stringify(this.taskData),
+					isSearch:false
+				}
+				uni.setStorageSync("admStore",data)
+			},
       // 执行中确定
       execFilterOk() {
         this.isShowExecFilter = false;
         this.zxzData = [];
         this.totalNum = -1;
         this.idx = 0;
-        // this.selectedLabelSlots = "执行中";
-        // this.executingOrders(0);
+				this.setScreenData()
 				if (this.selectedLabelSlots == "待接单") {
-				  this.waitingOrders(0,'submit');
+				  this.waitingOrders(0);
 				} else if (this.selectedLabelSlots == "执行中") {
-				  this.executingOrders(0,'submit');
+				  this.executingOrders(0);
 				}
       },
       // 执行中重置
@@ -2240,13 +2254,10 @@
               title: res.msg || "接口获取数据失败！",
             });
           }
-					if(type=='submit'){
-						this.execFilterReset()
-					}
         });
       },
       //待抢单列表数据获取
-      waitingOrders(idx,type) {
+      waitingOrders(idx) {
         if (this.zxzData.length == this.totalNum) {
           uni.showToast({
             icon: "none",
@@ -2259,7 +2270,6 @@
           idx,
           sum: 20,
         };
-				
 				if (this.deptId) {
 				  data.deptId = this.deptId;
 				} else {
@@ -2295,9 +2305,6 @@
               title: res.msg || "接口获取数据失败！",
             });
           }
-					if(type=='submit'){
-						this.execFilterReset()
-					}
         });
       },
       //刷新
@@ -2425,15 +2432,18 @@
           }
         })
       },
-    },
     onLoad(options) {
-			if(options.type=='searchAdm'){
-				let admStore = uni.getStorageSync("admStore");
+			let admStore = uni.getStorageSync("admStore");
+			if(admStore.type=='searchAdm'){
 				if(Object.keys(admStore).length != 0){
-					this.deptName = options.dept //科室名称
-					this.deptId = options.deptId //科室id
-					this.isShowExecFilter = true
 					this.$nextTick(_=>{
+						if(admStore.isSearch){
+							this.isShowExecFilter = true
+						}else{
+							this.isShowExecFilter = false
+						}
+						this.deptName = admStore.dept //科室名称
+						this.deptId = admStore.deptId //科室id
 						this.currentId = admStore.currentId //工单状态
 						this.taskTypeId = admStore.taskType //任务类型
 						this.selectedLabelSlots = admStore.selectedLabelSlots //tab选中状态
@@ -2506,6 +2516,7 @@
       });
       // #endif
     },
+		}
   };
 </script>
 <style lang="less">

pages/search/search.vue

@@ -480,9 +480,15 @@
               });
             }
           } else if (this.type == "takeOrder") { //接单
-					  uni.navigateTo({
-					    url: `../receiptpage/receiptpage?deptId=${arr[0].id}&dept=${arr[0].dept}&type=searchAdm`,
-					  });
+						let data = uni.getStorageSync("admStore")
+						data.deptId = arr[0].id
+						data.dept = arr[0].dept
+						data.type = 'searchAdm'
+						data.isSearch = true
+						uni.setStorageSync("admStore",data)
+						uni.navigateTo({
+							url: `../receiptpage/receiptpage`,
+						});
 					}
         }
       },