标本巡检优化

pages.json

@@ -246,6 +246,38 @@
         "enablePullDownRefresh": false
       }
 
+    }, {
+      "path": "pages/scannedDepartmentSpecimens/scannedDepartmentSpecimens",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    }, {
+      "path": "pages/specimenCheckingEnd/specimenCheckingEnd",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+
+    }, {
+      "path": "pages/scannedDepartmentSpecimensDetail/scannedDepartmentSpecimensDetail",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/specimenCheckingEndDetail/specimenCheckingEndDetail",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
     }
   ],
   "globalStyle": {

pages/my_list/my_list.vue

@@ -112,8 +112,8 @@
               <text class="text1">完成时间</text>&nbsp;&nbsp;
               <text class="text1">{{ infoDATA.completeTime || '' }}</text>
             </view>
-            <view class="page_item_foot_text" @click.stop="goToDetail(infoDATA.id)">
-              <text class="text1">扫描接收数量</text>&nbsp;&nbsp;
+            <view class="page_item_foot_text" @click.stop="goToDetail(infoDATA)" v-if="infoDATA.taskType.associationType.value==='specimen' || infoDATA.taskType.associationType.value==='specimenPlan'">
+              <text class="text1">{{infoDATA.taskType.associationType.value==='specimen' ? '扫描接收数量' : '扫描送达数量'}}</text>&nbsp;&nbsp;
               <text class="text1 b">{{ infoDATA.actualReceiveNum || 0 }}</text>
             </view>
           </view>
@@ -173,9 +173,13 @@
       showModel,
     },
     methods: {
-      goToDetail(id){
+      goToDetail(order){
+        console.log(order)
+        let data = {
+          uuid: order.id,
+        }
         uni.navigateTo({
-          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify([id]))}&isScan=1&specimensCheck=1&noScan=1`,
+          url: `../scannedDepartmentSpecimens/scannedDepartmentSpecimens?infoDATA=${encodeURIComponent(JSON.stringify(data))}`,
         });
       },
       //滚动距离

pages/receiptpage/receiptpage.vue

@@ -83,8 +83,9 @@
               </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'specimen'">
                 <view>扫描标本数量 : {{ item.actualReceiveNum || '无'}}</view>
+                <view class="line"></view>
               </view>
-              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'inspect'">
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'inspect'">
                 <view>
                   预约时间 : {{ item.yyTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
@@ -121,8 +122,9 @@
                     item.isAccompany === 1 ? "需要医护陪同" : "无需医护陪同"
                   }}</text>
                 </view>
+                <view class="line"></view>
               </view>
-              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'patientTransport'">
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'patientTransport'">
                 <view>
                   预约时间 : {{ item.yyjdTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
@@ -159,19 +161,24 @@
                     item.isAccompany === 1 ? "需要医护陪同" : "无需医护陪同"
                   }}</text>
                 </view>
+                <view class="line"></view>
               </view>
-              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'drugsBag'">
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'drugsBag'">
                 <view>
                   药包编码 : {{ item.drugs ? item.drugs.packid : "无" }}
                 </view>
+                <view class="line"></view>
               </view>
-              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'jPBag'">
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'jPBag'">
                 <view>
                   药包编码 :
                   {{ item.staticDistri ? item.staticDistri.packid : "无" }}
                 </view>
+                <view class="line"></view>
+              </view>
+              <view class="page_item_conts" v-else>
+                <view class="line"></view>
               </view>
-              <view class="line"></view>
               <view class="page_item_cont_B">
                 <view class="page_item_cont_title" v-if="item.taskType.associationType.value != 'inspect'">
                   <text> <text class="End">终</text> 点科室 </text>
@@ -182,21 +189,20 @@
                   <text class="text_big" v-for="(dept, i) of item.middleDept" :key="i">{{ dept.dept }}</text>
                 </view>
               </view>
-              <view v-if="
-                  item.taskType.associationType.value == 'inspect' ||
-                  item.taskType.associationType.value == 'patientTransport'
-                ">
-                <!-- 待抢单 -->
-                <text class="red" v-if="item.gdState.value == 2">请扫描患者腕带，或者请扫描科室码</text>
-                <!-- 待到达 -->
-                <text class="red" v-if="item.gdState.value == 4">请扫描患者腕带</text>
-                <!-- 执行中 -->
-                <text class="red" v-if="item.gdState.value == 8">请扫描检查科室码，并扫描患者腕带</text>
-                <!-- 待送达 -->
-                <text class="red" v-if="item.gdState.value == 5">请扫描终点科室码，并扫描患者腕带</text>
-              </view>
             </view>
-
+            <view v-if="
+                item.taskType.associationType.value == 'inspect' ||
+                item.taskType.associationType.value == 'patientTransport'
+              ">
+              <!-- 待抢单 -->
+              <text class="red" v-if="item.gdState.value == 2">请扫描患者腕带，或者请扫描科室码</text>
+              <!-- 待到达 -->
+              <text class="red" v-if="item.gdState.value == 4">请扫描患者腕带</text>
+              <!-- 执行中 -->
+              <text class="red" v-if="item.gdState.value == 8">请扫描检查科室码，并扫描患者腕带</text>
+              <!-- 待送达 -->
+              <text class="red" v-if="item.gdState.value == 5">请扫描终点科室码，并扫描患者腕带</text>
+            </view>
             <!-- 如果不是患者陪检或患者转运或其他 -->
             <view class="page_item_btn" v-if="
                 selectedLabelSlots == '执行中' &&
@@ -1119,6 +1125,9 @@
               padding: 0 16rpx;
               text-align: left;
               position: relative;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
 
               .text_big {
                 font-size: 32rpx;
@@ -1127,12 +1136,14 @@
               }
 
               .line {
-                height: 40rpx;
+                height: 100%;
                 width: 2rpx;
                 border-left: 2rpx solid #e5e9ed;
                 position: absolute;
-                top: 70rpx;
-                left: 36rpx;
+                // top: 70rpx;
+                top: 50%;
+                left: 20rpx;
+                transform: translateY(-50%);
               }
 
               .lines {
@@ -1158,19 +1169,21 @@
               }
 
               .page_item_cont_T {
-                min-height: 80rpx;
-                max-height: 324rpx;
+                // min-height: 80rpx;
+                // max-height: 324rpx;
                 font-size: 28rpx;
                 margin-top: 16rpx;
+                display: flex;
+                justify-content: space-between;
 
                 .page_item_cont_title {
                   height: 100%;
-                  float: left;
+                  // float: left;
                 }
 
                 .page_item_cont_start {
                   text-align: center;
-                  float: right;
+                  // float: right;
                   height: 44rpx;
                   width: 104rpx;
                   line-height: 44rpx;
@@ -1188,27 +1201,27 @@
               }
 
               .page_item_conts {
+                min-height: 30rpx;
                 color: rgb(102, 102, 102);
                 padding-left: 50rpx;
                 font-size: 28rpx;
+                margin: 16rpx 0;
+                position: relative;
 
-                view {
-                  margin-bottom: 10rpx;
+                view:not(.line) {
+                  line-height: 1.2;
                 }
 
                 text {
                   color: #49b856;
                 }
-
-                .num {
-                  float: right;
-                }
               }
 
               .page_item_cont_B {
                 // padding-top: 20rpx;
                 font-size: 28rpx;
-                overflow: hidden;
+                // overflow: hidden;
+                margin-bottom: 16rpx;
 
                 .page_item_cont_title {
                   height: 100%;

pages/scannedDepartmentSpecimens/scannedDepartmentSpecimens.vue

@@ -0,0 +1,368 @@
+<template>
+  <view class="specimenChecking">
+    <view class="page_item_wrap" v-for="item in list" :key="item.deptId" @click="gotoDetail(item)">
+      <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.deptName}}</view>
+            </view>
+            <view class="page_item_top_R">
+              <view class="L_iocn">{{item.count}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="foot_btn2">
+      <view class="btn2" @click="goBack()">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        list: [],
+        msg: {}, //页面展示信息
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 获取列表
+      getList() {
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        let postData = {
+          gdId: this.msg.uuid
+        };
+        post(`/api/receiveSpecimensDeptNum`, postData).then((res) => {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          if (res.status == 200) {
+            this.list = res.data;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 跳转到详情页
+      gotoDetail(item) {
+        console.log(item);
+        uni.navigateTo({
+          url: `../scannedDepartmentSpecimensDetail/scannedDepartmentSpecimensDetail?workOrderId=${this.msg.uuid}&endDeptId=${item.deptId}`,
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      this.msg = JSON.parse(options.infoDATA);
+      this.getList();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+    onPullDownRefresh() {
+      this.getList();
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .specimenChecking {
+    padding-bottom: 100rpx;
+
+    .title {
+      font-size: 48rpx;
+      margin-top: 24rpx;
+      margin-bottom: 24rpx;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      width: 100%;
+      height: auto;
+      box-sizing: border-box;
+      position: relative;
+      margin-bottom: 16rpx;
+
+      .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 {
+              .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;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .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;
+
+            p {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .page_item_cont_T {
+            padding-top: 28rpx;
+            font-size: 28rpx;
+
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
+          }
+
+          .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;
+              }
+            }
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      width: 100vw;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      text-align: center;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .btn2 {
+        height: 66rpx;
+        flex: 1;
+        margin: 16rpx 16rpx 0;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+      }
+    }
+  }
+</style>

pages/scannedDepartmentSpecimensDetail/scannedDepartmentSpecimensDetail.vue

@@ -0,0 +1,426 @@
+<template>
+  <view class="pharmacyDetails">
+    <view class="page_item footerOtherMargin">
+      <view class="page_header" v-for="(item, index) in resultList" :key="item.bindId">
+        <view class="page_header_item" v-if="item.modifyReason">
+          <view class="page_header_title"> 修改原因： </view>
+          <view class="page_header_content">
+            {{ item.modifyReason }}
+          </view>
+        </view>
+        <view class="page_header_item" v-if="item.imgs && item.imgs.length">
+          <view class="page_header_title"> 图片列表： </view>
+          <view class="page_header_content">
+            <image v-for="(item, i) in item.imgs" :key="i" :src="item" @click="previewImage(index, i)" mode="widthFix"
+              @error="close(index, i)"></image>
+          </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="L-l"></view>
+        <view class="R-l"></view>
+      </view>
+    </view>
+    <view class="foot_btn2 footerPadding">
+      <view class="btn2" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    post,
+    get,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        resultList: [],
+        imgs: [],
+        queryObj: {}, //路由传递过来的数据
+        specimens: [],
+        modifyReason: '',
+      };
+    },
+    methods: {
+      previewImage(index, i) {
+        //uniapp预览轮播图
+        uni.previewImage({
+          current: i, //预览图片的下标
+          urls: this.resultList[index].imgs, //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+        });
+      },
+      close(index, i) {
+        this.resultList[index].imgs.splice(i, 1);
+      },
+      getInfo() {
+        let postData = {
+          deptId: this.queryObj.endDeptId,
+          gdId: this.queryObj.workOrderId,
+        };
+        post(`/api/getStartDeptSpecimensNum`, postData).then((res) => {
+          if (res.status == 200) {
+            for (let i = 0; i < res.data.length; i++) {
+              get(
+                `/common/common/listAttachment/specimenPhotos/${res.data[i].bindId}`
+              ).then((result) => {
+                if (result.status == 200) {
+                  res.data[i].imgs = result.data.map((v) => v.previewUrl);
+                } else {
+                  res.data[i].imgs = [];
+                }
+                this.resultList = res.data;
+              });
+            }
+          }
+        });
+      },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 获取标本信息
+      getDetail() {
+        let postData = {
+          gdId: this.queryObj.workOrderId,
+          endDeptId: this.queryObj.endDeptId,
+        };
+        
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/api/endDeptReceiveSpecimens", postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.specimens = res.data;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
+      this.getDetail();
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .pharmacyDetails {
+    background-color: rgb(249, 250, 251);
+    padding-top: 50rpx;
+    height: 100%;
+    box-sizing: border-box;
+    
+    .page_header {
+      margin: 20rpx;
+      padding: 16rpx;
+      border: 2rpx solid #e5e9ed;
+      background: #fff;
+      border-radius: 8rpx;
+    
+      .page_header_item {
+        margin-bottom: 16rpx;
+    
+        .page_header_title {
+          margin-bottom: 8rpx;
+          font-weight: bold;
+        }
+    
+        .page_header_content {
+          display: flex;
+    
+          image {
+            height: 100rpx;
+            width: 30%;
+            margin: 0 8rpx;
+          }
+        }
+      }
+    }
+
+    .pharmacyDetails_title {
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      position: relative;
+      margin-top: 32rpx;
+
+      .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;
+        }
+
+        .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 {
+              .L_text {
+                font-size: 32rpx;
+                font-weight: 700;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .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;
+          
+            p {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .line {
+            height: 20rpx;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 82rpx;
+            left: 40rpx;
+          }
+
+          .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;
+              align-items: center;
+            }
+          }
+
+          .page_item_cont_C {
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title_C {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          #infos {
+            display: none;
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .cube-toolbar-item {
+      width: 710rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+      border-radius: 8rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .btn-wrap {
+      display: flex;
+      justify-content: space-between;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+    }
+
+    .cube-toolbar-item1 {
+      width: 350rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      border-radius: 8rpx;
+      margin: 0 5rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      right: 20rpx;
+      left: 20rpx;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      display: flex;
+      justify-content: space-between;
+
+      .btn2 {
+        height: 66rpx;
+        width: 100%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+
+      .btn3 {
+        height: 66rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+    }
+  }
+</style>

pages/scanning/scanning.vue

@@ -43,12 +43,12 @@
               <td>数量</td>
               <td>状态</td>
             </tr>
-            <tr v-for="spe in infoList" :key="spe[0]">
-              <td class="maxWidth">{{spe[1]}}</td>
-              <td>{{spe[2]}}</td>
+            <tr v-for="spe in infoList" :key="spe.deptId">
+              <td class="maxWidth">{{spe.deptName}}</td>
+              <td>{{spe.speNum}}</td>
               <td>
-                <text v-if="spe[3] === 'ysd'" class="green">已到达</text>
-                <text v-if="spe[3] === 'wsd'" class="red">未到达</text>
+                <text v-if="spe.deptState=== 'ysd'" class="green">已到达</text>
+                <text v-if="spe.deptState=== 'wsd'" class="red">未到达</text>
               </td>
             </tr>
           </table>
@@ -116,8 +116,6 @@
           mask: true,
         });
         let postData = {
-          startDept: this.queryObj.startDeptId,
-          targetDept: this.queryObj.targetDeptId,
           uuid: this.dataId[0]
         };
         post(`/api/getDeptSpecimensNum`, postData).then((res) => {
@@ -258,7 +256,9 @@
       if (options.speNum) {
         this.speNum = options.speNum;
       }
-      this.getInfo();
+      if(this.queryObj.type === 'specimenPlan'){
+        this.getInfo();
+      }
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/scanning_Result/scanning_Result.vue

@@ -690,8 +690,15 @@
       },
       // 跳转完成工单页面
       gotoOver() {
+        // uni.navigateTo({
+        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+        //     this.queryObj.type1
+        //   }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
+        //     this.queryObj.deptCode
+        //   }&dept=${this.queryObj.dept}&speNum=${this.speNum}&content=${this.content}`,
+        // });
         uni.navigateTo({
-          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
             this.queryObj.type1
           }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
             this.queryObj.deptCode

pages/scanning_code/scanning_code.vue

@@ -482,7 +482,7 @@
                       res.type1
                     }&id=${encodeURIComponent(
                       JSON.stringify([res.gdid])
-                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    )}&content=${content}`,
                     });
                   }
                 }
@@ -511,7 +511,7 @@
                         res.type1
                       }&id=${encodeURIComponent(
                         JSON.stringify([res.gdid])
-                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                      )}&content=${content}`,
                       });
                     }
                   }
