优化

components/bigScreen/bigScreen.vue

@@ -338,7 +338,7 @@
                         if(res.data){
                           //新血制品-扫科室
                           uni.navigateTo({
-                            url: `/pages/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
+                            url: `/pages/newBlood/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
                           });
                         }else{
                           // 走type是dept的流程

components/cancelBlood/cancelBlood.vue

@@ -0,0 +1,222 @@
+<template>
+  <text @click.stop="selectAccountHandler(data, index)">
+    <text class="text">{{data.patientName}}</text><text>{{data.hosNum}}</text>
+    <!-- 取消发血弹窗 -->
+    <selectAccount2 @click.stop.native v-if="hosModels2.disjunctor" :content="hosModels2.content" :disjunctor="hosModels2.disjunctor" @ok="hosOk2"
+      @cancel="hosCancel2" :tips="hosModels2.tips" :cancelBloodHandover="cancelBloodHandover">
+    </selectAccount2>
+  </text>
+</template>
+
+<script>
+  import {
+    post
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        // 弹窗model
+        hosModels2: {
+          disjunctor: false,
+        },
+        
+        coopData: {},
+        isShowTips: false,
+      };
+    },
+    props: {
+      data: {
+        type: Object,
+      },
+      index: {
+        type: Number,
+      },
+      delivery: {
+        type: Number,
+        default: 0,
+      },
+      cancelBlood: {
+        type: Number,
+        default: 0,
+      },
+      cancelBloodHandover: {
+        type: Number,
+        default: 0,
+      },
+      dataList: {
+        type: Object,
+      },
+      type: {
+        type: String,
+      },
+    },
+    methods: {
+      cancelBloodHandler(data){
+        console.log(data);
+        console.log(this.coopData);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": "bloodTake",
+          service: 'cancelBlood',
+          bloodIds: this.coopData.children.map(v => v.children).flat().map(v => v.id).toString(),
+          closeOrder: this.isShowTips ? 1 : 0,
+          handoverUser: data.accountId,
+          cancelReason: data.cancelReason.id,
+        };
+      
+        post('/transflow/extra', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+             uni.showModal({
+               title: "提示",
+               content: "操作成功！",
+               showCancel: false,
+               success: (res) => {
+                 if (res.confirm) {
+                   console.log("用户点击确定");
+                   if(this.type == 'start'){
+                     if(this.isShowTips){
+                       uni.navigateTo({
+                         url: `/pages/receiptpage/receiptpage`,
+                       });
+                     }else{
+                       // 触发自定义事件并传递参数给上一页
+                       uni.$emit('refresh', { refresh: true });
+                       
+                       // 跳转回上一页
+                       uni.navigateBack({
+                           delta: 1
+                       });
+                     }
+                   }else if(this.type == 'end'){
+                     if(this.isShowTips){
+                       uni.navigateTo({
+                         url: `/pages/receiptpage/receiptpage`,
+                       });
+                     }else{
+                       this.$emit('refresh');
+                     }
+                   }
+                 } else if (res.cancel) {
+                   console.log("用户点击取消");
+                 }
+               },
+             });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 确认
+      hosOk2(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId,
+          cancelReason,
+        } = data;
+        
+        if (!cancelReason) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写取消原因！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        
+        // 必填交接人
+        if(this.cancelBloodHandover == 1){
+          if (!accountName && !account) {
+            //没有填写交接人
+            uni.showModal({
+              title: "提示",
+              content: "请填写交接人工号！",
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  console.log("用户点击确定");
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              },
+            });
+            return;
+          } else if ((!accountName && account) || (accountName && !account)) {
+            //没有填写交接人
+            uni.showModal({
+              title: "提示",
+              content: "请填写正确的交接人工号！",
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  console.log("用户点击确定");
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              },
+            });
+            return;
+          }
+        }
+        
+        this.hosModels2.disjunctor = false;
+        this.cancelBloodHandler(data);
+      },
+      // 取消
+      hosCancel2() {
+        this.hosModels2.disjunctor = false;
+      },
+      // 取消发血弹窗
+      showSelectAccount2(isShowTips = false) {
+        this.isShowTips = isShowTips;
+        this.hosModels2 = {
+          content: `请填写取消原因和交接人信息`,
+          disjunctor: true,
+          tips: isShowTips ? '本患者取消发血后，工单将关闭！' : '',
+        };
+      },
+      // 取消发血
+      selectAccountHandler(data, index){
+        console.log(this.cancelBlood)
+        if(this.cancelBlood != 1){
+          return;
+        }
+        this.coopData = data;
+        let arr = this.dataList.children.filter((v, i) => i !== index);
+        if(arr.length){
+          let flag = false;
+          if(this.type == 'end'){
+            // 其他患者的血都是"病房接收"状态
+            flag = arr.map(v => v.children).flat().map(v => v.children).flat().every(v => v.state.value == 5);
+          }
+          this.showSelectAccount2(flag);
+        }else{
+          // 没有其他患者
+          this.showSelectAccount2(true);
+        }
+      },
+    },
+  };
+</script>
+
+<style lang="less" scoped>
+  .text{
+    margin-right: 16rpx
+  }
+</style>

components/selectAccount2/selectAccount2.vue

