Merge branch 'lmm' into develop

http/http.js

@@ -88,6 +88,7 @@ export function SM() {
       success: function(res) {
         let str = res.result.replace(/[\s\/]/g, '') || 'none';
         str = str.replace(/CODABAR,/i, '');
+        str = str.replace(/CODE_128,/i, '');
         resolve(str);
       },
       fail(err) {
@@ -120,6 +121,7 @@ export function SM() {
               // 当needResult 为 1 时，扫码返回的结果
               let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
               str = str.replace(/CODABAR,/i, '');
+              str = str.replace(/CODE_128,/i, '');
               resolve(str);
             },
             cancel(err){

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/mypage/mypage.vue

@@ -10,8 +10,9 @@
       <view class="topText">
         <view class="topTextHeader">
           <text>您好,{{ userData.name }}</text>
-          <button v-show="!userData.online" class="changeHospital" size="mini" type="default"
-            @click="changeHospital">切换院区</button>
+          <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">
+            切换院区
+          </button>
         </view>
         <view>当前积分 : {{ tabNum.score }}</view>
       </view>
@@ -37,7 +38,11 @@
               align-items: center;
               justify-content: space-between;
             ">
-            <view class="tbTitle"> {{ types }}已完成工单{{ tabNums }}单，未评价工单{{tabEvaluate}}单，共计得分{{tabScores}}分 </view>
+            <view class="tbTitle">
+              {{ types }}已完成工单{{ tabNums }}单，未评价工单{{
+                tabEvaluate
+              }}单，共计得分{{ tabScores }}分
+            </view>
             <view class="tbText" @click="my_list(tabType)"> 查看明细>> </view>
           </view>
           <view class="canvasRing_wrap">
@@ -46,7 +51,11 @@
           </view>
         </view>
         <view class="TB1" v-show="tabNums == 0 && !TBLoading">
-          <view class="title"> {{ types }}已完成工单{{ tabComplete }}单，未评价工单{{tabEvaluate}}单，共计得分{{tabScores}}分 </view>
+          <view class="title">
+            {{ types }}已完成工单{{ tabComplete }}单，未评价工单{{
+              tabEvaluate
+            }}单，共计得分{{ tabScores }}分
+          </view>
           <view class="cont"> 暂无数据 </view>
         </view>
         <view class="TB_list" v-show="!TBLoading">
@@ -94,7 +103,7 @@
         hosModels: {
           disjunctor: false,
         },
-        type: '',
+        type: "",
         tabType: "day",
         tabNum: {},
         BtData: [],
@@ -123,38 +132,38 @@
       hosOk(hosId) {
         this.hosModels.disjunctor = false;
         uni.showLoading({
-          title: '正在加载中',
-          mask: true
+          title: "正在加载中",
+          mask: true,
         });
-        let type = '';
+        let type = "";
         // #ifdef APP-PLUS
-        type = 'APP';
+        type = "APP";
         // #endif
         // #ifdef H5
-        type = 'Wechat';
+        type = "Wechat";
         // #endif
         post("/auth/changeHospital", {
-          "currentHosId": hosId,
-          loginType: type
-        }).then(result => {
-          uni.hideLoading()
+          currentHosId: hosId,
+          loginType: type,
+        }).then((result) => {
+          uni.hideLoading();
           if (result.status == 200) {
             uni.showToast({
-              icon: 'success',
-              title: '切换院区成功'
+              icon: "success",
+              title: "切换院区成功",
             });
-            let userData = uni.getStorageSync('userData');
-            console.log(userData)
+            let userData = uni.getStorageSync("userData");
+            console.log(userData);
             userData.user.currentHospital = result.user.user.currentHospital;
-            uni.setStorageSync('userData', userData);
+            uni.setStorageSync("userData", userData);
             this.tab("day", "今日");
           } else {
             uni.showToast({
-              icon: 'none',
-              title: '切换院区失败'
+              icon: "none",
+              title: "切换院区失败",
             });
           }
-        })
+        });
       },
       // 切换院区-取消
       hosCancel() {
@@ -163,9 +172,9 @@
       // 切换院区
       changeHospital() {
         this.hosModels = {
-          title: '切换院区',
+          title: "切换院区",
           disjunctor: true,
-        }
+        };
       },
       // 绘图
       showRing(canvasId, chartData) {
@@ -237,8 +246,39 @@
       // 获取执行中列表
       getWorkingNum() {
         return post("/workerOrder/executingOrders", {
-          "idx": 0,
-          "sum": 1
+          idx: 0,
+          sum: 1,
+        });
+      },
+      // 自选排班下班
+      customOff() {
+        post("/auth/onOrOffLine", {
+          type: "off",
+          customWorking: "off",
+          classId: uni.getStorageSync("setDeptConfg").classesId,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            let obj = uni.getStorageSync("userData");
+            obj.user.online = false;
+            if (uni.getStorageSync("setDeptConfg")) {
+              uni.removeStorageSync("setDeptConfg"); //清空选择的科室配置,初始化
+            }
+            if (uni.getStorageSync("setDepts")) {
+              uni.removeStorageSync("setDepts"); //清空选择的科室,初始化
+            }
+            if (uni.getStorageSync("manager")) {
+              uni.removeStorageSync("manager"); //清空选择的分组组长,初始化
+            }
+            uni.setStorageSync("userData", obj);
+            this.getCurrentUser();
+            this.getTabData();
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
         });
       },
       //上下班弹窗确定
@@ -258,41 +298,13 @@
           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是科室绑定人员,4是科室绑定分组，2是绑定分组
               // 自主下班,并且是科室绑定人员,科室绑定分组，绑定分组
-              if (workType == 2 && (ruleType == 1||ruleType == 2||ruleType == 3||ruleType == 4)) {
-                post("/auth/onOrOffLine", {
-                  type: "off",
-                  customWorking: "off",
-                  classId:uni.getStorageSync("setDeptConfg").classesId
-                }).then((res) => {
-                  uni.hideLoading();
-                  if (res.status == 200) {
-                    let obj = uni.getStorageSync("userData");
-                    obj.user.online = false;
-                    if (uni.getStorageSync("setDeptConfg")) {
-                      uni.removeStorageSync("setDeptConfg"); //清空选择的科室配置,初始化
-                    }
-                    if (uni.getStorageSync("setDepts")) {
-                      uni.removeStorageSync("setDepts"); //清空选择的科室,初始化
-                    }
-                    if (uni.getStorageSync("manager")) {
-                      uni.removeStorageSync("manager"); //清空选择的分组组长,初始化
-                    }
-                    uni.setStorageSync("userData", obj);
-                    this.getCurrentUser();
-                    this.getTabData();
-                  } else {
-                    uni.showToast({
-                      icon: "none",
-                      title: "请求失败！",
-                    });
-                  }
-                });
+              if (workType == 2) {
+                this.customOff();
               } else {
                 post("/auth/onOrOffLine", {
                   type: "off",
-                  classId:uni.getStorageSync("setDeptConfg").classesId
+                  classId: uni.getStorageSync("setDeptConfg").classesId,
                 }).then((res) => {
                   uni.hideLoading();
                   if (res.status == 200) {
@@ -318,6 +330,9 @@
                   }
                 });
               }
+            } else if (ress.status == 500) {
+              //500的时候自选下班
+              this.customOff();
             } else {
               uni.hideLoading();
               uni.showToast({
@@ -340,8 +355,8 @@
           //有online为上班 传off
           this.type = "off";
           uni.showLoading({
-            title: '加载中',
-            mask: true
+            title: "加载中",
+            mask: true,
           });
           let workingNumResult = await this.getWorkingNum();
           uni.hideLoading();
@@ -349,7 +364,8 @@
             workingNum = workingNumResult.data.data.length;
           }
           if (workingNum) {
-            types = "您还<b style='color:red'>有未完成的工单</b>，确定下班后，<b style='color:red'>未完成工单将不计算积分。</b>";
+            types =
+              "您还<b style='color:red'>有未完成的工单</b>，确定下班后，<b style='color:red'>未完成工单将不计算积分。</b>";
           } else {
             types = "确定是否下班 ?";
           }
@@ -359,7 +375,7 @@
         }
         this.models = {
           disjunctor: true,
-          title: this.type == 'off' ? '下班提醒' : "上班提醒",
+          title: this.type == "off" ? "下班提醒" : "上班提醒",
           content: types,
           icon: "warn",
           operate: {