@@ -576,7 +576,7 @@
                                 res.type1
                               }&id=${encodeURIComponent(
                                 JSON.stringify([res.gdid])
-                              )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                              )}&content=${content}`,
                               });
                             }
                           }
@@ -605,7 +605,7 @@
                                   res.type1
                                 }&id=${encodeURIComponent(
                                   JSON.stringify([res.gdid])
-                                )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                )}&content=${content}`,
                                 });
                               }
                             }
@@ -662,8 +662,8 @@
         post(`/api/getStartDeptSpecimensNum`, postData).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
-            this.speNumChange = res.deptSpecimensNum;
-            this.modifyReason = res.modifyReason;
+            this.speNumChange = res.data[0].deptSpecimensNum;
+            this.modifyReason = res.data[0].modifyReason;
             this.changeSpeModels = {
               title: "修改标本数量",
               content: `您已到达<span class="red">${this.DEPT}</span>本科室标本数量为<span class="red">${this.speNumChange}</span>，请确认标本数量`,

pages/scanning_djEnd/scanning_djEnd.vue

@@ -319,7 +319,7 @@
                       res.type1
                     }&id=${encodeURIComponent(
                       JSON.stringify([res.gdid])
-                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    )}&content=${content}`,
                     });
                   }
                 }
@@ -348,7 +348,7 @@
                         res.type1
                       }&id=${encodeURIComponent(
                         JSON.stringify([res.gdid])
-                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                      )}&content=${content}`,
                       });
                     }
                   }