@@ -0,0 +1,386 @@
+<template>
+  <view class="changeHospital" v-show="disjunctor">
+    <view class="changeHospital__wrap">
+      <view class="changeHospital__header">
+        提示
+      </view>
+      <view class="changeHospital__article">
+        <view class="uni-list-cell content" v-show="content">
+          {{content}}
+        </view>
+        <view class="uni-list-cell content red" v-show="tips">
+          {{tips}}
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            <text class="red">*</text>取消原因：
+          </view>
+          <view class="uni-list-cell-db">
+            <picker @change="changeCancelReason" :value="cancelReasonIndex" :range="cancelReason" range-key="name">
+              <view class="uni-input">{{cancelReason[cancelReasonIndex].name}}</view>
+            </picker>
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            <text class="red" v-if="cancelBloodHandover == 1">*</text>输入工号：
+          </view>
+          <view class="uni-list-cell-db">
+            <input class="uni-input" focus placeholder="请输入工号" 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">{{ accountName ? account : "无" }}</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">{{ 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>
+      <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,
+        account: '', //交接人工号
+        accountName: '', //交接人姓名
+        accountId: '' ,//交接人ID
+        cancelReasonIndex: 0,
+        cancelReason: [{id: 1, name: '输血科取消'}, {id: 2, name: '临时取消'}],
+      };
+    },
+    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,
+      },
+      // 提示内容
+      content: {
+        type: String,
+        default: "",
+      },
+      // 提示内容-标红
+      tips: {
+        type: String,
+        default: "",
+      },
+      // 交接人是否必填
+      cancelBloodHandover: {
+        type: Number,
+        default: 0,
+      },
+      // 操作按钮文字
+      operate: {
+        type: Object,
+        default: () => {
+          return {
+            ok: "确定",
+            cancel: "取消",
+          };
+        },
+      },
+    },
+    methods: {
+      // 修改取消原因
+      changeCancelReason(e){
+        this.cancelReasonIndex = e.detail.value;
+      },
+      //修改picker的值
+      bindPickerChange(e) {
+        this.accountName = '';
+        this.accountId = '';
+        this.loading = true;
+        this.cValue = e.target.value;
+        clearTimeout(this.timer);
+        this.timer = setTimeout(() => {
+          let account = e.target.value;
+          post("/data/isRepeat", {
+            // hospital: {
+            //   id: this.hosId
+            // },
+            account
+          }).then(result => {
+            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)
+      },
+      // 确定
+      ok() {
+        let e = {};
+        if (this.accountName) {
+          e.accountName = this.accountName;
+        }
+        if (this.account) {
+          e.account = this.account;
+        }
+        if (this.accountId) {
+          e.accountId = this.accountId;
+        }
+        if (this.cancelReason[this.cancelReasonIndex]) {
+          e.cancelReason = this.cancelReason[this.cancelReasonIndex];
+        }
+        this.$emit("ok", e);
+      },
+      // 取消
+      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;
+      
+      &.content{
+        justify-content: center;
+        color: #000;
+        margin-top: 0;
+        font-weight: bold;
+      }
+
+      .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/showCertificat/showCertificat.vue

@@ -0,0 +1,283 @@
+<template>
+  <view class="showModel" v-show="disjunctor">
+    <view class="showModel__wrap">
+      <view class="showModel__header">
+        领血证二维码
+      </view>
+      <view class="showModel__article">
+        <view class="showModel__content">
+          <view class="leftIcon" @click="toLeft">
+            <view class="icon_transport transport-xiala1" :class="{ disable: current === 0 }"></view>
+          </view>
+          <swiper class="swiper" :current="current" @change="changeCurrent">
+            <swiper-item v-for="(qrCode, index) in qrCodes" :key="index">
+              <image :src="qrCode.base64" mode="widthFix" class="qrCode"></image>
+            </swiper-item>
+          </swiper>
+          <view class="rightIcon" @click="toRight">
+            <view class="icon_transport transport-xiala1" :class="{ disable: current === qrCodes.length - 1 }"></view>
+          </view>
+        </view>
+      </view>
+      <view class="showModel__footer">
+        <view class="showModel__know" @click="know" hover-class="seimin-btn-hover">知道了</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        qrCodes: [],
+        current: 0,
+      };
+    },
+    props: {
+      // 显示隐藏
+      disjunctor: {
+        type: Boolean,
+        default: false,
+      },
+      // id
+      id: {
+        type: Number,
+      },
+    },
+    methods: {
+      // 左箭头点击
+      toLeft(){
+        this.current = Math.max(--this.current, 0);
+      },
+      // 右箭头点击
+      toRight(){
+        this.current = Math.min(++this.current, this.qrCodes.length - 1);
+      },
+      // 滑动二维码
+      changeCurrent(event){
+        this.current = event.detail.current;
+      },
+      // 关闭
+      know() {
+        this.$emit("know");
+      },
+      // 获取二维码
+      getQrCode(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/transflow/scanInfo", {
+          type: 'bloodTake',
+          takeCodeList: 1,
+          id: 0,
+          orderIds: this.id.toString(),
+        }).then((result) => {
+            uni.hideLoading();
+            if (result.state == 200) {
+              this.qrCodes = result.data.data || [];
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: result.msg || "接口获取数据失败！",
+              });
+            }
+          })
+      }
+    },
+    mounted() {
+      this.getQrCode();
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+  /deep/ uni-swiper .uni-swiper-wrapper{
+    position: absolute!important;
+    top: 0!important;
+    left: 0!important;
+    width: 100%!important;
+    height: 100%!important;
+  }
+  /deep/ uni-swiper uni-swiper-item{
+    display: flex!important;
+    align-items: center!important;
+  }
+  .showModel {
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.2);
+    z-index: 999999;
+
+    .showModel__wrap {
+      width: 560rpx;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      background-color: #fff;
+      border-radius: 12rpx;
+
+      .showModel__header {
+        font-size: 36rpx;
+        color: #000;
+        height: 84rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .showModel__article {
+        color: #000;
+        margin: 0 auto 25rpx;
+        width: 488rpx;
+        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;
+        }
+
+        &.p1 {
+          text-align: left;
+        }
+
+        .showModel__icon {
+          font-size: 138rpx;
+          margin-bottom: 32rpx;
+
+          &.showModel__icon--success {
+            color: rgb(52, 179, 73);
+          }
+
+          &.showModel__icon--warn {
+            color: rgb(245, 165, 35);
+          }
+
+          &.showModel__icon--error {
+            color: rgb(255, 58, 82);
+          }
+        }
+
+        .showModel__content {
+          font-size: 36rpx;
+          word-break: break-all;
+          width: 100%;
+          display: flex;
+          .leftIcon{
+            width: 40rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            view{
+              transform: rotateZ(90deg);
+              &.disable{
+                color: #dbdbdb;
+              }
+            }
+          }
+          .rightIcon{
+            width: 40rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            view{
+              transform: rotateZ(-90deg);
+              &.disable{
+                color: #dbdbdb;
+              }
+            }
+          }
+          .swiper{
+            flex: 1;
+            padding-top: 100%;
+            position: relative;
+            height: 0;
+            .qrCode{
+              width: 100%;
+            }
+          }
+        }
+
+        .showModel__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;
+            }
+          }
+        }
+      }
+
+      .showModel__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);
+          }
+        }
+
+        .showModel__ok {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+
+        .showModel__cancel {
+          flex: 1;
+        }
+
+        .showModel__know {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+      }
+    }
+  }
+</style>

components/specimenListItem/specimenListItem.vue

