Merge branch 'lmm' into develop

main.js

@@ -2,8 +2,8 @@ import Vue from 'vue'
 import App from './App'
 // #ifdef H5
 import wx from 'weixin-jsapi'
-// import VConsole from 'vconsole';
-// new VConsole();
+import VConsole from 'vconsole';
+new VConsole();
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receiptpage/receiptpage.vue

@@ -5,10 +5,10 @@
         :key="item.value" @click="clickHandler(item.label)">
         {{ item.label }}
         <text class="tab_num">( {{ item.num }} )</text>
-        <view class="more" v-if="item.label==='执行中'"></view>
-        <picker class="more_picker" v-if="item.label==='执行中'" @click.stop @change="execFilter($event)" :value="index"
+        <view class="more" v-if="item.label === '执行中'"></view>
+        <picker class="more_picker" v-if="item.label === '执行中'" @click.stop @change="execFilter($event)" :value="index"
           :range="array" range-key="name">
-          <view class="uni-input">{{array[index].name}}</view>
+          <view class="uni-input">{{ array[index].name }}</view>
         </picker>
       </view>
     </view>
@@ -54,7 +54,9 @@
                 <!-- 待取货 -->
               </view>
               <view class="page_item_top_R type">
-                {{item.isHalfInspect===1?'半程陪检':item.taskType.taskName}}
+                {{
+                  item.isHalfInspect === 1 ? "半程陪检" : item.taskType.taskName
+                }}
               </view>
             </view>
             <view class="page_item_cont" @click="itemInfo(item.id)">
@@ -95,17 +97,26 @@
                 </view>
                 <view v-if="item.patient.careLevel">
                   护理等级 :
-                  <text
-                    :class="[(item.patient.careLevel.value==0||item.patient.careLevel.value==1)?'red':'green']">{{ item.patient.careLevel.name}}</text>
+                  <text :class="[
+                      item.patient.careLevel.value == 0 ||
+                      item.patient.careLevel.value == 1
+                        ? 'red'
+                        : 'green',
+                    ]">{{ item.patient.careLevel.name }}</text>
                 </view>
                 <view v-if="item.patient.illnessState">
                   病情级别 :
-                  <text
-                    :class="{red:item.patient.illnessState.value==2||item.patient.illnessState.value==3}">{{ item.patient.illnessState.name}}</text>
+                  <text :class="{
+                      red:
+                        item.patient.illnessState.value == 2 ||
+                        item.patient.illnessState.value == 3,
+                    }">{{ item.patient.illnessState.name }}</text>
                 </view>
-                <view v-if="item.isAccompany===1||item.isAccompany===0">
+                <view v-if="item.isAccompany === 1 || item.isAccompany === 0">
                   陪同情况 :
-                  <text :class="{red:item.isAccompany===1}">{{ item.isAccompany===1?'需要医护陪同':'无需医护陪同'}}</text>
+                  <text :class="{ red: item.isAccompany === 1 }">{{
+                    item.isAccompany === 1 ? "需要医护陪同" : "无需医护陪同"
+                  }}</text>
                 </view>
               </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'patientTransport'">
@@ -120,27 +131,37 @@
                 </view>
                 <view v-if="item.patient.careLevel">
                   护理等级 :
-                  <text
-                    :class="[(item.patient.careLevel.value==0||item.patient.careLevel.value==1)?'red':'green']">{{ item.patient.careLevel.name}}</text>
+                  <text :class="[
+                      item.patient.careLevel.value == 0 ||
+                      item.patient.careLevel.value == 1
+                        ? 'red'
+                        : 'green',
+                    ]">{{ item.patient.careLevel.name }}</text>
                 </view>
                 <view v-if="item.patient.illnessState">
                   病情级别 :
-                  <text
-                    :class="{red:item.patient.illnessState.value==2||item.patient.illnessState.value==3}">{{ item.patient.illnessState.name}}</text>
+                  <text :class="{
+                      red:
+                        item.patient.illnessState.value == 2 ||
+                        item.patient.illnessState.value == 3,
+                    }">{{ item.patient.illnessState.name }}</text>
                 </view>
-                <view v-if="item.isAccompany===1||item.isAccompany===0">
+                <view v-if="item.isAccompany === 1 || item.isAccompany === 0">
                   陪同情况 :
-                  <text :class="{red:item.isAccompany===1}">{{ item.isAccompany===1?'需要医护陪同':'无需医护陪同'}}</text>
+                  <text :class="{ red: item.isAccompany === 1 }">{{
+                    item.isAccompany === 1 ? "需要医护陪同" : "无需医护陪同"
+                  }}</text>
                 </view>
               </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'drugsBag'">
                 <view>
-                  药包编码 : {{ item.drugs?item.drugs.packid:'无'}}
+                  药包编码 : {{ item.drugs ? item.drugs.packid : "无" }}
                 </view>
               </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'jPBag'">
                 <view>
-                  药包编码 : {{ item.staticDistri?item.staticDistri.packid:'无'}}
+                  药包编码 :
+                  {{ item.staticDistri ? item.staticDistri.packid : "无" }}
                 </view>
               </view>
               <view class="line"></view>
@@ -238,18 +259,22 @@
       return {
         // 筛选条件
         array: [{
-          id: 0,
-          name: '全部'
-        }, {
-          id: 71,
-          name: '待到达'
-        }, {
-          id: 72,
-          name: '待送达'
-        }, {
-          id: 75,
-          name: '执行中'
-        }, ],
+            id: 0,
+            name: "全部",
+          },
+          {
+            id: 71,
+            name: "待到达",
+          },
+          {
+            id: 72,
+            name: "待送达",
+          },
+          {
+            id: 75,
+            name: "执行中",
+          },
+        ],
         index: 0,
         arrayKey: 0,
         // 当前登录人是否是药房角色
