Merge branch 'lmm' into develop

pages/receiptpage/receiptpage.vue

@@ -435,6 +435,9 @@
             url: "../patientInformationList/patientInformationList",
           });
         } else if (e.item.text === "负责科室") {
+          if (uni.getStorageSync("setDepts")) {
+            uni.removeStorageSync("setDepts"); //清空选择的科室,初始化
+          }
           let obj = uni.getStorageSync("setDeptConfg");
           uni.navigateTo({
             url: `../setDept/setDept?configName=${obj.configName}&id=${obj.id}&changedept=1`,
@@ -700,9 +703,9 @@
         });
       }
       // #ifdef APP-PLUS
-      this.content.push({
-        text: "退出登录",
-      });
+      // this.content.push({
+      //   text: "退出登录",
+      // });
       // #endif
       this.selectedLabelSlots = "执行中";
       this.waitingOrdersGetNum();