@@ -0,0 +1,298 @@
+<template>
+  <view class="page_item">
+    <view class="page_item_top">
+      <view class="page_item_top-inner">
+        <view class="page_item_top_L">
+          <view class="L_text"><text class="serialNumber">{{i + 1}}</text>{{ item.specimenDesc || "无" }}</view>
+        </view>
+        <view class="page_item_top_R">
+          <text :style="{color:item.urgent == 1?'red':'green'}">{{item.urgent == 1 ? "急" : "普"}}</text>
+        </view>
+      </view>
+    </view>
+    <view class="page_item_cont">
+      <view class="page_item_cont_T">
+        <view class="page_item_cont_title">
+          <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} </view>
+          <view class="text_big">{{ item.scode || "无" }}</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view class="text_big"> {{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}}床)</text> </view>
+          <view class="text_big">{{ item.residenceNo }}</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view class="text_big"> 收取:{{item.receiverName||'无'}} </view>
+          <view class="text_big">{{item.arriveTime||'无'}}</text></view>
+        </view>
+        <view class="page_item_cont_title">
+          <view class="text_big">{{
+            item.sickRoom ? item.sickRoom.dept : "无"
+          }}</view>
+          <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
+          <view class="text_big">{{
+            item.checkDept ? item.checkDept.dept : "无"
+          }}</view>
+        </view>
+      </view>
+    </view>
+    <view class="L"></view>
+    <view class="R"></view>
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      i: {
+        type: Number,
+      },
+      item: {
+        type: Object,
+      },
+    },
+  };
+</script>
+
+<style lang="less" scoped>
+  .page_item {
+    margin-top: 16rpx;
+    margin-bottom: 124rpx;
+    background: #fff;
+    border-radius: 8rpx;
+    margin: 0 20rpx;
+    border: 2rpx solid #e5e9ed;
+    position: relative;
+    overflow: hidden;
+    padding: 0 16rpx;
+  
+    .L {
+      width: 40rpx;
+      height: 40rpx;
+      border-radius: 50%;
+      background: #f9fafb;
+      position: absolute;
+      left: -20rpx;
+      top: 68rpx;
+      border: 2rpx solid #e5e9ed;
+    }
+  
+    .R {
+      width: 40rpx;
+      height: 40rpx;
+      border-radius: 50%;
+      background: #f9fafb;
+      position: absolute;
+      float: right;
+      right: -20rpx;
+      top: 68rpx;
+      border: 2rpx solid #e5e9ed;
+    }
+  
+    .starting {
+      width: 50rpx;
+      height: 50rpx;
+      color: #fff;
+      background: #49b856;
+      display: inline-block;
+      border-radius: 50%;
+      text-align: center;
+      line-height: 46rpx;
+      font-size: 32rpx;
+      margin-right: 6rpx;
+    }
+  
+    .End {
+      width: 50rpx;
+      height: 50rpx;
+      color: #fff;
+      background: #39b199;
+      display: inline-block;
+      border-radius: 50%;
+      text-align: center;
+      line-height: 46rpx;
+      font-size: 32rpx;
+      margin-right: 6rpx;
+    }
+  
+    .page_item_top {
+      height: 88rpx;
+      border-bottom: 2rpx dashed #e5e9ed;
+      padding: 0 16rpx;
+  
+      .page_item_top-inner {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 100%;
+  
+        .page_item_top_L {
+          .serialNumber{
+            width: 50rpx;
+            height: 50rpx;
+            border-radius: 50%;
+            background-color: #49b856;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #fff;
+            line-height: 0;
+            margin-right: 8rpx;
+          }
+          .emergencys {
+            background: #ff3b53 !important;
+            width: 124rpx !important;
+          }
+  
+          .emergency {
+            background: #ff3b53 !important;
+          }
+  
+          .emergency1 {
+            background: #49b856 !important;
+          }
+  
+          .page_item_cont_start {
+            text-align: center;
+            height: 44rpx;
+            width: 104rpx;
+            line-height: 44rpx;
+            border-radius: 8rpx;
+            background: #49b856;
+            color: #fff;
+            display: inline-block;
+          }
+  
+          .L_time {
+            color: #6cc076;
+            font-size: 32rpx;
+          }
+  
+          .L_text {
+            font-size: 32rpx;
+            font-weight: 700;
+            display: flex;
+            align-items: center;
+          }
+        }
+  
+        .page_item_top_R {
+          font-size: 32rpx;
+  
+          .back {
+            background-color: #49b856;
+          }
+  
+          .L_iocn {
+            color: rgb(7, 134, 60);
+            font-size: 36rpx;
+            font-weight: 700;
+          }
+        }
+      }
+    }
+  
+    .page_item_cont {
+      min-height: 90rpx;
+      padding: 0 16rpx;
+      text-align: left;
+      position: relative;
+  
+      .text_big {
+        font-size: 32rpx;
+        font-weight: 700;
+        margin-top: 10rpx;
+        text-align: right;
+        word-break: break-all;
+        line-height: 1.25;
+  
+        p {
+          font-weight: 700;
+          line-height: 1.5;
+        }
+      }
+  
+      .page_item_cont_T {
+        padding-top: 28rpx;
+        padding-bottom: 28rpx;
+        font-size: 28rpx;
+  
+        .page_item_cont_title {
+          height: 100%;
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+      }
+  
+      .page_item_cont_B {
+        padding-top: 28rpx;
+        margin-bottom: 28rpx;
+  
+        .page_item_cont_title {
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+        }
+  
+        .page_item_cont_title1 {
+          height: 60rpx;
+          line-height: 60rpx;
+          font-size: 32rpx;
+          padding-left: 64rpx;
+        }
+      }
+    }
+  
+    .page_item_foot {
+      border-top: 2rpx dashed #e5e9ed;
+      border-bottom: 2rpx dashed #e5e9ed;
+      padding: 28rpx 16rpx;
+      text-align: left;
+  
+      .page_item_foot_text {
+        font-size: 32rpx;
+        margin-bottom: 20rpx;
+  
+        .text1 {
+          color: rgb(102, 102, 102);
+        }
+  
+        .text2 {
+          float: right;
+          font-weight: 700;
+        }
+      }
+    }
+  
+    #infos {
+      display: none;
+    }
+  
+    .page_item_infos {
+      padding-bottom: 20rpx;
+      border-bottom: 2rpx dashed #e5e9ed;
+  
+      .page_item_info2 {
+        text-align: left;
+        line-height: 60rpx;
+        font-size: 32rpx;
+        padding-left: 16rpx;
+  
+        .page_item_foot_text {
+          font-size: 32rpx;
+          margin-bottom: 20rpx;
+  
+          .text1 {
+            color: rgb(102, 102, 102);
+          }
+  
+          .text2 {
+            float: right;
+            font-weight: 700;
+          }
+        }
+      }
+    }
+  }
+</style>

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.45');
+console.info('v2.4.46');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages.json

