上下班修改

pages/homePage/homePage.vue

@@ -390,6 +390,13 @@
           uni.removeStorageSync("setDeptConfg"); //清空选择的科室配置,初始化
         }
         if (obj.ruleType == 1) {
+          uni.setStorageSync("setDeptConfg", {
+            configName: this.quickObj.configName,
+            workSchemeType: this.workSchemeType,
+            ruleType: this.quickObj.ruleType,
+            id: this.quickObj.id,
+            classesId: this.quickObj.classes.id,
+          });
           //自由抢单,直接上班
           this.GoWork();
         } else if (obj.ruleType == 3) {
@@ -529,7 +536,7 @@
           mask: true,
         });
         //自选排班，科室绑定人员,科室绑定分组，绑定分组
-        if (this.workSchemeType == 2 && (this.ruleType == 2||this.ruleType == 3||this.ruleType == 4)) {
+        if (this.workSchemeType == 2 && (this.ruleType == 1 || this.ruleType == 2||this.ruleType == 3||this.ruleType == 4)) {
           let userId = uni.getStorageSync("userData").user.id;
           let setDeptConfg = uni.getStorageSync("setDeptConfg");
           let postData = {
@@ -546,7 +553,7 @@
             postData.deptIds = depts;
             postData.quickId = setDeptConfg.id;
             postData.classId = setDeptConfg.classesId;
-          }else if(this.ruleType == 2){
+          }else if(this.ruleType == 2 || this.ruleType == 1){
             postData.quickId = setDeptConfg.id;
             postData.classId = setDeptConfg.classesId;
           }

pages/mypage/mypage.vue

@@ -260,7 +260,7 @@
               let workType = ress.settings ? ress.settings.workType : -1; //1是综合，2是自主
               let ruleType = ress.settings ? ress.settings.ruleType : -1; //3是科室绑定人员,4是科室绑定分组，2是绑定分组
               // 自主下班,并且是科室绑定人员,科室绑定分组，绑定分组
-              if (workType == 2 && (ruleType == 2||ruleType == 3||ruleType == 4)) {
+              if (workType == 2 && (ruleType == 1||ruleType == 2||ruleType == 3||ruleType == 4)) {
                 post("/auth/onOrOffLine", {
                   type: "off",
                   customWorking: "off",
@@ -322,7 +322,7 @@
               uni.hideLoading();
               uni.showToast({
                 icon: "none",
-                title: "请求失败！",
+                title: ress.msg || "请求失败！",
               });
             }
           });

pages/receiptpage/receiptpage.vue

@@ -721,11 +721,11 @@
       this.getMenu();
       post("/auth/getUserWorkDept", {}).then((ress) => {
         if (ress.status == 200) {
-          // let userId = uni.getStorageSync("userData").user.id;
+          let userId = uni.getStorageSync("userData").user.id;
           let groupManager = ress.settings && ress.settings.groupManager; //当前工作组合选择的组
           let workType = ress.settings ? ress.settings.workType : -1; //1是综合，2是自主
           let ruleType = ress.settings ? ress.settings.ruleType : -1; //3是科室绑定人员,4是科室绑定分组，2是绑定分组
-          if (workType == 2 && (ruleType == 3 || (ruleType == 4 && groupManager))) {
+          if (workType == 2 && (ruleType == 3 || (ruleType == 4 && userId == groupManager.manager))) {
             //自选排班，科室绑定分组,当前登陆人是组长
             this.content.unshift({
               text: "负责科室",

pages/setDept/setDept.vue

@@ -281,8 +281,8 @@
           if (res.status == 200) {
             this.zxzData = res.data;
             if (res.settings) {
-              if (res.settings.groupManager) {
-                setDeptConfg.selectGroupId = res.settings.groupManager.groupIds;
+              if (res.settings.groupManager && this.changedept == 1) {
+                setDeptConfg.selectGroupId = res.settings.groupManager.id;
                 uni.setStorageSync('setDeptConfg', setDeptConfg);
               }
             }