自选排班新增工作模式

pages/homePage/homePage.vue

@@ -18,9 +18,12 @@
           :refresher-triggered="triggered" @refresherrefresh="refresherrefresh" @refresherrestore="refresherrestore"
           @scrolltolower="scrolltolower" :scroll-top="scroll_top" @refresherabort="refresherabort" @scroll="scroll">
           <radio-group @change="radioChange1">
-            <label class="goWorkSelect-item" v-for="item in zxzData" :key="item.str">
+            <label class="goWorkSelect-item relative" v-for="item in zxzData" :key="item.str">
               <radio :value="item.str" :checked="item.checked" />
-              <view>{{ item.configName }}</view>
+              <picker class="picker" v-if="item.ruleType == 4" @change="bindPickerChange" :value="index" :range="groups" range-key="groupName">
+                <view>{{ item.configName }}</view>
+              </picker>
+              <view v-else>{{ item.configName }}</view>
             </label>
           </radio-group>
         </scroll-view>
@@ -70,6 +73,10 @@
     <showModel :title="modelsLock.title" :icon="modelsLock.icon" :disjunctor="modelsLock.disjunctor"
       :content="modelsLock.content" @ok="okLock" @cancel="cancelLock" :operate="modelsLock.operate" @know="knowLock">
     </showModel>
+    <!-- 自选排班-科室绑定分组-弹窗 -->
+    <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor"
+      :content="models2.content" @ok="ok2" @cancel="cancel2" :operate="models2.operate">
+    </showModel>
   </view>
 </template>
 
@@ -136,6 +143,14 @@
         modelsLock: {
           disjunctor: false,
         },
+        groups: [],
+        index: 0,
+        quickObj:{},//选择的上班快捷组合
+        // 自选排班-科室绑定分组-弹窗model
+        models2: {
+          disjunctor: false,
+        },
+        objHistory:{}
       };
     },
     methods: {
@@ -237,6 +252,9 @@
       // 选择历史上班记录
       radioChange2(value) {
         this.objHistory = JSON.parse(value.target.value);
+        if(!this.objHistory.deptList){
+          this.objHistory.deptList = [];
+        }
         let depts = this.objHistory.deptList.map((item) => item.dept).join();
         this.models = {
           disjunctor: true,
@@ -309,30 +327,98 @@
           }
         );
       },
+      //确定
+      ok2() {
+        uni.setStorageSync("manager", this.groups[this.index].manager);//储存分组组长
+        this.models2.disjunctor = false;
+        //进入设置科室界面
+        uni.setStorageSync("setDeptConfg", {
+          //存设置科室的配置信息
+          configName: this.quickObj.configName,
+          workSchemeType: this.workSchemeType,
+          ruleType: this.quickObj.ruleType,
+          id: this.quickObj.id,
+          classesId: this.quickObj.classes.id,
+          selectGroupId:this.groups[this.index].id,
+        });
+        uni.navigateTo({
+          url: `../setDept/setDept?configName=${this.quickObj.configName}&id=${this.quickObj.id}`,
+        });
+      },
+      //取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
+      //工作组合的工作模式是2（科室绑定分组）或4（绑定分组）
+      bindPickerChange: function(e) {
+          console.log('picker发送选择改变，携带值为', e.detail.value)
+          this.index = e.target.value;
+          let userId = uni.getStorageSync("userData").user.id;
+          let groupObj = this.groups[this.index];
+          if(groupObj.manager == userId){
+            //当前登陆人是该分组组长-弹窗确定
+            this.models2 = {
+              disjunctor: true,
+              title: "提示",
+              content: `请确认您选择了‘${this.quickObj.classes.name}’班次，并选择了‘${groupObj.groupName}’分组！`,
+              icon: "warn",
+              operate: {
+                ok: "确定",
+                cancel: "取消",
+              },
+            };
+          }else{
+            //当前登陆人不是该分组组长
+            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(this.groups);
+          }
+      },
       // 选择上班快捷组合
       radioChange1(value) {
         let obj = JSON.parse(value.target.value);
         console.log(obj);
+        this.quickObj = obj;
         this.ruleType = obj.ruleType;
+        if (uni.getStorageSync("setDeptConfg")) {
+          uni.removeStorageSync("setDeptConfg"); //清空选择的科室配置,初始化
+        }
         if (obj.ruleType == 1) {
           //自由抢单,直接上班
-          if (uni.getStorageSync("setDeptConfg")) {
-            uni.removeStorageSync("setDeptConfg"); //清空选择的科室配置,初始化
-          }
           this.GoWork();
         } else if (obj.ruleType == 3) {
           //科室绑定人员,进入设置科室界面
           uni.setStorageSync("setDeptConfg", {
             //存设置科室的配置信息
-            configName: obj.configName,
+            configName: this.quickObj.configName,
             workSchemeType: this.workSchemeType,
-            ruleType: obj.ruleType,
-            id: obj.id,
-            classesId: obj.classes.id,
+            ruleType: this.quickObj.ruleType,
+            id: this.quickObj.id,
+            classesId: this.quickObj.classes.id,
           });
           uni.navigateTo({
-            url: `../setDept/setDept?configName=${obj.configName}&id=${obj.id}`,
+            url: `../setDept/setDept?configName=${this.quickObj.configName}&id=${this.quickObj.id}`,
+          });
+        }else if(obj.ruleType == 2){
+          //绑定分组,直接上班
+          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(obj.groups);
+        }else if(obj.ruleType == 4){
+          //科室绑定分组，弹出分组选择
+          this.groups = obj.groups;
         }
       },
       // 连接上下班的websocket  baba type如果是wx则是微信，app则是app；有app必有ip