@@ -445,7 +445,7 @@
       }
 
     }, {
-      "path": "pages/startOrderSignBlood/startOrderSignBlood",
+      "path": "pages/newBlood/startOrderSignBlood/startOrderSignBlood",
       "style": {
         "h5": {
           "titleNView": false
@@ -453,7 +453,7 @@
       }
     },
     {
-      "path": "pages/startOrderSignBloodDetail/startOrderSignBloodDetail",
+      "path": "pages/newBlood/startOrderSignBloodDetail/startOrderSignBloodDetail",
       "style": {
         "h5": {
           "titleNView": false
@@ -461,7 +461,7 @@
       }
 
     }, {
-      "path": "pages/endOrderSignBlood/endOrderSignBlood",
+      "path": "pages/newBlood/endOrderSignBlood/endOrderSignBlood",
       "style": {
         "h5": {
           "titleNView": false

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -33,6 +33,9 @@
     <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
   </view>
 </template>
 <script>
@@ -45,6 +48,10 @@
   export default {
     data() {
       return {
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
         // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
@@ -142,9 +149,26 @@
           url: `../noScanSpecimen/noScanSpecimen?deptName=${deptName}&workOrderId=${this.queryObj.ids}&deptCode=${qrCode}&isScan=1&specimensCheck=1&noScan=1`,
         });
       },
+      ok(){
+        this.models.disjunctor = false;
+        this.orderDeptHandler(true);
+      },
+      // 取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
       //核对完成
       allStart() {
-        this.orderDeptHandler(true);
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: "是否确定标本已核对完成？",
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
       },
       //科室签到
       //bigScanner----判断是否需要交接人

pages/endOrderSignBlood/endOrderSignBlood.vue

@@ -27,7 +27,7 @@
               <checkbox class="checkbox" :checked="v2.checked" :disabled="v2.state.value == 5" />
               <text class="newicon newicon-a-ziyuan7"></text>
               <view class="title1 ellipsis">
-                <text>{{v2.patientName}}</text><text>{{v2.hosNum}}</text>
+                <cancelBlood :data="v2" :index="i2" @refresh="getInfo" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="end"></cancelBlood>
               </view>
               <view style="display: flex;align-items: center;justify-content: space-between;">
                 <text>{{v2.count}}袋</text>
@@ -89,7 +89,7 @@
     post,
     SM,
     webHandle
-  } from "../../http/http.js";
+  } from "@/http/http.js";
   export default {
     data() {
       return {
@@ -102,9 +102,49 @@
         queryObj: {}, //路由传递过来的数据
         isComplete: false,
         isShowCompleteBtn: false,
+        delivery: 0,
+        cancelBlood: 0,
+        cancelBloodHandover: 0,
       };
     },
     methods: {
+      // 获取血制品页面控制开关
+      getTaskBloodConfig(){
+        return post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": "blood"
+                    }
+                }
+            }
+        });
+      },
+      // 获取血制品页面控制开关
+      async getBloodPageConfig(){
+        let result = await this.getTaskBloodConfig();
+        if (result.status == 200) {
+          if(result.list && result.list[0]){
+            this.delivery = result.list[0].delivery;
+            this.cancelBlood = result.list[0].cancelBlood;
+            this.cancelBloodHandover = result.list[0].cancelBloodHandover;
+          }else{
+            this.delivery = 0;
+            this.cancelBlood = 0;
+            this.cancelBloodHandover = 0;
+          }
+        } else {
+          this.delivery = 0;
+          this.cancelBlood = 0;
+          this.cancelBloodHandover = 0;
+        }
+      },
       // arrayToObject(dataList){
       //   let bloodList = [];
       //   dataList.forEach(item1 => {