@@ -336,39 +361,41 @@
         this.zxzData = [];
         this.totalNum = -1;
         this.idx = 0;
-        this.selectedLabelSlots = '执行中';
+        this.selectedLabelSlots = "执行中";
         this.executingOrders(0);
       },
       // 获取科室二维码设置开关
       getMenu() {
-        let menu = uni.getStorageSync('userData').menu;
+        let menu = uni.getStorageSync("userData").menu;
         //判断当前登陆人具体角色 start
         let roles = uni.getStorageSync("userData").user.role;
-        this.pharmacistFlag = roles.some(item => item.rolecode === "pharmacist");
+        this.pharmacistFlag = roles.some(
+          (item) => item.rolecode === "pharmacist"
+        );
         //判断当前登陆人具体角色 end
         console.log(menu);
-        menu.forEach(item => {
-          if (item.link === 'wxInspect') {
+        menu.forEach((item) => {
+          if (item.link === "wxInspect") {
             this.content.push({
               text: "检查信息",
             });
-          } else if (item.link === 'wxPatient') {
+          } else if (item.link === "wxPatient") {
             this.content.push({
               text: "患者信息",
             });
-          } else if (item.link === 'wxPharmacy') {
+          } else if (item.link === "wxPharmacy") {
             // 如果是配药师人员,则增加药房
             if (this.pharmacistFlag) {
               this.content.push({
                 text: "药房",
               });
             }
-          } else if (item.link === 'wxCode') {
+          } else if (item.link === "wxCode") {
             this.content.push({
               text: "二维码设置",
             });
           }
-        })
+        });
       },
       // 拍照
       photograph(data) {
@@ -521,7 +548,7 @@
       },
       //执行中列表数据获取
       executingOrders(idx) {
-        console.log(this.zxzData.length, this.totalNum)
+        console.log(this.zxzData.length, this.totalNum);
         if (this.zxzData.length == this.totalNum) {
           uni.showToast({
             icon: "none",
@@ -692,16 +719,34 @@
     onLoad() {
       // 获取菜单权限
       this.getMenu();
-      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: "负责科室",
-        });
-      }
+      post("/auth/getUserWorkDept", {}).then((ress) => {
+        if (ress.status == 200) {
+          // 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))) {
+            //自选排班，科室绑定分组,当前登陆人是组长
+            this.content.unshift({
+              text: "负责科室",
+            });
+          }
+        }
+      });
+      // 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: "负责科室",
+      //   });
+      // }
       // #ifdef APP-PLUS
       // this.content.push({
       //   text: "退出登录",

pages/setDept/setDept.vue

@@ -130,10 +130,11 @@
             deptIds: ids1.join(),
             userId: this.userId,
             changeDept: 1,
-            classId: setDeptConfg.classesId
+            classId: setDeptConfg.classesId,
           };
-          if(setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4){
+          if (setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4 && this.changedept == 1) {
             //自选排班，科室绑定分组
+            console.log(setDeptConfg)
             postData1.groupIds = setDeptConfg.selectGroupId.toString();
             postData1.isManager = true;
           }
@@ -147,14 +148,15 @@
               },
               deptList: ids2,
               hosId: uni.getStorageSync("userData").user.currentHospital.id,
-              classId: setDeptConfg.classesId
+              classId: setDeptConfg.classesId,
             },
           };
           uni.showLoading({
             title: "加载中",
             mask: true,
           });
-          if (this.changedept == 1) { //单纯切换科室！！！！
+          if (this.changedept == 1) {
+            //单纯切换科室！！！！
             //切换负责科室，不重新上班
             post("/auth/customOnline", postData1).then((res) => {
               if (res.status == 200) {
@@ -208,10 +210,11 @@
               quickId: this.id,
               deptIds: ids1.join(),
               userId: this.userId,
-              classId: setDeptConfg.classesId
+              classId: setDeptConfg.classesId,
             };
-            if(setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4){
+            if (setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4) {
               //自选排班，科室绑定分组
+              console.log(setDeptConfg)
               postData.groupIds = setDeptConfg.selectGroupId.toString();
               postData.isManager = true;
             }
@@ -261,10 +264,28 @@
           title: "加载中",
           mask: true,
         });
-        post("/auth/getUserWorkDept", {}).then((res) => {
+        let setDeptConfg = uni.getStorageSync("setDeptConfg");
+        let postData = {};
+        if (setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 4 && this.changedept != 1) {
+          //自选排班，科室绑定分组,切换科室的时候
+          console.log(setDeptConfg)
+          postData.quickId = this.id;
+          postData.groupId = setDeptConfg.selectGroupId.toString();
+        }
+        if (setDeptConfg.workSchemeType == 2 && setDeptConfg.ruleType == 3 && this.changedept != 1) {
+          //自选排班，科室绑定人员,切换科室的时候
+          postData.quickId = this.id;
+        }
+        post("/auth/getUserWorkDept", postData).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
             this.zxzData = res.data;
+            if (res.settings) {
+              if (res.settings.groupManager) {
+                setDeptConfg.selectGroupId = res.settings.groupManager.groupIds;
+                uni.setStorageSync('setDeptConfg', setDeptConfg);
+              }
+            }
             uni.setStorageSync("setDepts", this.zxzData); //存科室列表
           }
         });