@@ -420,7 +420,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                    )}&content=${content}`,
                                     });
                                   }
                                 }
@@ -449,7 +449,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                      )}&content=${content}`,
                                       });
                                     }
                                   }
@@ -511,8 +511,8 @@
         post(`/api/getStartDeptSpecimensNum`, postData).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
-            this.speNumChange = res.deptSpecimensNum;
-            this.modifyReason = res.modifyReason;
+            this.speNumChange = res.data[0].deptSpecimensNum;
+            this.modifyReason = res.data[0].modifyReason;
             this.changeSpeModels = {
               title: "修改标本数量",
               content: `您已到达<span class="red">${this.queryObj.dept}</span>本科室标本数量为<span class="red">${this.speNumChange}</span>，请确认标本数量`,
@@ -960,8 +960,17 @@
       },
       // 跳转完成工单页面
       gotoOver() {
+        // uni.navigateTo({
+        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+        //   this.queryObj.type1
+        // }&deptCode=${this.queryObj.code}&dept=${
+        //   this.queryObj.dept
+        // }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&content=${
+        //   this.content
+        // }`,
+        // });
         uni.navigateTo({
-          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
           this.queryObj.type1
         }&deptCode=${this.queryObj.code}&dept=${
           this.queryObj.dept

pages/scanning_djInfo/scanning_djInfo.vue

@@ -2,7 +2,10 @@
   <view class="Scanning_djInfo">
     <view class="Scanning_top" v-if="res.status == 200">
       <view class="Scanning_top_icon">
-        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view v-if="type == 'specimenPlan' || type == 'specimen'">
+          <view class="fweight speNum" style="color: red;"> {{ speNum }} </view>
+        </view>
+        <text v-else class="cubeic-ok icon_transport transport-duigou"></text>
       </view>
       <view class="Scanning_top_text">
         <view class="text1">操作成功</view>
@@ -34,7 +37,16 @@
         (res.status == 200 && type == 'specimenPlan') ||
         (res.status == 200 && type == 'specimen')
       ">
-      <view>标本类型 : {{ infoDATA.data.stype.name || "-" }}</view>
+      <view>{{ infoDATA.data.stype.name }}（{{infoDATA.data.scode}}）</view>
+      <view>检验项目 : {{ infoDATA.data.specimenDesc || "-" }}</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>患者姓名 : {{ 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>检验项目 : {{ infoDATA.data.specimenDesc || "-" }}</view>
@@ -50,7 +62,7 @@
         ">
         交接人姓名 : {{ accountObj.accountName }}
       </view>
-      <view>已扫描 : {{ speNum }}</view>
+      <view>已扫描 : {{ speNum }}</view> -->
     </view>
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
@@ -607,8 +619,15 @@
       },
       // 跳转完成工单页面
       gotoOver() {
+        // uni.navigateTo({
+        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+        //   this.queryObj.type1
+        // }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
+        //   this.queryObj.deptCode
+        // }&dept=${this.queryObj.dept}&content=${this.content}`,
+        // });
         uni.navigateTo({
-          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
           this.queryObj.type1
         }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
           this.queryObj.deptCode
@@ -708,6 +727,11 @@
         margin-top: 116rpx;
         border-radius: 50%;
         line-height: 140rpx;
+        
+        .speNum{
+          text-align: center;
+          font-size: 140rpx;
+        }
 
         .cubeic-ok {
           font-size: 140rpx;

pages/specimenChecking/specimenChecking.vue

@@ -1,15 +1,15 @@
 <template>
   <view class="specimenChecking">
     <view class="title">请您确认一下科室标本数量！</view>
-    <view class="page_item_wrap" v-for="item in list" :key="item[0]" @click="gotoDetail(item)">
+    <view class="page_item_wrap" v-for="item in list" :key="item.deptId" @click="gotoDetail(item)">
       <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[1]}}</view>
+              <view class="L_text">{{item.deptName}}</view>
             </view>
             <view class="page_item_top_R">
-              <view class="L_iocn">{{item[2]}}</view>
+              <view class="L_iocn">{{item.speNum}}</view>
             </view>
           </view>
         </view>
@@ -114,7 +114,7 @@
                       res.type1
                     }&id=${encodeURIComponent(
                       JSON.stringify([res.gdid])
-                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    )}&content=${content}`,
                     });
                   }
                 }
@@ -143,7 +143,7 @@
                         res.type1
                       }&id=${encodeURIComponent(
                         JSON.stringify([res.gdid])
-                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                      )}&content=${content}`,
                       });
                     }
                   }