@@ -281,7 +321,7 @@
           uni.hideLoading();
           if(res.state == 200){
              uni.navigateTo({
-               url: `../receiptpage/receiptpage`,
+               url: `/pages/receiptpage/receiptpage`,
              });
           }else{
             uni.showToast({
@@ -372,6 +412,7 @@
       console.log(options, "result");
       this.queryObj = options;
       this.getInfo();
+      this.getBloodPageConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/startOrderSignBlood/startOrderSignBlood.vue

@@ -41,7 +41,7 @@
     post,
     SM,
     webHandle
-  } from "../../http/http.js";
+  } from "@/http/http.js";
   export default {
     data() {
       return {
@@ -177,7 +177,7 @@
           uni.hideLoading();
           if(res.state == 200){
              uni.navigateTo({
-               url: `../receiptpage/receiptpage`,
+               url: `/pages/receiptpage/receiptpage`,
              });
           }else{
             uni.showToast({
@@ -194,7 +194,7 @@
       // 跳转血制品列表
       toDetail(data){
         uni.navigateTo({
-          url: `../startOrderSignBloodDetail/startOrderSignBloodDetail?bloodIds=${data.bloodIds}&deptName=${data.dept}`,
+          url: `/pages/newBlood/startOrderSignBloodDetail/startOrderSignBloodDetail?bloodIds=${data.bloodIds}&deptName=${data.dept}`,
         });
       },
       //获取页面信息
@@ -240,6 +240,18 @@
       webHandle("no", "wx");
       // #endif
     },
+    // 监听自定义事件并进行页面刷新操作
+    onShow() {
+      uni.$on('refresh', (data) => {
+        if (data.refresh) {
+            // 刷新操作
+          this.getInfo();
+        }
+      });
+    },
+    onUnload() {
+      uni.$off('refresh'); // 需要手动解绑自定义事件
+    }
   };
 </script>
 <style lang="less" scoped>

pages/startOrderSignBloodDetail/startOrderSignBloodDetail.vue

@@ -11,7 +11,7 @@
         <view class="list_top">
           <text class="newicon newicon-a-ziyuan7"></text>
           <view class="title1 ellipsis">
-            <text>{{v2.patientName}}</text><text>{{v2.hosNum}}</text>
+            <cancelBlood :data="v2" :index="i2" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="start"></cancelBlood>
           </view>
           <view>
             <text>{{v2.count}}袋</text>
@@ -67,15 +67,56 @@
     post,
     SM,
     webHandle
-  } from "../../http/http.js";
+  } from "@/http/http.js";
   export default {
     data() {
       return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
         dataList: {},
         queryObj: {}, //路由传递过来的数据
+        delivery: 0,
+        cancelBlood: 0,
+        cancelBloodHandover: 0,
       };
     },
     methods: {
+      // 获取血制品页面控制开关
+      getTaskBloodConfig(){
+        return post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": "blood"
+                    }
+                }
+            }
+        });
+      },
+      // 获取血制品页面控制开关
+      async getBloodPageConfig(){
+        let result = await this.getTaskBloodConfig();
+        if (result.status == 200) {
+          if(result.list && result.list[0]){
+            this.delivery = result.list[0].delivery;
+            this.cancelBlood = result.list[0].cancelBlood;
+            this.cancelBloodHandover = result.list[0].cancelBloodHandover;
+          }else{
+            this.delivery = 0;
+            this.cancelBlood = 0;
+            this.cancelBloodHandover = 0;
+          }
+        } else {
+          this.delivery = 0;
+          this.cancelBlood = 0;
+          this.cancelBloodHandover = 0;
+        }
+      },
       // 返回
       goBack() {
         uni.navigateBack();
@@ -149,6 +190,7 @@
       console.log(options, "result");
       this.queryObj = options;
       this.getInfo();
+      this.getBloodPageConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/noScanSpecimen/noScanSpecimen.vue

@@ -2,46 +2,8 @@
   <view class="pharmacyDetails">
     <view class="pharmacyDetails_title"><text v-if="queryObj.deptName">{{queryObj.deptName}}-</text>{{isScan?'已':'未'}}扫描标本信息</view>
     <view class="page_item footerOtherMargin">
-      <view class="page_item_wrap" v-for="spe in specimens" :key="spe.id">
-        <view class="page_item">
-          <view class="page_item_top">
-            <view class="page_item_top-inner">
-              <view class="page_item_top_L">
-                <view class="L_text">{{ spe.scode }}<text v-if="spe.stype">({{spe.stype.name}})</text></view>
-              </view>
-              <view class="page_item_top_R">
-                <text :style="{color:spe.urgent == 1?'red':'green'}">{{spe.urgent == 1 ? "急" : "普"}}</text>
-              </view>
-            </view>
-          </view>
-          <view class="page_item_cont">
-            <view class="page_item_cont_T">
-              <view class="page_item_cont_title">
-                <view> 检验项目 </view>
-                <view class="text_big">{{ spe.specimenDesc || "无" }}</view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 患者姓名 </view>
-                <view class="text_big">{{ spe.patientName }}<text v-if="spe.bedNum">({{spe.bedNum}})</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 住院号 </view>
-                <view class="text_big">{{spe.residenceNo||'无'}}</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view class="text_big">{{
-                  spe.sickRoom ? spe.sickRoom.dept : "无"
-                }}</view>
-                <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
-                <view class="text_big">{{
-                  spe.checkDept ? spe.checkDept.dept : "无"
-                }}</view>
-              </view>
-            </view>
-          </view>
-          <view class="L"></view>
-          <view class="R"></view>
-        </view>
+      <view class="page_item_wrap" v-for="(spe, i) in specimens" :key="spe.id">
+        <specimenListItem :i="i" :item="spe"></specimenListItem>
         <view class="L-l"></view>
         <view class="R-l"></view>
       </view>

pages/receiptpage/receiptpage.vue

@@ -292,8 +292,11 @@
               <view v-if="item.taskType.associationType.value == 'other' && item.worker && item.worker.id && clinicalMultiplayerMode === 1 && showAppendUser === 1 && item.clinicalTaskIdsFlag && !item.copyBy" class="page_item_btn" @click="additionalUser(item)" hover-class="seimin-btn-hover">追加</view>
             </view>
             <!-- 如果是万能交接-血制品 -->
-            <view class="page_item_btn" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && delivery === 1 && item.taskType.ordinaryField.value == 'blood' && item.gdState.value == 5" hover-class="seimin-btn-hover">
-              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover">送达交接</view>
+            <view class="page_item_btn_wrap" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && delivery === 1 && item.taskType.ordinaryField.value == 'blood'">
+              <!-- 送达交接 -->
+              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover" v-if="item.gdState.value == 5">送达交接</view>
+              <!-- 领血证 -->
+              <view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
             </view>
             
             <!-- 如果是万能交接-被服洗涤送回 -->
@@ -324,6 +327,8 @@
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
     <!-- 我的二维码-弹窗 -->
     <showMyQrcode v-if="showMyQrcodeModel.disjunctor" :disjunctor="showMyQrcodeModel.disjunctor" @know="closeMyQrcodeModel"></showMyQrcode>
+    <!-- 领血证-弹窗 -->
+    <showCertificat v-if="showCertificatModel.disjunctor" :disjunctor="showCertificatModel.disjunctor" :id="showCertificatModel.id" @know="closeCertificatModel"></showCertificat>
     <!-- 科室二维码-弹窗 -->
     <showDepartmentQrcode v-if="showDepartmentQrcodeModel.disjunctor" :disjunctor="showDepartmentQrcodeModel.disjunctor" @know="closeDepartmentQrcodeModel"></showDepartmentQrcode>
     <!-- 手动查询标本弹窗 -->
@@ -410,6 +415,8 @@
         clinicalMultiplayerMode: 0,
         showAppendUser: 0,
         delivery: 0,
+        useTakeCode: 0,
+        takeCodeType: {},
         clinicalTaskIds: [],
         other: {
           user: {},
@@ -430,6 +437,10 @@
           disjunctor: false,
         },
         // 弹窗model
+        showCertificatModel: {
+          disjunctor: false,
+        },
+        // 弹窗model
         showDepartmentQrcodeModel: {
           disjunctor: false,
         },
@@ -553,7 +564,7 @@
     methods: {
       goTobloodEnd(order){
         uni.navigateTo({
-          url: `../endOrderSignBlood/endOrderSignBlood?orderIds=${order.id}&deptName=${order.endDepts[0].dept}&deptId=${order.endDepts[0].id}&type=delivery`,
+          url: `/pages/newBlood/endOrderSignBlood/endOrderSignBlood?orderIds=${order.id}&deptName=${order.endDepts[0].dept}&deptId=${order.endDepts[0].id}&type=delivery`,
         });
       },
       goToWashingEnd(order){
@@ -603,11 +614,17 @@
         if (result.status == 200) {
           if(result.list && result.list[0]){
             this.delivery = result.list[0].delivery;
+            this.useTakeCode = result.list[0].useTakeCode;
+            this.takeCodeType = result.list[0].takeCodeType;
           }else{
             this.delivery = 0;
+            this.useTakeCode = 0;
+            this.takeCodeType = {};
           }
         } else {
           this.delivery = 0;
+          this.useTakeCode = 0;
+          this.takeCodeType = {};
         }
       },
       //获取其他临床服务业务类型
@@ -1591,6 +1608,16 @@
       closeMyQrcodeModel(){
         this.showMyQrcodeModel.disjunctor = false;
       },
+      // 领血证二维码
+      certificatHandler(data){
+        this.showCertificatModel = {
+          disjunctor: true,
+          id: data.id,
+        };
+      },
+      closeCertificatModel(){
+        this.showCertificatModel.disjunctor = false;
+      },
       // 科室二维码
       departmentQrcodeHandler(){
         this.showDepartmentQrcodeModel = {
@@ -2455,7 +2482,6 @@
                 height: 88rpx;
                 flex: 1;
                 margin-left: 1%;
-                margin-right: 1%;
                 background-image: linear-gradient(to right, #72c172, #3bb197);
                 border-radius: 8rpx;
                 line-height: 88rpx;
@@ -2463,6 +2489,9 @@
                 font-size: 36rpx;
                 font-weight: 700;
                 text-align: center;
+                &:first-of-type{
+                  margin-left: 0;
+                }
               }
             }
 

pages/scannedDepartmentSpecimensDetail/scannedDepartmentSpecimensDetail.vue

@@ -16,46 +16,8 @@
           </view>
         </view>
       </view>
-      <view class="page_item_wrap" v-for="spe in specimens" :key="spe.id">
-        <view class="page_item">
-          <view class="page_item_top">
-            <view class="page_item_top-inner">
-              <view class="page_item_top_L">
-                <view class="L_text">{{ spe.scode }}<text v-if="spe.stype">({{spe.stype.name}})</text></view>
-              </view>
-              <view class="page_item_top_R">
-                <text :style="{color:spe.urgent == 1?'red':'green'}">{{spe.urgent == 1 ? "急" : "普"}}</text>
-              </view>
-            </view>
-          </view>
-          <view class="page_item_cont">
-            <view class="page_item_cont_T">
-              <view class="page_item_cont_title">
-                <view> 检验项目 </view>
-                <view class="text_big">{{ spe.specimenDesc || "无" }}</view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 患者姓名 </view>
-                <view class="text_big">{{ spe.patientName }}<text v-if="spe.bedNum">({{spe.bedNum}})</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 住院号 </view>
-                <view class="text_big">{{spe.residenceNo||'无'}}</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view class="text_big">{{
-                  spe.sickRoom ? spe.sickRoom.dept : "无"
-                }}</view>
-                <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
-                <view class="text_big">{{
-                  spe.checkDept ? spe.checkDept.dept : "无"
-                }}</view>
-              </view>
-            </view>
-          </view>
-          <view class="L"></view>
-          <view class="R"></view>
-        </view>
+      <view class="page_item_wrap" v-for="(spe, i) in specimens" :key="spe.id">
+        <specimenListItem :i="i" :item="spe"></specimenListItem>
         <view class="L-l"></view>
         <view class="R-l"></view>
       </view>
@@ -99,6 +61,7 @@
         };
         post(`/api/getStartDeptSpecimensNum`, postData).then(async (res) => {
           if (res.status == 200) {
+            res.data = res.data || [];
             for (let i = 0; i < res.data.length; i++) {
               let result = await get(`/common/common/listAttachment/specimenPhotos/${res.data[i].bindId}`);
               if (result.status == 200) {

pages/scanning/scanning.vue

@@ -79,6 +79,9 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
+    <!-- 弹窗 -->
+    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
+      @ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
   </view>
 </template>
 <script>
@@ -97,6 +100,10 @@
         models: {
           disjunctor: false,
         },
+        // 弹窗model
+        models1: {
+          disjunctor: false,
+        },
         wcId: [], //完成工单id
         modelFlag: "", //弹窗标识
         infoDATA: [],
@@ -132,10 +139,28 @@
       },
       // 继续配送
       Scanning_again(id) {
+        this.models1 = {
+          disjunctor: true,
+          title: "提示",
+          content: `是否确定<span class="red">继续配送</span>？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      // 确定
+      ok1() {
+        this.models1.disjunctor = false;
         uni.navigateTo({
           url: "../receiptpage/receiptpage",
         });
       },
+      // 取消
+      cancel1() {
+        this.models1.disjunctor = false;
+      },
       // 确定
       ok() {
         this.models.disjunctor = false;
@@ -221,7 +246,7 @@
         this.models = {
           disjunctor: true,
           title: "提示",
-          content: "是否确定标本配送完成？",
+          content: `是否确定标本<span class="red">配送完成</span>？`,
           icon: "warn",
           operate: {
             ok: "确定",
@@ -236,7 +261,7 @@
         this.models = {
           disjunctor: true,
           title: "提示",
-          content: "是否确定标本配送完成？",
+          content: `是否确定标本<span class="red">配送完成</span>？`,
           icon: "warn",
           operate: {
             ok: "确定",

pages/scanning_B/scanning_B.vue

@@ -21,7 +21,7 @@
     <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>标本状态 : <text :class="{ red: res.data.speState && res.data.speState.value == 8 }">{{ res.data.speState ? res.data.speState.name : "-" }}</text></view>
       <view>申请科室 : {{ infoDATA.sickRoom || "-" }}</view>
       <view>检验科室 : {{ infoDATA.checkDept || "-" }}</view>
       <view>检验项目 : {{ res.data.specimenDesc || "-" }}</view>

pages/scanning_Result/scanning_Result.vue

@@ -14,8 +14,17 @@
         </view>
       </view>
     </view>
+    
+    <view class="Scanning_top" v-if="res.status == 11111">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-close icon_transport transport-shibai"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <view class="text1" style="color: red;">操作失败</view>
+      </view>
+    </view>
 
-    <view class="Scanning_top" v-if="res.status != 200">
+    <view class="Scanning_top" v-if="(res.status != 200 && res.status != 11111)">
       <view class="Scanning_top_icon">
         <text class="cubeic-close icon_transport transport-shibai"></text>
       </view>
@@ -24,7 +33,7 @@
         <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容：{{queryObj.qrcode}} </view>
       </view>
     </view>
-
+    
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'specimenPlan') ||
         (res.status == 200 && type == 'specimen')
@@ -39,6 +48,22 @@
       <view>患者姓名 : {{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
       <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
     </view>
+    
+    <view class="Scanning_cont" v-if="
+        (res.status == 11111 && type == 'specimenPlan') ||
+        (res.status == 11111 && type == 'specimen')
+      ">
+      <view>{{ infoDATA.stype.name }}（{{infoDATA.scode}}）</view>
+      <view>检验项目 : {{ infoDATA.specimenDesc || "-" }}</view>
+      <view>标本状态 : <text style="color: red">{{ infoDATA.speState ? infoDATA.speState.name : '' }}</text></view>
+      <view>
+        {{ infoDATA.sickRoom ? infoDATA.sickRoom.dept : "" }}
+        <text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="icon_transport transport-arrow-right-full"></text>
+        {{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}
+      </view>
+      <view>患者姓名 : {{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
+      <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
+    </view>
 
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
@@ -99,7 +124,7 @@
       <view class="red"> 如果您当前科室还有药包需要扫描，请点击“继续扫描”！ </view>
     </view>
     <view class="Scanning_cont" v-if="res.status != 200">
-      <view class="Scanning_cont_center">
+      <view class="Scanning_cont_center" v-if="res.status != 11111">
         {{ res.msg === "undefined" || !res.msg ? "" : res.msg }}
       </view>
     </view>
@@ -383,9 +408,9 @@
               }
               post("/workerOrder/" + postType, data).then((ress) => {
                 uni.hideLoading();
-                if (ress.status == 200) {
+                if (ress.status == 200 || ress.status == 11111) {
                   //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                  if (this.type == "specimenPlan" || this.type == "specimen") {
+                  if ((this.type == "specimenPlan" || this.type == "specimen") && ress.status != 11111) {
                     setTimeout(()=>{
                       if (type === 'scan') {
                         this.Scanning_again();

pages/scanning_all/scanning_all.vue

@@ -427,7 +427,7 @@
                    if(signType){
                      uni.hideLoading();
                      uni.navigateTo({
-                       url: `../endOrderSignBlood/endOrderSignBlood?orderIds=${this.userId.ids.toString()}&deptName=${this.deptName}&deptId=${this.deptId}`,
+                       url: `/pages/newBlood/endOrderSignBlood/endOrderSignBlood?orderIds=${this.userId.ids.toString()}&deptName=${this.deptName}&deptId=${this.deptId}`,
                      });
                    }else{
                      // 万能交接服务的血制品

pages/scanning_code/scanning_code.vue

@@ -877,10 +877,10 @@
               //扫描
               post("/workerOrder/" + postType, data).then((ress) => {
                 console.log(ress, 1111)
-                if (ress.status == 200) {
+                if (ress.status == 200 || ress.status == 11111) {
                   //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                  if (this.infoDATA.taskType.associationType.value == 'specimen' || this.infoDATA.taskType
-                    .associationType.value == 'specimenPlan') {
+                  if ((this.infoDATA.taskType.associationType.value == 'specimen' || this.infoDATA.taskType
+                    .associationType.value == 'specimenPlan') && ress.status != 11111) {
                     if (type === 'scan') {
                       setTimeout(() => {
                         this.Scanning_again(this.dataId);

pages/scanning_djEnd/scanning_djEnd.vue

@@ -662,9 +662,9 @@
             }
             post("/workerOrder/" + postType, data).then((ress) => {
               uni.hideLoading();
-              if (ress.status == 200) {
+              if (ress.status == 200 || ress.status == 11111) {
                 //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                if (this.type == "specimenPlan" || this.type == "specimen") {
+                if ((this.type == "specimenPlan" || this.type == "specimen") && ress.status != 11111) {
                   if (type === 'scan') {
                     setTimeout(() => {
                       this.Scanning_again();

pages/scanning_djInfo/scanning_djInfo.vue

@@ -11,6 +11,15 @@
         <view class="text1">操作成功</view>
       </view>
     </view>
+    
+    <view class="Scanning_top" v-if="res.status == 11111">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-close icon_transport transport-shibai"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <view class="text1" style="color: red;">操作失败</view>
+      </view>
+    </view>
 
     <view class="Scanning_top" v-if="
         res.status == 10005 ||
@@ -30,7 +39,7 @@
         <view class="text1 f30" v-if="queryObj.qrcode !== undefined">扫描内容：{{queryObj.qrcode}}</view>
       </view>
     </view>
-    <view class="Scanning_cont" v-if="res.status != 200 || res.msg != '成功！'">
+    <view class="Scanning_cont" v-if="(res.status != 200 || res.msg != '成功！') && res.status != 11111">
       <view>{{ res.msg }}</view>
     </view>
     <view class="Scanning_cont" v-if="
@@ -46,23 +55,21 @@
       </view>
       <view>患者姓名 : {{ infoDATA.data.patientName}}（{{infoDATA.data.bedNum}}）</view>
       <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
-      <!-- <view>标本类型 : {{ infoDATA.data.stype.name || "-" }}</view>
-      <view>标本编号 : {{ infoDATA.data.scode || "-" }}</view>
-      <view>检验科室 : {{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "-" }}</view>
+    </view>
+    <view class="Scanning_cont" v-if="
+        (res.status == 11111 && type == 'specimenPlan') ||
+        (res.status == 11111 && type == 'specimen')
+      ">
+      <view>{{ infoDATA.data.stype.name }}（{{infoDATA.data.scode}}）</view>
       <view>检验项目 : {{ infoDATA.data.specimenDesc || "-" }}</view>
-      <view>患者姓名 : {{ infoDATA.data.patientName}}<text v-if="infoDATA.data.bedNum">({{infoDATA.data.bedNum}})</text></view>
-      <view>住院号 : {{ infoDATA.data.residenceNo || "-" }}</view>
-      <view v-if="
-          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
-        ">
-        交接人工号 : {{ accountObj.account }}
-      </view>
-      <view v-if="
-          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
-        ">
-        交接人姓名 : {{ accountObj.accountName }}
+      <view>标本状态 : <text style="color: red">{{ infoDATA.data.speState ? infoDATA.data.speState.name : '' }}</text></view>
+      <view>
+        {{ infoDATA.data.sickRoom ? infoDATA.data.sickRoom.dept : "" }}
+        <text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="icon_transport transport-arrow-right-full"></text>
+        {{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "" }}
       </view>
-      <view>已扫描 : {{ speNum }}</view> -->
+      <view>患者姓名 : {{ infoDATA.data.patientName}}（{{infoDATA.data.bedNum}}）</view>
+      <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
     </view>
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
@@ -104,10 +111,6 @@
       <view class="red"> 如果您当前科室还有药包需要扫描，请点击“继续扫描”！ </view>
     </view>
 
-    <!-- <view class="foot_btn" v-if="idsType==1&&res.status==200">
-      <view class="btn1" @click="Scanning_again()">继续扫描</view>
-      <view class="btn2" @click="showAlert()">知道了</view>
-    </view> -->
     <view class="foot_btn_spe" v-if="
         res.status == 100018 || type == 'specimen' || type == 'specimenPlan'
       ">
@@ -323,9 +326,9 @@
               }
               post("/workerOrder/" + postType, list).then((res) => {
                 uni.hideLoading();
-                if (res.status == 200) {
+                if (res.status == 200 || res.status == 11111) {
                   //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
-                  if (this.type == "specimenPlan" || this.type == "specimen") {
+                  if ((this.type == "specimenPlan" || this.type == "specimen") && res.status != 11111) {
                       if (type === 'scan') {
                         setTimeout(()=>{
                           this.Scanning_again();

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -15,12 +15,12 @@
         </view>
       </view>
     </view>
-    <view class="page_item_wrap" v-for="item in list" :key="item.id">
+    <view class="page_item_wrap" v-for="(item, i) in list" :key="item.id">
       <view class="page_item">
         <view class="page_item_top">
           <view class="page_item_top-inner">
             <view class="page_item_top_L">
-              <view class="L_text">{{ item.scode }}<text v-if="item.stype">({{item.stype.name}})</text></view>
+              <view class="L_text"><text class="serialNumber">{{i + 1}}</text>{{ item.specimenDesc || "无" }}</view>
             </view>
             <view class="page_item_top_R">
               <view class="L_iocn">
@@ -35,16 +35,16 @@
         <view class="page_item_cont">
           <view class="page_item_cont_T">
             <view class="page_item_cont_title">
-              <view> 检验项目 </view>
-              <view class="text_big">{{ item.specimenDesc || "无" }}</view>
+              <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} </view>
+              <view class="text_big">{{ item.scode || "无" }}</view>
             </view>
             <view class="page_item_cont_title">
-              <view> 患者姓名 </view>
-              <view class="text_big">{{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}})</text></view>
+              <view class="text_big"> {{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}}床)</text> </view>
+              <view class="text_big">{{ item.residenceNo }}</view>
             </view>
             <view class="page_item_cont_title">
-              <view> 住院号 </view>
-              <view class="text_big">{{item.residenceNo||'无'}}</text></view>
+              <view class="text_big"> 收取:{{item.receiverName||'无'}} </view>
+              <view class="text_big">{{item.arriveTime||'无'}}</text></view>
             </view>
             <view class="page_item_cont_title">
               <view class="text_big">{{
@@ -739,6 +739,18 @@
             height: 100%;
 
             .page_item_top_L {
+              .serialNumber{
+                width: 50rpx;
+                height: 50rpx;
+                border-radius: 50%;
+                background-color: #49b856;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                color: #fff;
+                line-height: 0;
+                margin-right: 8rpx;
+              }
               .emergencys {
                 background: #ff3b53 !important;
                 width: 124rpx !important;
@@ -771,6 +783,8 @@
               .L_text {
                 font-size: 32rpx;
                 font-weight: 700;
+                display: flex;
+                align-items: center;
               }
             }
 

pages/specimenCheckingEndDetail/specimenCheckingEndDetail.vue

@@ -1,46 +1,8 @@
 <template>
   <view class="pharmacyDetails">
     <view class="page_item footerOtherMargin">
-      <view class="page_item_wrap" v-for="spe in specimens" :key="spe.id">
-        <view class="page_item">
-          <view class="page_item_top">
-            <view class="page_item_top-inner">
-              <view class="page_item_top_L">
-                <view class="L_text">{{ spe.scode }}<text v-if="spe.stype">({{spe.stype.name}})</text></view>
-              </view>
-              <view class="page_item_top_R">
-                <text :style="{color:spe.urgent == 1?'red':'green'}">{{spe.urgent == 1 ? "急" : "普"}}</text>
-              </view>
-            </view>
-          </view>
-          <view class="page_item_cont">
-            <view class="page_item_cont_T">
-              <view class="page_item_cont_title">
-                <view> 检验项目 </view>
-                <view class="text_big">{{ spe.specimenDesc || "无" }}</view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 患者姓名 </view>
-                <view class="text_big">{{ spe.patientName }}<text v-if="spe.bedNum">({{spe.bedNum}})</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view> 住院号 </view>
-                <view class="text_big">{{spe.residenceNo||'无'}}</text></view>
-              </view>
-              <view class="page_item_cont_title">
-                <view class="text_big">{{
-                  spe.sickRoom ? spe.sickRoom.dept : "无"
-                }}</view>
-                <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
-                <view class="text_big">{{
-                  spe.checkDept ? spe.checkDept.dept : "无"
-                }}</view>
-              </view>
-            </view>
-          </view>
-          <view class="L"></view>
-          <view class="R"></view>
-        </view>
+      <view class="page_item_wrap" v-for="(spe, i) in specimens" :key="spe.id">
+        <specimenListItem :i="i" :item="spe"></specimenListItem>
         <view class="L-l"></view>
         <view class="R-l"></view>
       </view>

pages/specimenDetail/specimenDetail.vue

@@ -12,54 +12,8 @@
       <image class="zwsj-img" mode="widthFix" src="../../static/img/zanwushuju.png"></image>
       <view class="zwsj-txt">暂无数据</view>
     </view>
-    <view class="page_item_wrap" v-for="item in list" :key="item.id">
-      <view class="page_item">
-        <view class="page_item_top">
-          <view class="page_item_top-inner">
-            <view class="page_item_top_L">
-              <view class="L_text">{{ item.scode }}<text v-if="item.stype">({{item.stype.name}})</text></view>
-            </view>
-            <view class="page_item_top_R">
-              <text :style="{color:item.urgent == 1?'red':'green'}">{{item.urgent == 1 ? "急" : "普"}}</text>
-            </view>
-          </view>
-        </view>
-        <view class="page_item_cont">
-          <view class="page_item_cont_T">
-            <view class="page_item_cont_title">
-              <view style="width: 10em;"> 检验项目 </view>
-              <view class="text_big">{{ item.specimenDesc || "无" }}</view>
-            </view>
-            <view class="page_item_cont_title">
-              <view> 患者姓名 </view>
-              <view class="text_big">{{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}})</text></view>
-            </view>
-            <view class="page_item_cont_title">
-              <view> 住院号 </view>
-              <view class="text_big">{{item.residenceNo||'无'}}</text></view>
-            </view>
-            <view class="page_item_cont_title">
-              <view> 收取人 </view>
-              <view class="text_big">{{item.receiverName||'无'}}</text></view>
-            </view>
-            <view class="page_item_cont_title">
-              <view> 收取时间 </view>
-              <view class="text_big">{{item.arriveTime||'无'}}</text></view>
-            </view>
-            <view class="page_item_cont_title">
-              <view class="text_big">{{
-                item.sickRoom ? item.sickRoom.dept : "无"
-              }}</view>
-              <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
-              <view class="text_big">{{
-                item.checkDept ? item.checkDept.dept : "无"
-              }}</view>
-            </view>
-          </view>
-        </view>
-        <view class="L"></view>
-        <view class="R"></view>
-      </view>
+    <view class="page_item_wrap" v-for="(item, i) in list" :key="item.id">
+      <specimenListItem :i="i" :item="item"></specimenListItem>
       <view class="L-l"></view>
       <view class="R-l"></view>
     </view>
@@ -133,9 +87,8 @@
           "specimen": {
             "gdid": this.workOrderId,
             "hosId": uni.getStorageSync('userData').user.currentHospital.id,
-            // "stype": this.array[this.index].id ? { id: this.array[this.index].id } : undefined,
             "specimenDesc": this.array[this.index].id ? this.array[this.index].name : undefined,
-            "orderBy": 'arrive_time desc',
+            "orderBy": 'patientNoDesc',
           }
         };
         post(`/simple/data/fetchDataList/specimen`, postData).then((res) => {
@@ -396,6 +349,18 @@
             height: 100%;
 
             .page_item_top_L {
+              .serialNumber{
+                width: 50rpx;
+                height: 50rpx;
+                border-radius: 50%;
+                background-color: #49b856;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                color: #fff;
+                line-height: 0;
+                margin-right: 8rpx;
+              }
               .emergencys {
                 background: #ff3b53 !important;
                 width: 124rpx !important;
@@ -428,6 +393,8 @@
               .L_text {
                 font-size: 32rpx;
                 font-weight: 700;
+                display: flex;
+                align-items: center;
               }
             }