快捷建单功能修改

components/bigScreen/bigScreen.vue

@@ -170,7 +170,7 @@
         });
       },
       // 底部扫描
-      Scanning() {
+      Scanning(qrcodePrefix = '') {
         if (!this.SMFlag) {
           return;
         }
@@ -193,7 +193,7 @@
                   code: result.code, //二维码
                 };
                 //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
-                post("/workerOrder/scanCode", data)
+                post("/workerOrder/scanCode", { code: qrcodePrefix + result.code })
                   .then((res) => {
                     uni.hideLoading();
                     if (res.status == 200) {

components/showModel/showModel.vue

@@ -56,6 +56,13 @@
           >{{ operate.ok || "" }}</view
         >
         <view
+          v-if="operate.no"
+          class="showModel__ok"
+          @click="no"
+          hover-class="seimin-btn-hover"
+          >{{ operate.no || "" }}</view
+        >
+        <view
           v-if="operate.cancel"
           class="showModel__cancel"
           @click="cancel"
@@ -178,6 +185,10 @@ export default {
     ok() {
       this.$emit("ok");
     },
+    // 否
+    no() {
+      this.$emit("no");
+    },
     // 取消
     cancel() {
       this.$emit("cancel");
@@ -311,7 +322,7 @@ export default {
         color: rgb(102, 102, 102);
         position: relative;
 
-        &:nth-of-type(2)::before {
+        & ~ view::before {
           content: "";
           position: absolute;
           left: 0;

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.29');
+console.info('v2.4.30');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receiptpage/receiptpage.vue

@@ -281,7 +281,14 @@
       </scroll-view>
     </view>
     <!-- 底部扫一扫 -->
-    <bigScreen></bigScreen>
+    <view class="bigScreenWrap">
+      <bigScreen ref="bigscreen"></bigScreen>
+      <view class="more"></view>
+      <picker class="more_picker" @click.stop @change="execFilterBigScreen($event)" :value="indexBigScreen"
+        :range="arrayBigScreen" range-key="name">
+        <view class="uni-input">{{ arrayBigScreen[indexBigScreen].name }}</view>
+      </picker>
+    </view>
     <!-- 悬浮按钮 -->
     <uni-fab :pattern="pattern" :content="content" :direction="direction" @trigger="trigger"></uni-fab>
     <!-- 弹窗 -->
@@ -361,8 +368,12 @@
             name: "执行中",
           },
         ],
+        // 筛选条件
+        arrayBigScreen: [],
         index: 0,
+        indexBigScreen: 0,
         arrayKey: 0,
+        arrayKeyBigScreen: 0,
         // 当前登录人是否是药房角色
         pharmacistFlag: false,
         // 抢单的id
@@ -548,6 +559,18 @@
         this.selectedLabelSlots = "执行中";
         this.executingOrders(0);
       },
+      // 大扫描筛选
+      execFilterBigScreen({
+        detail: {
+          value
+        }
+      }) {
+        this.indexBigScreen = value;
+        this.arrayKeyBigScreen = this.arrayBigScreen[value].id;
+        console.log(this.arrayKeyBigScreen);
+        console.log(this.$refs.bigscreen);
+        this.$refs.bigscreen.Scanning(this.arrayKeyBigScreen);
+      },
       // 获取科室二维码设置开关
       getMenu() {
         let menu = uni.getStorageSync("userData").menu;
@@ -558,6 +581,7 @@
         );
         //判断当前登陆人具体角色 end
         console.log(menu);
+        this.arrayBigScreen = [];
         menu.forEach((item) => {
           if (item.link === "wxInspect") {
             this.content.push({
@@ -594,6 +618,31 @@
             this.content.push({
               text: "我的二维码",
             });
+          } else if (item.link === "BIAOBEN") {
+            this.arrayBigScreen.push({
+              id: 'BIAOBEN|$|',
+              name: "标本",
+            });
+          } else if (item.link === "YAOPING") {
+            this.arrayBigScreen.push({
+              id: 'YAOPING|$|',
+              name: "药品",
+            });
+          } else if (item.link === "HUANZHE") {
+            this.arrayBigScreen.push({
+              id: 'HUANZHE|$|',
+              name: "患者",
+            });
+          } else if (item.link === "XIEZHIPING") {
+            this.arrayBigScreen.push({
+              id: 'XIEZHIPING|$|',
+              name: "血制品",
+            });
+          } else if (item.link === "KJJD") {
+            this.arrayBigScreen.push({
+              id: 'KJJD|$|',
+              name: "快捷建单",
+            });
           }
         });
       },
@@ -1407,6 +1456,38 @@
     width: 100%;
     height: 100%;
     position: relative;
+    
+    .more {
+      position: absolute;
+      right: 20rpx;
+      width: 40rpx;
+      height: 4rpx;
+      border-top: 2px solid #49b856;
+      border-bottom: 2px solid #49b856;
+      background-color: #49b856;
+      padding: 5px 0;
+      background-clip: content-box;
+      z-index: 9999;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+    
+    .more_picker {
+      position: absolute;
+      right: 0;
+      height: 100%;
+      opacity: 0;
+      z-index: 9999;
+    }
+    
+    .bigScreenWrap{
+      position: fixed;
+      left: 0;
+      right: 0;
+      bottom: 30rpx;
+      z-index: 999;
+      height: 88rpx;
+    }
 
     .red {
       color: red !important;
@@ -1446,25 +1527,6 @@
           margin-left: 8rpx;
         }
 
-        .more {
-          position: absolute;
-          right: 20rpx;
-          width: 40rpx;
-          height: 4rpx;
-          border-top: 2px solid #49b856;
-          border-bottom: 2px solid #49b856;
-          background-color: #49b856;
-          padding: 5px 0;
-          background-clip: content-box;
-        }
-
-        .more_picker {
-          position: absolute;
-          right: 0;
-          height: 100%;
-          opacity: 0;
-        }
-
         &.active {
           color: #49b856;
 

pages/shortcutbuildOrders/shortcutbuildOrders.vue

@@ -50,6 +50,7 @@
 <script>
   import {
     get,
+    post,
     webHandle
   } from "../../http/http.js";
   export default {
@@ -72,7 +73,9 @@
                 mask: true,
                 title: '加载中'
               })
-              get(`/workerOrder/createQuickOrder/${this.msg.id}`, {}).then((res) => {
+              post(`/workerOrder/createQuickOrder`, {
+                id: this.msg.id
+              }).then((res) => {
                 console.log(res)
                 uni.hideLoading();
                 if (res.status == 200) {

pages/specimenChecking/specimenChecking.vue

@@ -37,17 +37,28 @@
     <changeSpeNum v-if="changeSpeModels.disjunctor" :operate="{ok:'确认数量',check:'详细核对',cancel:'取消'}" :title="changeSpeModels.title" :content="changeSpeModels.content"
       :disjunctor="changeSpeModels.disjunctor" @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange">
     </changeSpeNum>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      @ok="ok" @no="no" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
   </view>
 </template>
 <script>
+  import showModel from "../../components/showModel/showModel.vue";
   import {
     get,
     post,
     webHandle
   } from "../../http/http.js";
   export default {
+    components: {
+      showModel,
+    },
     data() {
       return {
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
         list: [],
         msg: {}, //页面展示信息
         // 修改标本数量弹窗model
@@ -59,6 +70,52 @@
       };
     },
     methods: {
+      //确认数量并建单-知道了
+      know() {
+        this.models.disjunctor = false;
+      },
+      //确认数量并建单-确定
+      ok() {
+        this.models.disjunctor = false;
+        const speNumNot0Depts = this.list.filter(v => v.speNum !== 0);
+        const speNumNot0DeptsStr = speNumNot0Depts.map(v => v.deptId).toString();
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        post(`/workerOrder/createQuickOrder`, {
+          id: this.msg.id,
+          notEmptyEndDeptIds: speNumNot0DeptsStr || undefined,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            if (res.type === 'plan-spe-ddd-2') {
+              //需要扫描标本
+              uni.navigateTo({
+                url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined&endDepts=${this.msg.targetDept}&deptId=${res.deptId}`,
+              });
+            } else {
+              uni.navigateTo({
+                url: "../receiptpage/receiptpage",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      //确认数量并建单-否
+      no() {
+        this.models.disjunctor = false;
+        this.createOrderFun();
+      },
+      //确认数量并建单-取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
       // 数量核对 start
       // 修改标本数量-核对
       changeSpeCheck(){
@@ -341,45 +398,84 @@
           url: `../../pages/receiptpage/receiptpage`,
         });
       },
-      // 确认数量并建单
-      createOrder() {
-        uni.showModal({
-          title: '提示',
-          content: "您确认建单吗？",
-          success: (res) => {
-            if (res.confirm) {
-              console.log('用户点击确定');
-              uni.showLoading({
-                mask: true,
-                title: '加载中'
-              })
-              get(`/workerOrder/createQuickOrder/${this.msg.id}`, {}).then((res) => {
-                console.log(res)
-                uni.hideLoading();
-                if (res.status == 200) {
-                  if (res.type === 'plan-spe-ddd-2') {
-                    //需要扫描标本
-                    uni.navigateTo({
-                      url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined&endDepts=${this.msg.targetDept}&deptId=${res.deptId}`,
-                    });
-                  } else {
-                    uni.navigateTo({
-                      url: "../receiptpage/receiptpage",
-                    });
-                  }
-                } else {
-                  uni.showToast({
-                    icon: "none",
-                    title: "请求失败！",
-                  });
-                }
+      // 确认数量并建单-方法
+      createOrderFun(){
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        post(`/workerOrder/createQuickOrder`, {
+          id: this.msg.id,
+        }).then((res) => {
+          console.log(res)
+          uni.hideLoading();
+          if (res.status == 200) {
+            if (res.type === 'plan-spe-ddd-2') {
+              //需要扫描标本
+              uni.navigateTo({
+                url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined&endDepts=${this.msg.targetDept}&deptId=${res.deptId}`,
+              });
+            } else {
+              uni.navigateTo({
+                url: "../receiptpage/receiptpage",
               });
-            } else if (res.cancel) {
-              console.log('用户点击取消');
             }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
           }
         });
       },
+      // 确认数量并建单
+      createOrder() {
+        console.log(this.list);
+        const speNum0Depts = this.list.filter(v => v.speNum === 0);
+        const speNumNot0Depts = this.list.filter(v => v.speNum !== 0);
+        if(!speNumNot0Depts.length){
+          uni.showModal({
+            title: '提示',
+            content: "您所有科室本轮配送均无标本，无法建单！",
+            showCancel: false,
+            success: (res) => {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+        }else{
+          if(speNum0Depts.length){
+            const speNum0DeptsName = speNum0Depts.map(v => v.deptName).toString();
+            this.models = {
+              disjunctor: true,
+              title: "提示",
+              content: `您有科室本轮配送无标本，是否清除。科室分别为:<span class="red">${speNum0DeptsName}</span>`,
+              icon: "warn",
+              operate: {
+                ok: "是",
+                no: '否',
+                cancel: "取消",
+              },
+            };
+          }else{
+            uni.showModal({
+              title: '提示',
+              content: "您确认建单吗？",
+              success: (res) => {
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                  this.createOrderFun();
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            });
+          }
+        }
+      },
     },
     onLoad(options) {
       console.log(options, "快捷建单");