@@ -215,7 +215,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                    )}&content=${content}`,
                                     });
                                   }
                                 }
@@ -244,7 +244,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                      )}&content=${content}`,
                                       });
                                     }
                                   }
@@ -327,10 +327,10 @@
       },
       // 跳转到详情页
       gotoDetail(item) {
-        this.speNumChange = item[2];
+        this.speNumChange = item.speNum;
         this.changeSpeObj = {
           infoDATA: this.msg,
-          id: item[0],
+          id: item.deptId,
           endDepts:this.msg.targetDept,
         }
         this.showChangeSpe();
@@ -360,7 +360,7 @@
                   if (res.type === 'plan-spe-ddd-2') {
                     //需要扫描标本
                     uni.navigateTo({
-                      url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined&endDepts=${this.msg.targetDept}`,
+                      url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined&endDepts=${this.msg.targetDept}&deptId=${res.deptId}`,
                     });
                   } else {
                     uni.navigateTo({

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -313,10 +313,10 @@
         post(`/api/getStartDeptSpecimensNum`, postData).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
-            this.speNum = res.deptSpecimensNum;
-            this.modifyReason = res.modifyReason;
+            this.speNum = res.data[0].deptSpecimensNum;
+            this.modifyReason = res.data[0].modifyReason;
             get(
-              `/common/common/listAttachment/specimenPhotos/${res.bindId}`
+              `/common/common/listAttachment/specimenPhotos/${res.data[0].bindId}`
             ).then((result) => {
               if (result.status == 200) {
                 this.imgs = result.data.map((v) => v.previewUrl);
@@ -423,7 +423,7 @@
                       res.type1
                     }&id=${encodeURIComponent(
                       JSON.stringify([res.gdid])
-                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    )}&content=${content}`,
                     });
                   }
                 }
@@ -452,7 +452,7 @@
                         res.type1
                       }&id=${encodeURIComponent(
                         JSON.stringify([res.gdid])
-                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                      )}&content=${content}`,
                       });
                     }
                   }
@@ -524,7 +524,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                    )}&content=${content}`,
                                     });
                                   }
                                 }
@@ -553,7 +553,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                                      )}&content=${content}`,
                                       });
                                     }
                                   }