@@ -436,23 +522,43 @@
         }
       },
       // 上班
-      GoWork() {
+      GoWork(groups) {
+        console.log(groups)
         uni.showLoading({
           title: "加载中",
           mask: true,
         });
-        if (this.workSchemeType == 2 && this.ruleType == 3) {
-          let obj = uni.getStorageSync("setDeptConfg");
-          let depts = this.objHistory.deptList.map((item) => item.id).join();
+        //自选排班，科室绑定人员,科室绑定分组，绑定分组
+        if (this.workSchemeType == 2 && (this.ruleType == 2||this.ruleType == 3||this.ruleType == 4)) {
           let userId = uni.getStorageSync("userData").user.id;
-          post("/auth/onOrOffLine", {
+          let setDeptConfg = uni.getStorageSync("setDeptConfg");
+          let postData = {
             type: "on",
             customWorking: "on",
-            quickId: obj.id,
-            deptIds: depts,
             userId: userId,
-            classId: uni.getStorageSync("setDeptConfg").classesId
-          }).then((result) => {
+          };
+          console.log(postData,this.objHistory)
+          if(this.ruleType == 3||this.ruleType == 4){
+            if(!this.objHistory.deptList){
+              this.objHistory.deptList = [];
+            }
+            let depts = this.objHistory.deptList.map((item) => item.id).join();
+            postData.deptIds = depts;
+            postData.quickId = setDeptConfg.id;
+            postData.classId = setDeptConfg.classesId;
+          }else if(this.ruleType == 2){
+            postData.quickId = setDeptConfg.id;
+            postData.classId = setDeptConfg.classesId;
+          }
+          console.log(postData,this.ruleType,setDeptConfg)
+          if(groups){
+            postData.groupIds = groups.map(v=>v.id).toString();
+            if(this.ruleType == 4){
+              //科室绑定分组，并且当前登陆人不是组长
+              delete postData.deptIds;
+            }
+          }
+          post("/auth/onOrOffLine", postData).then((result) => {
             uni.hideLoading();
             if (result.status == 200) {
               let obj = uni.getStorageSync("userData");
@@ -483,10 +589,14 @@
             }
           });
         } else {
-          post("/auth/onOrOffLine", {
+          let postData = {
             type: "on",
             classId: uni.getStorageSync("setDeptConfg").classesId
-          }).then((res) => {
+          };
+          if(groups){//caocao
+            postData.groupIds = groups.map(v=>v.id).toString();
+          }
+          post("/auth/onOrOffLine", postData).then((res) => {
             uni.hideLoading();
             if (res.status == 200) {
               let obj = uni.getStorageSync("userData");
@@ -1106,6 +1216,15 @@
             border-bottom: 2rpx solid #e5e9ed;
             padding: 16rpx;
 
+            &.relative{
+              position:relative;
+              .picker{
+                position: absolute;
+                width: 100%;
+                padding-left:64rpx;
+              }
+            }
+
             button {
               font-size: 32rpx;
               height: 52rpx;

pages/mypage/mypage.vue

@@ -258,9 +258,9 @@
           this.getWorkSchemeAndRule().then((ress) => {
             if (ress.status == 200) {
               let workType = ress.settings ? ress.settings.workType : -1; //1是综合，2是自主
-              let ruleType = ress.settings ? ress.settings.ruleType : -1; //3是科室绑定人员
-              // 自主下班,并且是科室绑定人员
-              if (workType == 2 && ruleType == 3) {
+              let ruleType = ress.settings ? ress.settings.ruleType : -1; //3是科室绑定人员,4是科室绑定分组，2是绑定分组
+              // 自主下班,并且是科室绑定人员,科室绑定分组，绑定分组
+              if (workType == 2 && (ruleType == 2||ruleType == 3||ruleType == 4)) {
                 post("/auth/onOrOffLine", {
                   type: "off",
                   customWorking: "off",
@@ -276,6 +276,9 @@
                     if (uni.getStorageSync("setDepts")) {
                       uni.removeStorageSync("setDepts"); //清空选择的科室,初始化
                     }
+                    if (uni.getStorageSync("manager")) {
+                      uni.removeStorageSync("manager"); //清空选择的分组组长,初始化
+                    }
                     uni.setStorageSync("userData", obj);
                     this.getCurrentUser();
                     this.getTabData();
@@ -299,6 +302,9 @@
                     if (uni.getStorageSync("setDepts")) {
                       uni.removeStorageSync("setDepts"); //清空选择的科室,初始化
                     }
+                    if (uni.getStorageSync("manager")) {
+                      uni.removeStorageSync("manager"); //清空选择的分组组长,初始化
+                    }
                     let obj = uni.getStorageSync("userData");
                     obj.user.online = false;
                     uni.setStorageSync("userData", obj);

pages/receiptpage/receiptpage.vue

@@ -689,8 +689,12 @@
     onLoad() {
       // 获取菜单权限
       this.getMenu();
-      if (uni.getStorageSync("setDeptConfg")) {
-        //如果有设置科室的配置，则显示
+      let setDeptConfg = uni.getStorageSync("setDeptConfg");
+      let manager = uni.getStorageSync("manager");
+      let userId = uni.getStorageSync("userData").user.id;
+      console.log(setDeptConfg,manager,userId)
+      if (setDeptConfg.workSchemeType == 2 && (setDeptConfg.ruleType == 3 || (setDeptConfg.ruleType == 4 && userId == manager) )) {
+        //自选排班，科室绑定人员 || 科室绑定分组 && 组长是当前登陆人
         this.content.unshift({
           text: "负责科室",
         });

pages/setDept/setDept.vue

@@ -118,6 +118,7 @@
             },
           };
         } else {
+          let setDeptConfg = uni.getStorageSync("setDeptConfg");
           let ids1 = this.zxzData.map((item) => item.id);
           let ids2 = this.zxzData.map((item) => {
             return {
@@ -129,8 +130,13 @@
             deptIds: ids1.join(),
             userId: this.userId,
             changeDept: 1,
-            classId: uni.getStorageSync("setDeptConfg").classesId
+            classId: setDeptConfg.classesId
           };
+          if(setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4){
+            //自选排班，科室绑定分组
+            postData1.groupIds = setDeptConfg.selectGroupId.toString();
+            postData1.isManager = true;
+          }
           let postData2 = {
             workConfigHistory: {
               user: {
@@ -141,7 +147,7 @@
               },
               deptList: ids2,
               hosId: uni.getStorageSync("userData").user.currentHospital.id,
-              classId: uni.getStorageSync("setDeptConfg").classesId
+              classId: setDeptConfg.classesId
             },
           };
           uni.showLoading({
@@ -196,14 +202,20 @@
               }
             });
           } else {
-            post("/auth/onOrOffLine", {
+            let postData = {
               type: "on",
               customWorking: "on",
               quickId: this.id,
               deptIds: ids1.join(),
               userId: this.userId,
-              classId: uni.getStorageSync("setDeptConfg").classesId
-            }).then((res) => {
+              classId: setDeptConfg.classesId
+            };
+            if(setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4){
+              //自选排班，科室绑定分组
+              postData.groupIds = setDeptConfg.selectGroupId.toString();
+              postData.isManager = true;
+            }
+            post("/auth/onOrOffLine", postData).then((res) => {
               if (res.status == 200) {
                 post("/configuration/addData/workConfigHistory", postData2).then(
                   (result) => {
@@ -254,11 +266,6 @@
           if (res.status == 200) {
             this.zxzData = res.data;
             uni.setStorageSync("setDepts", this.zxzData); //存科室列表
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
           }
         });
       },