合并提交

App.vue

@@ -83,12 +83,15 @@
 
 <style>
   @import url("./static/font/iconfont.css");
+  @import url("/node_modules/spinkit/spinkit.css");
 
   /*每个页面公共css */
   html {
     width: 100%;
     height: 100%;
     background: #f9fafb;
+    --sk-size: 20rpx!important;
+    --sk-color: #49b856!important;
   }
 
   body {

components/handViewSpecimen/handViewSpecimen.vue

@@ -0,0 +1,369 @@
+<template>
+  <view class="changeHospital" v-show="disjunctor">
+    <view class="changeHospital__wrap">
+      <view class="changeHospital__header" v-if="title">
+        {{ title }}
+      </view>
+      <view class="changeHospital__article">
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            {{name}}：
+          </view>
+          <view class="uni-list-cell-db">
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" v-model="account"
+              @input="bindPickerChange($event)" />
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            检验项目：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text v-show="!loading">{{spe.specimenDesc||'无'}}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            标本类型：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text v-show="!loading">{{ spe.stype ? spe.stype.name : "无" }}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            患者姓名：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text v-show="!loading">{{spe.patientName || '无'}}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="changeHospital__footer">
+        <view v-if="operate.ok" class="changeHospital__ok" @click="ok" hover-class="seimin-btn-hover">
+          {{ operate.ok || "" }}
+        </view>
+        <view v-if="operate.cancel" class="changeHospital__cancel" @click="cancel" hover-class="seimin-btn-hover">
+          {{ operate.cancel || "" }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    post
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        cValue: '', //当前输入的标本编码
+        loading: false,
+        userData: null,
+        hosId: null,
+        timer: null,
+        spe: {}, //标本对象
+        account: '', //交接人账号
+        accountName: '', //交接人姓名
+        accountId: '' //交接人ID
+      };
+    },
+    watch: {
+      disjunctor(newValue) {
+        if (newValue && this.operate.know == "知道了") {
+          this.time = 5;
+          this.timer = setInterval(() => {
+            this.time--;
+            if (this.time <= 0) {
+              clearInterval(this.timer);
+              this.know();
+            }
+          }, 1000);
+        }
+      },
+    },
+    props: {
+      // 显示隐藏
+      disjunctor: {
+        type: Boolean,
+        default: false,
+      },
+      // 标题
+      title: {
+        type: String,
+        default: "提示",
+      },
+      // 操作按钮文字
+      operate: {
+        type: Object,
+        default: () => {
+          return {
+            ok: "确认",
+            cancel: "取消",
+          };
+        },
+      },
+      name: {
+        type: String,
+        default: '标本编码'
+      }
+    },
+    methods: {
+      //修改picker的值
+      bindPickerChange(e) {
+        this.spe = {};
+        this.loading = true;
+        this.cValue = e.target.value;
+        clearTimeout(this.timer);
+        if (this.cValue.length <= 4) {
+          this.spe = {};
+          this.loading = false;
+          return;
+        }
+        this.timer = setTimeout(() => {
+          let nAccount = e.target.value;
+          post("/simple/data/fetchDataList/specimen", {
+            "idx": 0,
+            "sum": 1,
+            "specimen": {
+              "hosId": this.hosId,
+              "scode": e.target.value,
+            }
+          }).then(result => {
+            if (result.status == 200) {
+              if (this.cValue === nAccount) {
+                if (result.list && result.list.length) {
+                  //有值
+                  this.spe = result.list[0];
+                } else {
+                  // 没值
+                  this.spe = {};
+                }
+                this.loading = false;
+              }
+            } else {
+              this.loading = false;
+            }
+          })
+        }, 500)
+      },
+      // 确定
+      ok() {
+        this.$emit("ok", this.spe);
+      },
+      // 取消
+      cancel() {
+        this.$emit("cancel");
+      },
+    },
+    created() {
+      this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+  .changeHospital {
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.2);
+    z-index: 999;
+
+    .uni-list-cell {
+      width: 90%;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-evenly;
+      align-items: center;
+      text-align: center;
+      margin-top: 32rpx;
+
+      .uni-list-cell-left {
+        flex: 3;
+        font-size: 32rpx;
+        color: #666;
+      }
+
+      .uni-list-cell-db {
+        border: 1px solid #e5e9ed;
+        background-color: #fff;
+        padding: 16rpx 0;
+        flex: 5;
+      }
+
+      .uni-list-cell-db-text {
+        flex: 5;
+        text-align: left;
+      }
+    }
+
+    .changeHospital__wrap {
+      width: 90vw;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      background-color: #fff;
+      border-radius: 12rpx;
+      color: #666;
+
+      .changeHospital__header {
+        font-size: 36rpx;
+        color: #000;
+        height: 84rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .changeHospital__article {
+        width: 90%;
+        margin: 0 auto 25rpx;
+        padding: 48rpx 0;
+        background-color: rgb(249, 250, 251);
+        border: 2rpx solid rgb(229, 233, 237);
+        border-radius: 12rpx;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        &.p0 {
+          padding: 0;
+        }
+
+        .changeHospital__icon {
+          font-size: 138rpx;
+          margin-bottom: 32rpx;
+
+          &.changeHospital__icon--success {
+            color: rgb(52, 179, 73);
+          }
+
+          &.changeHospital__icon--warn {
+            color: rgb(245, 165, 35);
+          }
+
+          &.changeHospital__icon--error {
+            color: rgb(255, 58, 82);
+          }
+        }
+
+        .changeHospital__content {
+          font-size: 36rpx;
+        }
+
+        .changeHospital__info {
+          font-size: 32rpx;
+          color: rgb(102, 102, 102);
+        }
+
+        .specialCloseFlag {
+          width: 90%;
+          height: 100%;
+          padding: 16rpx;
+        }
+
+        .radio-wrap {
+          .radio-item {
+            margin-top: 16rpx;
+
+            /deep/ .uni-radio-input-checked {
+              background-color: #49b856 !important;
+              border-color: #49b856 !important;
+            }
+          }
+        }
+      }
+
+      .changeHospital__footer {
+        box-sizing: border-box;
+        height: 100rpx;
+        border-top: 2rpx solid rgb(229, 233, 237);
+        display: flex;
+        align-items: center;
+
+        view {
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 36rpx;
+          color: rgb(102, 102, 102);
+          position: relative;
+
+          &:nth-of-type(2)::before {
+            content: "";
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            width: 2rpx;
+            height: 87rpx;
+            background-color: rgb(229, 233, 237);
+          }
+        }
+
+        .changeHospital__ok {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+
+        .changeHospital__cancel {
+          flex: 1;
+        }
+
+        .changeHospital__know {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+      }
+    }
+  }
+</style>

components/selectAccount/selectAccount.vue

@@ -10,7 +10,8 @@
             {{name}}账号：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name+'账号'" v-model="account" @input="bindPickerChange($event)" />
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name+'账号'" v-model="account"
+              @input="bindPickerChange($event)" />
           </view>
         </view>
         <view class="uni-list-cell">
@@ -18,7 +19,21 @@
             {{name}}姓名：
           </view>
           <view class="uni-list-cell-db-text">
-            <text>{{accountName}}</text>
+            <text v-show="!loading">{{ accountName || "无" }}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
           </view>
         </view>
       </view>
@@ -41,12 +56,14 @@
   export default {
     data() {
       return {
+        cValue: '', //当前输入的标本编码
+        loading: false,
         userData: null,
-        hosId:null,
-        timer:null,
-        account:'',//交接人账号
-        accountName:'',//交接人姓名
-        accountId:''//交接人ID
+        hosId: null,
+        timer: null,
+        account: '', //交接人账号
+        accountName: '', //交接人姓名
+        accountId: '' //交接人ID
       };
     },
     watch: {
@@ -84,41 +101,52 @@
           };
         },
       },
-      name:{
-        type:String,
-        default:'交接人'
+      name: {
+        type: String,
+        default: '交接人'
       }
     },
     methods: {
       //修改picker的值
       bindPickerChange(e) {
-        console.log(e.target.value);
+        this.accountName = '';
+        this.accountId = '';
+        this.loading = true;
+        this.cValue = e.target.value;
         clearTimeout(this.timer);
-        let cValue = e.target.value;
-        this.timer = setTimeout(()=>{
+        this.timer = setTimeout(() => {
           let account = e.target.value;
           post("/data/isRepeat", {
-            hospital: {id: this.hosId},
+            hospital: {
+              id: this.hosId
+            },
             account
           }).then(result => {
-            if(cValue === account && result.status == 200){
-              this.accountName = result.userName;
-              this.account = account;
-              this.accountId = result.userId;
+            if (result.status == 200) {
+              if (this.cValue === account) {
+                this.accountName = result.userName;
+                this.account = account;
+                this.accountId = result.userId;
+                this.loading = false;
+              }
+            } else {
+              this.accountName = '';
+              this.accountId = '';
+              this.loading = false;
             }
           })
-        },500)
+        }, 500)
       },
       // 确定
       ok() {
         let e = {};
-        if(this.accountName){
+        if (this.accountName) {
           e.accountName = this.accountName;
         }
-        if(this.account){
+        if (this.account) {
           e.account = this.account;
         }
-        if(this.accountId){
+        if (this.accountId) {
           e.accountId = this.accountId;
         }
         this.$emit("ok", e);
@@ -165,6 +193,7 @@
         padding: 16rpx 0;
         flex: 5;
       }
+
       .uni-list-cell-db-text {
         flex: 5;
         text-align: left;

package-lock.json

@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "crypto-js": "^4.1.1",
+        "spinkit": "^2.0.1",
         "vconsole": "^3.12.1",
         "weixin-jsapi": "^1.1.0"
       },
@@ -333,6 +334,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/spinkit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/spinkit/-/spinkit-2.0.1.tgz",
+      "integrity": "sha512-oYBGY0GV1H1dX+ZdKnB6JVsYC1w/Xl20H111eb+WSS8nUYmlHgGb4y5buFSkzzceEeYYh5kMhXoAmoTpiQauiA=="
+    },
     "node_modules/ssh2": {
       "version": "1.5.0",
       "resolved": "https://registry.npmmirror.com/ssh2/download/ssh2-1.5.0.tgz",
@@ -691,6 +697,11 @@
         "rechoir": "^0.6.2"
       }
     },
+    "spinkit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/spinkit/-/spinkit-2.0.1.tgz",
+      "integrity": "sha512-oYBGY0GV1H1dX+ZdKnB6JVsYC1w/Xl20H111eb+WSS8nUYmlHgGb4y5buFSkzzceEeYYh5kMhXoAmoTpiQauiA=="
+    },
     "ssh2": {
       "version": "1.5.0",
       "resolved": "https://registry.npmmirror.com/ssh2/download/ssh2-1.5.0.tgz",

package.json

@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "crypto-js": "^4.1.1",
+    "spinkit": "^2.0.1",
     "vconsole": "^3.12.1",
     "weixin-jsapi": "^1.1.0"
   },

pages/pharmacyDetails/pharmacyDetails.vue

@@ -1,10 +1,17 @@
 <template>
   <view class="pharmacyDetails">
-    <view class="pharmacyDetails_title">请领信息</view>
+    <view class="pharmacyDetails_title">
+      <view class="pharmacyDetails_tab" :class="{ 'active': selectedLabelSlots === item.id }" v-for="item in tabs"
+        :key="item.id" @click="clickHandler(item.id)">
+        <view class="pharmacyDetails_label">
+          {{ item.label }}
+        </view>
+      </view>
+    </view>
     <view class="page_item_wrap">
       <view class="page_item">
         <view class="page_item_top">
-          <view class="page_item_top-inner">
+          <view class="page_item_top-inner" v-show="selectedLabelSlots == 1">
             <view class="page_item_top_L">
               <text class="L_text">请领单：{{ infoDATA.packid }}</text>
             </view>
@@ -15,13 +22,7 @@
             </view>
           </view>
         </view>
-        <view class="page_item_cont">
-          <!-- <view class="page_item_cont_T">
-            <view class="page_item_cont_title">
-              <text>批次号</text>
-              <text class="text_big">{{ infoDATA.batchNo }}</text>
-            </view>
-          </view> -->
+        <view class="page_item_cont" v-show="selectedLabelSlots == 1">
           <view class="page_item_cont_B">
             <view class="page_item_cont_title">
               <text>记账时间</text>
@@ -39,6 +40,16 @@
             </view>
           </view>
         </view>
+        <view class="page_item_cont" v-show="selectedLabelSlots == 2">
+          <view class="page_item_cont_C" v-for="(item,i) in queryProcessList" :key="i">
+            <view class="page_item_cont_title_C">
+              <text>{{item.operationType?item.operationType.name:''}}</text>
+              <text class="text_big">
+                <text>{{ item.username || '暂无' }}</text>
+              </text>
+            </view>
+          </view>
+        </view>
         <view class="L"></view>
         <view class="R"></view>
       </view>
@@ -89,6 +100,16 @@
   export default {
     data() {
       return {
+        selectedLabelSlots: 1,
+        tabs: [{
+            id: 1,
+            label: "基础信息",
+          },
+          {
+            id: 2,
+            label: "流程信息",
+          }
+        ],
         infoDATA: [],
         isLoading: false,
         isTLoading: false,
@@ -98,12 +119,22 @@
         hosModels: {
           disjunctor: false,
         },
+        queryProcessList: [],
       };
     },
     components: {
       selectAccount
     },
     methods: {
+      // tab切换
+      clickHandler(id) {
+        this.selectedLabelSlots = id;
+        if (id == 1) {
+          this.queryBase(this.queryObj);
+        } else if (id == 2) {
+          this.queryProcess(this.queryObj);
+        }
+      },
       // 确认
       hosOk(data) {
         console.log(data);
@@ -153,7 +184,7 @@
           id: this.infoDATA.id,
           packId: this.infoDATA.packid,
           recipient: accountId,
-          recipientName:accountName
+          recipientName: accountName
         };
         if (this.infoDATA.gdId) {
           postData.gdId = this.infoDATA.gdId;
@@ -413,6 +444,136 @@
           }
         });
       },
+      //基础信息查询
+      queryBase(options) {
+        //扫码进入详情
+        let qrcode = options.qrcode;
+        if (qrcode) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          post("/drugsBag/getDrugsBagByQr", {
+            qrcode,
+          }).then((result) => {
+            uni.hideLoading();
+            if (result.state == 200) {
+              this.infoDATA = result.result;
+              if (this.loginUser.dept.id != this.infoDATA.launch.id) {
+                uni.showModal({
+                  title: '提示',
+                  content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                    "】,您不能进行操作",
+                  showCancel: false,
+                  success: function(res) {
+                    if (res.confirm) {
+                      console.log('用户点击确定');
+                    } else if (res.cancel) {
+                      console.log('用户点击取消');
+                    }
+                  }
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+        // 点击列表进入详情
+        let id = options.id;
+        if (id) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          get("/api/fetchData/drugsBag/" + id).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              this.infoDATA = res.data;
+              if (this.loginUser.dept.id != this.infoDATA.launch.id) {
+                uni.showModal({
+                  title: '提示',
+                  content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                    "】,您不能进行操作",
+                  showCancel: false,
+                  success: function(res) {
+                    if (res.confirm) {
+                      console.log('用户点击确定');
+                    } else if (res.cancel) {
+                      console.log('用户点击取消');
+                    }
+                  }
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+      },
+      // 流程信息查询
+      queryProcess(options) {
+        //扫码进入详情
+        let qrcode = options.qrcode;
+        if (qrcode) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          let postData = {
+            idx: 0,
+            sum: 9999,
+            drugsBagOperationLog: {
+              qrcode,
+              hosId: this.loginUser.currentHospital.id
+            }
+          }
+          post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((result) => {
+            uni.hideLoading();
+            if (result.status == 200) {
+              this.queryProcessList = res.list;
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+        // 点击列表进入详情
+        let id = options.id;
+        if (id) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          let postData = {
+            idx: 0,
+            sum: 9999,
+            drugsBagOperationLog: {
+              packid: options.packid,
+              hosId: this.loginUser.currentHospital.id
+            }
+          }
+          post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              this.queryProcessList = res.list;
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+      }
     },
     onLoad(options) {
       this.loginUser = uni.getStorageSync("userData").user;
@@ -423,88 +584,45 @@
       // #ifdef H5
       webHandle("no", "wx");
       // #endif
-      //扫码进入详情
-      let qrcode = options.qrcode;
-      if (qrcode) {
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        post("/drugsBag/getDrugsBagByQr", {
-          qrcode,
-        }).then((result) => {
-          uni.hideLoading();
-          if (result.state == 200) {
-            this.infoDATA = result.result;
-            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
-              uni.showModal({
-                title: '提示',
-                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
-                  "】,您不能进行操作",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
-                  }
-                }
-              });
-            }
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
-        });
-      }
-      // 点击列表进入详情
-      let id = options.id;
-      if (id) {
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        get("/api/fetchData/drugsBag/" + id).then((res) => {
-          uni.hideLoading();
-          if (res.status == 200) {
-            this.infoDATA = res.data;
-            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
-              uni.showModal({
-                title: '提示',
-                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
-                  "】,您不能进行操作",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
-                  }
-                }
-              });
-            }
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
-        });
-      }
+      this.queryObj = options;
+      this.queryBase(this.queryObj);
     },
   };
 </script>
 <style lang="less">
   .pharmacyDetails {
     background-color: rgb(249, 250, 251);
-    padding-top: 10%;
+    padding-top: 32rpx;
 
     .pharmacyDetails_title {
-      font-size: 46rpx;
-      font-weight: 550;
-      text-align: center;
+      height: 100rpx;
+      display: flex;
+      align-items: center;
+      background-color: #fff;
+
+      .pharmacyDetails_tab {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .pharmacyDetails_label {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 40rpx;
+          width: 100%;
+          height: 66rpx;
+          border-radius: 32rpx;
+          color: #666;
+        }
+
+        &.active {
+          .pharmacyDetails_label {
+            color: #333;
+            background-color: #e5e9ed;
+          }
+        }
+      }
     }
 
     .page_item_wrap {
@@ -577,7 +695,8 @@
 
         .page_item_cont {
           min-height: 180rpx;
-          max-height: 424rpx;
+          max-height: calc(100vh - 534rpx);
+          overflow-y: auto;
           padding: 0 16rpx;
           text-align: left;
           position: relative;
@@ -626,7 +745,7 @@
           }
 
           .page_item_cont_C {
-            margin-bottom: 28rpx;
+            margin-top: 28rpx;
 
             .page_item_cont_title_C {
               font-size: 32rpx;

pages/receiptpage/receiptpage.vue

@@ -236,6 +236,10 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
+    <!-- 手动查询标本弹窗 -->
+    <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
+      @ok="speOk" @cancel="speCancel">
+    </handViewSpecimen>
   </view>
 </template>
 <script>
@@ -257,6 +261,10 @@
   export default {
     data() {
       return {
+        // 手动查询标本弹窗model
+        speModels: {
+          disjunctor: false,
+        },
         // 筛选条件
         array: [{
             id: 0,
@@ -350,6 +358,55 @@
       bigScreen,
     },
     methods: {
+      // 手动查询标本-确认
+      speOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到标本
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到标本！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.speModels.disjunctor = false;
+        let infoDATA = {
+          stype: data.stype,
+          scode: data.scode,
+          patientName: data.patientName,
+          sickRoom: data.sickRoom ?
+            data.sickRoom.dept : "-",
+          checkDept: data.checkDept ?
+            data.checkDept.dept : "-",
+          bedNum: data.bedNum,
+        };
+        uni.navigateTo({
+          url: `../scanning_B/scanning_B?res=${encodeURIComponent(
+          JSON.stringify({data,status:666})
+        )}&infoDATA=${encodeURIComponent(
+          JSON.stringify(infoDATA)
+        )}`,
+        });
+      },
+      // 手动查询标本-取消
+      speCancel() {
+        this.speModels.disjunctor = false;
+      },
+      // 手动查询标本弹窗
+      showHandViewSpecimen() {
+        this.speModels = {
+          title: '填写标本编码',
+          disjunctor: true,
+        }
+      },
       // 执行中筛选
       execFilter({
         detail: {
@@ -394,6 +451,10 @@
             this.content.push({
               text: "二维码设置",
             });
+          } else if (item.link === "wxSpecimenEntry") {
+            this.content.push({
+              text: "标本录入",
+            });
           }
         });
       },
@@ -477,6 +538,8 @@
           uni.navigateTo({
             url: "../settingCode/settingCode",
           });
+        } else if (e.item.text === "标本录入") {
+          this.showHandViewSpecimen();
         }
       },
       // 点击tab页切换

pages/scanning_B/scanning_B.vue

@@ -1,14 +1,15 @@
 <template>
   <view class="Scanning_B">
-    <view class="Scanning_top" v-if="res.status == 200">
+    <view class="Scanning_top" v-if="res.status == 200 || res.status == 666">
       <view class="Scanning_top_icon">
         <text class="cubeic-ok icon_transport transport-duigou"></text>
       </view>
       <view class="Scanning_top_text">
-        <view class="text1">扫描成功</view>
+        <view class="text1" v-if="res.status == 200">扫描成功</view>
+        <view class="text1" v-else-if="res.status == 666">查询成功</view>
       </view>
     </view>
-    <view class="Scanning_top" v-if="res.status != 200">
+    <view class="Scanning_top" v-if="res.status != 200 && res.status != 666">
       <view class="Scanning_top_icon">
         <text class="cubeic-close icon_transport transport-shibai"></text>
       </view>
@@ -17,17 +18,19 @@
       </view>
     </view>
 
-    <view class="Scanning_cont" v-if="res.status == 200">
+    <view class="Scanning_cont" v-if="res.status == 200 || res.status == 666">
       <view>标本类型 : {{ infoDATA.stype.name || "-" }}</view>
       <view>标本编码 : {{ infoDATA.scode || "-" }}</view>
+      <view>标本状态 : {{ res.data.speState ? res.data.speState.name : "-" }}</view>
       <view>患者床号 : {{ infoDATA.bedNum || "-" }}</view>
       <view>申请科室 : {{ infoDATA.sickRoom || "-" }}</view>
       <view>检查科室 : {{ infoDATA.checkDept || "-" }}</view>
+      <view>检验项目 : {{ res.data.specimenDesc || "-" }}</view>
     </view>
-    <view class="Scanning_cont" v-if="res.status != 200">
+    <view class="Scanning_cont" v-else>
       <view>{{ res.msg }}</view>
     </view>
-    <view class="foot_btn">
+    <view class="foot_btn" v-if="res.status != 666">
       <view class="btn3" @click="showAlert()">知道了</view>
       <block v-if="res.scanCodeSpecimenOrderSign == 1">
         <view class="btn3" @click="orderSign(res.workOrder)" v-if="res.workOrder">执行工单</view>
@@ -55,6 +58,7 @@
           disjunctor: false,
         },
         currentCode: "",
+        type: "", //类型，orderSign|buildAndOrderSign
       };
     },
     methods: {
@@ -69,6 +73,9 @@
         let postData = {
           ids,
         };
+        if (this.type === 'orderSign') {
+          postData.specimenOrderSign = data.specimenSet.map(v=>v.id); //破坏性，必须扫标本
+        }
         if (accountObj) {
           postData.handover = [accountObj.accountId];
         }
@@ -102,6 +109,7 @@
       },
       // 执行工单
       orderSign(workOrder) {
+        this.type = 'orderSign';
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -138,6 +146,7 @@
       },
       // 建单并签到
       buildAndOrderSign(speId) {
+        this.type = 'buildAndOrderSign';
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -261,6 +270,9 @@
 <style lang="less">
   .Scanning_B {
     padding: 0px 74rpx;
+    .uni-modal__btn_primary{
+      color: #49b856!important;
+    }
 
     .Scanning_top {
       height: 270rpx;

pages/scanning_Result/scanning_Result.vue

@@ -98,7 +98,8 @@
         (type == 'specimenPlan' && isKs != '1')
       ">
       <view class="btn1" @click="Scanning_again()"> 继续扫描 </view>
-      <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view>
+      <view class="btn3" @click="hand_again()">手动录入</view>
+      <view class="btn3" @click="getNoScanSpecimen()">未扫描标本</view>
       <view class="btn2" @click="Scanning_complete(dataId)"> 完成扫描 </view>
     </view>
     <view class="foot_btn" v-if="
@@ -218,6 +219,10 @@
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
       @ok="ok2" @know="know2" @cancel="cancel2" :operate="models2.operate">
     </showModel>
+    <!-- 手动查询标本弹窗 -->
+    <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
+      @ok="speOk" @cancel="speCancel">
+    </handViewSpecimen>
   </view>
 </template>
 <script>
@@ -234,9 +239,13 @@
   export default {
     data() {
       return {
-        deptId:undefined,
-        handover:undefined,
-        // SMFlag: true,
+        // 手动查询标本弹窗model
+        speModels: {
+          disjunctor: false,
+        },
+        deptId: undefined,
+        handover: undefined,
+        SMFlag: true,
         // 交接人信息
         accountObj: undefined,
         // 完成扫描的id
@@ -268,10 +277,177 @@
         queryObj: {}, //路由传递过来的数据
         selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
         gotoFlag: true,
-        content:"",
+        content: "",
       };
     },
     methods: {
+      // 手动查询标本-确认
+      speOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到标本
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到标本！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.speModels.disjunctor = false;
+        this.hand_scanning_common(data.scode, 'hand');
+      },
+      // 手动查询标本-取消
+      speCancel() {
+        this.speModels.disjunctor = false;
+      },
+      // 手动查询标本弹窗
+      showHandViewSpecimen() {
+        this.speModels = {
+          title: '填写标本编码',
+          disjunctor: true,
+        }
+      },
+      // 手动录入标本
+      hand_again() {
+        this.showHandViewSpecimen();
+      },
+      // 手动输入标本和扫码公共方法
+      hand_scanning_common(ress1, type) {
+        // ----------------
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+        }).then((result) => {
+          this.SMFlag = true;
+          if (result.state == 200 || result.state == 201) {
+            let codes = result.code;
+            if (codes) {
+              let speCode = codes;
+              let data = {
+                code: speCode,
+                type: this.queryObj.type1,
+                deptCode: this.DEPTCode,
+                ids: [],
+              };
+              data.ids.push(this.dataId);
+              let postType = "";
+              if (this.type == "jPBag" || this.type == "drugsBag") {
+                postType = "handleDrugsAndJp";
+                delete data.ids;
+                data.deptId = this.deptId;
+                data.handover = this.handover;
+              }
+              if (this.type == "specimen") {
+                data["speCode"] = data.code;
+                delete data.code;
+                postType = "handleSpes";
+              }
+              if (this.type == "specimenPlan") {
+                data["speCode"] = data.code;
+                delete data.code;
+                postType = "handlePlanSpes";
+              }
+              if (this.type == "inspect") {
+                postType = "handleIns";
+              }
+              if (this.type == "patientTransport") {
+                postType = "handleTrans";
+              }
+              post("/workerOrder/" + postType, data).then((ress) => {
+                uni.hideLoading();
+                if (ress.status == 200) {
+                  //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
+                  if (this.type == "specimenPlan" || this.type == "specimen") {
+                    if (type === 'scan') {
+                      this.Scanning_again();
+                    } else if (type === 'hand') {
+                      // this.hand_again();
+                    }
+                  }
+                  if (this.type == "specimenPlan" || this.type == "specimen") {
+                    this.infoDATA = ress.data;
+                    this.speNum = ress.specimenCount;
+                    uni.redirectTo({
+                      url: `../scanning_Result/scanning_Result?type=${
+                      this.queryObj.type
+                    }&type1=${
+                      this.queryObj.type1
+                    }&infoData=${encodeURIComponent(
+                      JSON.stringify(ress.data)
+                    )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                      this.queryObj.deptCode
+                    }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}`,
+                    });
+                  } else if (
+                    this.type == "inspect" ||
+                    this.type == "patientTransport"
+                  ) {
+                    uni.redirectTo({
+                      url: `../scanning_Result/scanning_Result?type=${
+                      this.queryObj.type //baba
+                    }&type1=${
+                      this.queryObj.type1
+                    }&infoData=${encodeURIComponent(
+                      JSON.stringify(ress.data)
+                    )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                      this.queryObj.deptCode
+                    }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
+                      JSON.stringify(ress)
+                    )}&patient=${ress.patient}&patientCode=${
+                      ress.patientCode
+                    }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
+                    });
+                  } else {
+                    uni.redirectTo({
+                      url: `../scanning_Result/scanning_Result?type=${
+                      this.queryObj.type
+                    }&type1=${
+                      this.queryObj.type1
+                    }&infoData=${encodeURIComponent(
+                      JSON.stringify(ress.data)
+                    )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                      this.queryObj.deptCode
+                    }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
+                    });
+                  }
+                } else {
+                  uni.redirectTo({
+                    url: `../scanning_Result/scanning_Result?type=${
+                    this.queryObj.type
+                  }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
+                    ress.msg
+                  }&deptCode=${this.queryObj.deptCode}&dept=${
+                    this.queryObj.dept
+                  }&id=${this.dataId}&model=${encodeURIComponent(
+                    JSON.stringify(this.infoDATA)
+                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}`,
+                  });
+                }
+              });
+            } else {
+              uni.hideLoading();
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+        // ------------------------------
+      },
       // 查看未扫描标本
       getNoScanSpecimen() {
         if (!this.gotoFlag) {
@@ -293,129 +469,7 @@
         // }
         // this.SMFlag = false;
         SM().then((ress1) => {
-          // ----------------
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            // this.SMFlag = true;
-            if (result.state == 200 || result.state == 201) {
-              let codes = result.code;
-              if (codes) {
-                let speCode = codes;
-                let data = {
-                  code: speCode,
-                  type: this.queryObj.type1,
-                  deptCode: this.DEPTCode,
-                  ids: [],
-                };
-                data.ids.push(this.dataId);
-                let postType = "";
-                if (this.type == "jPBag" || this.type == "drugsBag") {
-                  postType = "handleDrugsAndJp";
-                  delete data.ids;
-                  data.deptId = this.deptId;
-                  data.handover = this.handover;
-                }
-                if (this.type == "specimen") {
-                  data["speCode"] = data.code;
-                  delete data.code;
-                  postType = "handleSpes";
-                }
-                if (this.type == "specimenPlan") {
-                  data["speCode"] = data.code;
-                  delete data.code;
-                  postType = "handlePlanSpes";
-                }
-                if (this.type == "inspect") {
-                  postType = "handleIns";
-                }
-                if (this.type == "patientTransport") {
-                  postType = "handleTrans";
-                }
-                post("/workerOrder/" + postType, data).then((ress) => {
-                  uni.hideLoading();
-                  if (ress.status == 200) {
-                    //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                    if (this.type == "specimenPlan" || this.type == "specimen") {
-                      this.Scanning_again();
-                    }
-                    if (this.type == "specimenPlan" || this.type == "specimen") {
-                      this.infoDATA = ress.data;
-                      this.speNum = ress.specimenCount;
-                      uni.redirectTo({
-                        url: `../scanning_Result/scanning_Result?type=${
-                        this.queryObj.type
-                      }&type1=${
-                        this.queryObj.type1
-                      }&infoData=${encodeURIComponent(
-                        JSON.stringify(ress.data)
-                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                        this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}`,
-                      });
-                    } else if (
-                      this.type == "inspect" ||
-                      this.type == "patientTransport"
-                    ) {
-                      uni.redirectTo({
-                        url: `../scanning_Result/scanning_Result?type=${
-                        this.queryObj.type //baba
-                      }&type1=${
-                        this.queryObj.type1
-                      }&infoData=${encodeURIComponent(
-                        JSON.stringify(ress.data)
-                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                        this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
-                        JSON.stringify(ress)
-                      )}&patient=${ress.patient}&patientCode=${
-                        ress.patientCode
-                      }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
-                      });
-                    } else {
-                      uni.redirectTo({
-                        url: `../scanning_Result/scanning_Result?type=${
-                        this.queryObj.type
-                      }&type1=${
-                        this.queryObj.type1
-                      }&infoData=${encodeURIComponent(
-                        JSON.stringify(ress.data)
-                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                        this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
-                      });
-                    }
-                  } else {
-                    uni.redirectTo({
-                      url: `../scanning_Result/scanning_Result?type=${
-                      this.queryObj.type
-                    }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
-                      ress.msg
-                    }&deptCode=${this.queryObj.deptCode}&dept=${
-                      this.queryObj.dept
-                    }&id=${this.dataId}&model=${encodeURIComponent(
-                      JSON.stringify(this.infoDATA)
-                    )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
-                    });
-                  }
-                });
-              } else {
-                uni.hideLoading();
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-          // ------------------------------
+          this.hand_scanning_common(ress1, 'scan');
         }).catch(err => {
           // this.SMFlag = true;
         });
@@ -499,8 +553,9 @@
             } else {
               //待送达
               this.content =
-                  `本工单已签到<strong class="red">${ress.scanSet?ress.scanSet.join('、'):''}</strong>，剩余需签到科室<strong class="red">${ress.notScanSet?ress.notScanSet.join('、'):''}</strong>，总签收<strong class="red">${ress.totalAcceptance}</strong>只，剩余<strong class="red">${ress.notAcceptance}</strong>只未签收，您确定完成工单吗？`;
-              content = `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
+                `本工单已签到<strong class="red">${ress.scanSet?ress.scanSet.join('、'):''}</strong>，剩余需签到科室<strong class="red">${ress.notScanSet?ress.notScanSet.join('、'):''}</strong>，总签收<strong class="red">${ress.totalAcceptance}</strong>只，剩余<strong class="red">${ress.notAcceptance}</strong>只未签收，您确定完成工单吗？`;
+              content =
+                `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
             }
             this.models2 = {
               disjunctor: true,
@@ -701,6 +756,9 @@
       this.gotoFlag = true;
     },
     onLoad(options) {
+      if (options.status == 200&&options.scanOrHand === 'hand'&&(options.type === "specimen"||options.type === "specimenPlan")) {
+        this.hand_again();
+      }
       console.log(options, "result");
       this.queryObj = options;
       this.isKs = this.queryObj.isKs;

pages/scanning_code/scanning_code.vue

@@ -310,7 +310,8 @@
         infoType == 'spe-dsd-2' ||
         (infoType == 'spe-dsd-3' && infoDATA.gdState.value == '5')
       ">
-      <view class="btn2" @click="Scanning_again(dataId)">继续扫描</view>
+      <view class="btn3" @click="Scanning_again(dataId)">继续扫描</view>
+      <view class="btn3" @click="hand_again(dataId)">手动录入</view>
     </view>
     <view class="foot_btn2 footerPadding" v-if="
         infoType == 'ins-dsd-1' ||
@@ -349,6 +350,10 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
+    <!-- 手动查询标本弹窗 -->
+    <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
+      @ok="speOk" @cancel="speCancel">
+    </handViewSpecimen>
   </view>
 </template>
 <script>
@@ -365,10 +370,14 @@
   export default {
     data() {
       return {
-        // SMFlag:true,
+        // 手动查询标本弹窗model
+        speModels: {
+          disjunctor: false,
+        },
+        SMFlag: true,
         // 交接人信息
-        accountObj:undefined,
-        deptId:undefined,
+        accountObj: undefined,
+        deptId: undefined,
         // 完成工单的id
         wcId: "",
         // 弹窗model
@@ -387,180 +396,225 @@
       };
     },
     methods: {
+      // 手动查询标本-确认
+      speOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到标本
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到标本！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.speModels.disjunctor = false;
+        this.hand_scanning_common(data.scode, 'hand');
+      },
+      // 手动查询标本-取消
+      speCancel() {
+        this.speModels.disjunctor = false;
+      },
+      // 手动查询标本弹窗
+      showHandViewSpecimen() {
+        this.speModels = {
+          title: '填写标本编码',
+          disjunctor: true,
+        }
+      },
+      // 手动录入标本
+      hand_again(id) {
+        this.showHandViewSpecimen();
+      },
       // 拍照
       photograph(data, obj) {
         photographTool(data, obj);
       },
-      // 扫描
-      Scanning_again(id) {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
-        SM().then((ress1) => {
-          // ----------------
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            // this.SMFlag = true;
-            if (result.state == 200 || result.state == 201) {
-              let codes = result.code;
-              if (codes) {
-                let speCode = codes;
-                let data = {
-                  code: speCode,
-                  type: this.infoType,
-                  deptCode: this.DEPTCode,
-                  ids: [],
-                };
-                data.ids.push(id);
-                let postType = "";
-                if (
-                  this.infoDATA.taskType.associationType.value == "jPBag" ||
-                  this.infoDATA.taskType.associationType.value == "drugsBag"
-                ) {
-                  postType = "handleDrugsAndJp";
-                  delete data.ids;
-                  if(this.accountObj){
-                    data.handover = this.accountObj.accountId;
-                  }
-                  if(this.queryObj.grabOrders){
-                    data.grabOrders = '666';
-                  }
-                  data.deptId = this.deptId;
-                }
-                if (this.infoDATA.taskType.associationType.value == "specimen") {
-                  data["speCode"] = data.code;
-                  delete data.code;
-                  postType = "handleSpes";
-                }
-                if (
-                  this.infoDATA.taskType.associationType.value == "specimenPlan"
-                ) {
-                  data["speCode"] = data.code;
-                  delete data.code;
-                  postType = "handlePlanSpes";
-                }
-                if (this.infoDATA.taskType.associationType.value == "inspect") {
-                  // delete data.type;//seimin
-                  postType = "handleIns";
+      // 手动输入标本和扫码公共方法,type----scan是扫码，hand是手动录入
+      hand_scanning_common(ress1, type) {
+        // ----------------
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+        }).then((result) => {
+          this.SMFlag = true;
+          if (result.state == 200 || result.state == 201) {
+            let codes = result.code;
+            if (codes) {
+              let speCode = codes;
+              let data = {
+                code: speCode,
+                type: this.infoType,
+                deptCode: this.DEPTCode,
+                ids: [this.dataId],
+              };
+              let postType = "";
+              if (
+                this.infoDATA.taskType.associationType.value == "jPBag" ||
+                this.infoDATA.taskType.associationType.value == "drugsBag"
+              ) {
+                postType = "handleDrugsAndJp";
+                delete data.ids;
+                if (this.accountObj) {
+                  data.handover = this.accountObj.accountId;
                 }
-                if (
-                  this.infoDATA.taskType.associationType.value ==
-                  "patientTransport"
-                ) {
-                  postType = "handleTrans";
+                if (this.queryObj.grabOrders) {
+                  data.grabOrders = '666';
                 }
-                //扫描
-                post("/workerOrder/" + postType, data).then((ress) => {
-                  console.log(ress,1111)
-                  if (ress.status == 200) {
-                    //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                    if(this.infoDATA.taskType.associationType.value == 'specimen' || this.infoDATA.taskType.associationType.value == 'specimenPlan'){
+                data.deptId = this.deptId;
+              }
+              if (this.infoDATA.taskType.associationType.value == "specimen") {
+                data["speCode"] = data.code;
+                delete data.code;
+                postType = "handleSpes";
+              }
+              if (
+                this.infoDATA.taskType.associationType.value == "specimenPlan"
+              ) {
+                data["speCode"] = data.code;
+                delete data.code;
+                postType = "handlePlanSpes";
+              }
+              if (this.infoDATA.taskType.associationType.value == "inspect") {
+                // delete data.type;//seimin
+                postType = "handleIns";
+              }
+              if (
+                this.infoDATA.taskType.associationType.value ==
+                "patientTransport"
+              ) {
+                postType = "handleTrans";
+              }
+              //扫描
+              post("/workerOrder/" + postType, data).then((ress) => {
+                console.log(ress, 1111)
+                if (ress.status == 200) {
+                  //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
+                  if (this.infoDATA.taskType.associationType.value == 'specimen' || this.infoDATA.taskType
+                    .associationType.value == 'specimenPlan') {
+                    if (type === 'scan') {
                       this.Scanning_again(this.dataId);
+                    } else if (type === 'hand') {
+                      // this.hand_again(this.dataId);
                     }
-                    if (
-                      this.infoDATA.taskType.associationType.value == "drugsBag"
-                    ) {
-                        uni.hideLoading();
-                        // --------start----------
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          this.queryObj.type
-                        }&type1=${
-                          this.queryObj.type1
-                        }&infoData=${encodeURIComponent(
-                          JSON.stringify(ress.data)
-                        )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                          this.queryObj.deptCode
-                        }&dept=${
-                          this.queryObj.dept
-                        }&id=${id}&model=${encodeURIComponent(
-                          JSON.stringify(ress)
-                        )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
-                        });
-                        // ------------end------------
-                    } else {
-                      uni.hideLoading();
-                      // --------start----------
-                      // 患者陪检执行中或待送达,患者转运待送达
-                      if (
-                        ress.type == "ins-zxz-1" ||
-                        ress.type == "ins-dsd-1" ||
-                        ress.type == "trans-dsd-1"
-                      ) {
-                        console.log(ress.patientName, "code");
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          this.queryObj.type
-                        }&type1=${
-                          this.queryObj.type1
-                        }&infoData=${encodeURIComponent(
-                          JSON.stringify(ress.data)
-                        )}&status=${ress.status}&msg=${ress.msg}&patient=${
-                          ress.patient
-                        }&patientCode=${ress.patientCode}&deptName=${
-                          ress.deptName
-                        }&bedNum=${ress.bedNum}&deptCode=${
-                          this.queryObj.deptCode
-                        }&dept=${
-                          this.queryObj.dept
-                        }&id=${id}&model=${encodeURIComponent(
-                          JSON.stringify(ress)
-                        )}`,
-                        });
-                      } else {
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          this.queryObj.type
-                        }&type1=${
-                          this.queryObj.type1
-                        }&infoData=${encodeURIComponent(
-                          JSON.stringify(ress.data)
-                        )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                          this.queryObj.deptCode
-                        }&dept=${
-                          this.queryObj.dept
-                        }&id=${id}&model=${encodeURIComponent(
-                          JSON.stringify(ress)
-                        )}&speNum=${ress.specimenCount}`,
-                        });
-                      }
-
-                      // ------------end------------
-                    }
-                  } else {
+                  }
+                  if (
+                    this.infoDATA.taskType.associationType.value == "drugsBag"
+                  ) {
                     uni.hideLoading();
+                    // --------start----------
                     uni.navigateTo({
                       url: `../scanning_Result/scanning_Result?type=${
-                      this.queryObj.type
-                    }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
-                      ress.msg
-                    }&deptCode=${this.queryObj.deptCode}&dept=${
-                      this.queryObj.dept
-                    }&id=${id}&model=${encodeURIComponent(
-                      JSON.stringify(ress)
-                    )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
+                        this.queryObj.type
+                      }&type1=${
+                        this.queryObj.type1
+                      }&infoData=${encodeURIComponent(
+                        JSON.stringify(ress.data)
+                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                        this.queryObj.deptCode
+                      }&dept=${
+                        this.queryObj.dept
+                      }&id=${this.dataId}&model=${encodeURIComponent(
+                        JSON.stringify(ress)
+                      )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
                     });
+                    // ------------end------------
+                  } else {
+                    uni.hideLoading();
+                    // --------start----------
+                    // 患者陪检执行中或待送达,患者转运待送达
+                    if (
+                      ress.type == "ins-zxz-1" ||
+                      ress.type == "ins-dsd-1" ||
+                      ress.type == "trans-dsd-1"
+                    ) {
+                      console.log(ress.patientName, "code");
+                      uni.navigateTo({
+                        url: `../scanning_Result/scanning_Result?type=${
+                        this.queryObj.type
+                      }&type1=${
+                        this.queryObj.type1
+                      }&infoData=${encodeURIComponent(
+                        JSON.stringify(ress.data)
+                      )}&status=${ress.status}&msg=${ress.msg}&patient=${
+                        ress.patient
+                      }&patientCode=${ress.patientCode}&deptName=${
+                        ress.deptName
+                      }&bedNum=${ress.bedNum}&deptCode=${
+                        this.queryObj.deptCode
+                      }&dept=${
+                        this.queryObj.dept
+                      }&id=${this.dataId}&model=${encodeURIComponent(
+                        JSON.stringify(ress)
+                      )}`,
+                      });
+                    } else {
+                      uni.navigateTo({
+                        url: `../scanning_Result/scanning_Result?type=${
+                        this.queryObj.type
+                      }&type1=${
+                        this.queryObj.type1
+                      }&infoData=${encodeURIComponent(
+                        JSON.stringify(ress.data)
+                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                        this.queryObj.deptCode
+                      }&dept=${
+                        this.queryObj.dept
+                      }&id=${this.dataId}&model=${encodeURIComponent(
+                        JSON.stringify(ress)
+                      )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
+                      });
+                    }
+
+                    // ------------end------------
                   }
-                });
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
+                } else {
+                  uni.hideLoading();
+                  uni.navigateTo({
+                    url: `../scanning_Result/scanning_Result?type=${
+                    this.queryObj.type
+                  }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
+                    ress.msg
+                  }&deptCode=${this.queryObj.deptCode}&dept=${
+                    this.queryObj.dept
+                  }&id=${this.dataId}&model=${encodeURIComponent(
+                    JSON.stringify(ress)
+                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}`,
+                  });
+                }
               });
             }
-          });
-          // ------------------------------
-        }).catch(err=>{
-          // this.SMFlag = true;
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+        // ------------------------------
+      },
+      // 扫描
+      Scanning_again(id) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((ress1) => {
+          this.hand_scanning_common(ress1, 'scan');
+        }).catch(err => {
+          this.SMFlag = true;
         });
       },
       show(type) {
@@ -694,12 +748,12 @@
         });
       },
     },
-    onShow(){
-      // this.SMFlag = true;
+    onShow() {
+      this.SMFlag = true;
     },
     onLoad(options) {
       console.log(options);
-      if(options.accountObj && options.accountObj != "undefined"){
+      if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
       if (options.deptId && options.deptId != "undefined") {
@@ -1080,26 +1134,21 @@
       display: flex;
       justify-content: space-between;
 
-      .btn2 {
-        height: 66rpx;
-        width: 100%;
-        background-image: linear-gradient(to right, #72c172, #3bb197);
-        color: #fff;
-        border-radius: 8rpx;
-        font-size: 32rpx;
-        margin-top: 16rpx;
-        text-align: center;
-      }
-
+      .btn2,
       .btn3 {
         height: 66rpx;
-        width: 48%;
+        flex: 1;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
         font-size: 32rpx;
         margin-top: 16rpx;
+        margin-right: 16rpx;
         text-align: center;
+
+        &:last-of-type {
+          margin-right: 0;
+        }
       }
     }
 
@@ -1116,7 +1165,7 @@
       .btn1,
       .btn2 {
         height: 66rpx;
-        width: 45%;
+        flex: 1;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
@@ -1124,15 +1173,6 @@
         margin-top: 16rpx;
         text-align: center;
       }
-
-      .btn1 {
-        float: left;
-      }
-
-      .btn2 {
-        float: right;
-        text-align: center;
-      }
     }
   }
 </style>