pages/specimenCheckingEnd/specimenCheckingEnd.vue

@@ -0,0 +1,405 @@
+<template>
+  <view class="specimenChecking">
+    <view class="title" @click="gotoDetail()">签到标本总数：{{num}}</view>
+    <view class="page_item_wrap" v-for="item in list" :key="item.patientId" @click="gotoDetail(item)">
+      <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.patientName}}</view>
+            </view>
+            <view class="page_item_top_R">
+              <view class="L_iocn">{{item.count}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="foot_btn2">
+      <view class="btn2" @click="checkComplete()">核对完成</view>
+      <view class="btn2" @click="goBack()">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        list: [],
+        num: 0,
+        msg: {}, //页面展示信息
+        // 修改标本数量弹窗model
+        changeSpeModels: {
+          disjunctor: false,
+        },
+        speNumChange: 0,
+      };
+    },
+    methods: {
+      // 跳转到详情页
+      gotoDetail(item) {
+        console.log(item);
+        if(item){
+          uni.navigateTo({
+            url: `../../pages/specimenCheckingEndDetail/specimenCheckingEndDetail?gdId=${this.msg.id}&deptQrCode=${this.msg.deptCode}&patientId=${item.patientId}`,
+          });
+        }else{
+          uni.navigateTo({
+            url: `../../pages/specimenCheckingEndDetail/specimenCheckingEndDetail?gdId=${this.msg.id}&deptQrCode=${this.msg.deptCode}`,
+          });
+        }
+      },
+      checkComplete(){
+        uni.showModal({
+          title: '提示',
+          content: '是否核对完成？',
+          success: (result) => {
+            if (result.confirm) {
+              console.log('用户点击确定');
+              uni.navigateTo({
+                url: `../scanning/scanning?type=${this.msg.type}&type1=${
+                  this.msg.type1
+                }&id=${encodeURIComponent(JSON.stringify([this.msg.id]))}&deptCode=${
+                  this.msg.deptCode
+                }&dept=${this.msg.dept}&speNum=${this.msg.speNum}&content=${this.msg.content}`,
+              });
+            } else if (result.cancel) {
+              console.log('用户点击取消');
+            }
+          }
+        });
+      },
+      // 获取列表
+      getList() {
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        let postData = {
+          gdId: this.msg.id,
+          deptQrCode: this.msg.deptCode,
+        }; //起点科室id，选择的科室ids
+        post(`/api/patientSpecimensNm`, postData).then((res) => {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          if (res.status == 200) {
+            this.num = res.num;
+            this.list = res.data;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      options.id = JSON.parse(options.id)[0]
+      this.msg = options;
+      this.getList();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+    onPullDownRefresh() {
+      this.getList();
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .specimenChecking {
+    padding-bottom: 100rpx;
+
+    .title {
+      font-size: 48rpx;
+      margin-top: 24rpx;
+      margin-bottom: 24rpx;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      width: 100%;
+      height: auto;
+      box-sizing: border-box;
+      position: relative;
+      margin-bottom: 16rpx;
+
+      .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 {
+              .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;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .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;
+
+            p {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .page_item_cont_T {
+            padding-top: 28rpx;
+            font-size: 28rpx;
+
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
+          }
+
+          .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;
+              }
+            }
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      width: 100vw;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      text-align: center;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .btn2 {
+        height: 66rpx;
+        flex: 1;
+        margin: 16rpx 16rpx 0;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+      }
+    }
+  }
+</style>

pages/specimenCheckingEndDetail/specimenCheckingEndDetail.vue

@@ -0,0 +1,374 @@
+<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="L-l"></view>
+        <view class="R-l"></view>
+      </view>
+    </view>
+    <view class="foot_btn2 footerPadding">
+      <view class="btn2" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        queryObj: {}, //路由传递过来的数据
+        specimens: [],
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 获取标本信息
+      getDetail() {
+        let postData = {
+          gdId: this.queryObj.gdId,
+          deptQrCode: this.queryObj.deptQrCode,
+          patientId: this.queryObj.patientId || undefined,
+        };
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/api/endDeptPatientSpecimens", postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.specimens = res.data;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
+      this.getDetail();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .pharmacyDetails {
+    background-color: rgb(249, 250, 251);
+    padding-top: 50rpx;
+    height: 100%;
+    box-sizing: border-box;
+    
+    .page_header {
+      margin: 20rpx;
+      padding: 16rpx;
+      border: 2rpx solid #e5e9ed;
+      background: #fff;
+      border-radius: 8rpx;
+    
+      .page_header_item {
+        margin-bottom: 16rpx;
+    
+        .page_header_title {
+          margin-bottom: 8rpx;
+          font-weight: bold;
+        }
+    
+        .page_header_content {
+          display: flex;
+    
+          image {
+            height: 100rpx;
+            width: 30%;
+            margin: 0 8rpx;
+          }
+        }
+      }
+    }
+
+    .pharmacyDetails_title {
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      position: relative;
+      margin-top: 32rpx;
+
+      .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;
+        }
+
+        .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 {
+              .L_text {
+                font-size: 32rpx;
+                font-weight: 700;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .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;
+          
+            p {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .line {
+            height: 20rpx;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 82rpx;
+            left: 40rpx;
+          }
+
+          .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;
+              align-items: center;
+            }
+          }
+
+          .page_item_cont_C {
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title_C {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          #infos {
+            display: none;
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .cube-toolbar-item {
+      width: 710rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+      border-radius: 8rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .btn-wrap {
+      display: flex;
+      justify-content: space-between;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+    }
+
+    .cube-toolbar-item1 {
+      width: 350rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      border-radius: 8rpx;
+      margin: 0 5rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      right: 20rpx;
+      left: 20rpx;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      display: flex;
+      justify-content: space-between;
+
+      .btn2 {
+        height: 66rpx;
+        width: 100%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+
+      .btn3 {
+        height: 66rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+    }
+  }
+</style>