工单标本详情

main.js

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

pages/specimenDetail/specimenDetail.vue

@@ -1,5 +1,17 @@
 <template>
   <view class="specimenCheckingDetail">
+    <view class="page_tab">
+      <view class="page_tab_bar active">
+        <picker class="more_picker" @change="execFilter($event)" :value="index" :range="array" range-key="name">
+          <view class="more_picker_text">{{ array[index].name }}<text class="tab_num">( {{ total }} )</text></view>
+          <view class="more"></view>
+        </picker>
+      </view>
+    </view>
+    <view class="zwsj" v-if="list.length == 0">
+      <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">
@@ -27,6 +39,14 @@
               <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>
@@ -57,31 +77,69 @@
   export default {
     data() {
       return {
+        index: 0,
+        arrayKey: 0,
+        total: 0,
+        array: [
+          { id: 0, name: '全部'}
+        ],
+        
+        idx: 0,
         workOrderId: 0,
         associationTypeValue: '',
         list: [],
       };
     },
     methods: {
-      getList() {
+      // 筛选
+      execFilter({
+        detail: {
+          value
+        }
+      }) {
+        this.index = value;
+        this.arrayKey = this.array[value].id;
+        this.getList();
+      },
+      // 获取标本类型
+      getSpecimenType(){
+        let array = [{ id: 0, name: '全部'}];
+        post(`/common/common/getDictionary`, {"type":"list","key":"specimen_type"}).then((res) => {
+          this.array = array.concat(res) || array;
+        });
+      },
+      // 获取标本列表
+      getList(isAccumulate = false) {
         uni.showLoading({
           mask: true,
           title: "加载中",
         });
         let postData = {
-          "idx": 0,
-          "sum": 999,
+          "idx": isAccumulate ? ++this.idx : 0,
+          "sum": 20,
           "specimen": {
             "gdid": this.workOrderId,
             "hosId": uni.getStorageSync('userData').user.currentHospital.id,
-            "wxSign": "1",
+            "stype": this.array[this.index].id ? { id: this.array[this.index].id } : undefined,
+            "orderBy": 'arrive_time desc',
           }
         };
         post(`/simple/data/fetchDataList/specimen`, postData).then((res) => {
           uni.hideLoading();
           uni.stopPullDownRefresh();
           if (res.status == 200) {
-            this.list = res.list;
+            if(isAccumulate){
+               this.list = this.list.concat(res.list);
+               if(!res.list.length){
+                 uni.showToast({
+                   icon: 'none',
+                   title: '没有更多数据了',
+                 })
+               }
+            }else{
+              this.list = res.list;
+            }
+            this.total = res.totalNum;
           } else {
             uni.showToast({
               icon: "none",
@@ -100,6 +158,7 @@
       this.workOrderId = options.workOrderId;
       this.associationTypeValue = options.associationTypeValue;
       this.getList();
+      this.getSpecimenType();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -110,11 +169,90 @@
     onPullDownRefresh() {
       this.getList();
     },
+    // 上拉加载
+    onReachBottom(){
+      console.log('到底了');
+      this.getList(true);
+    }
   };
 </script>
 <style lang="less" scoped>
   .specimenCheckingDetail {
+    padding-top: 96rpx;
     padding-bottom: 100rpx;
+    
+    .page_tab {
+      width: 100%;
+      height: 96rpx;
+      display: flex;
+      position: fixed;
+      left: 0;
+      top: 0;
+      z-index: 999;
+      
+      .more {
+        position: absolute;
+        right: 20rpx;
+        width: 40rpx;
+        height: 4rpx;
+        border-top: 2px solid #49b856;
+        border-bottom: 2px solid #49b856;
+        background-color: #49b856;
+        padding: 5px 0;
+        background-clip: content-box;
+        z-index: 9999;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+      
+      .more_picker {
+        position: absolute;
+        right: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 9999;
+        
+        .more_picker_text{
+          height: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    
+      .page_tab_bar {
+        flex: 1;
+        font-size: 36rpx;
+        background: #fff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+    
+        &:after {
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          height: 2rpx;
+          width: 100%;
+          background-color: transparent;
+        }
+    
+        .tab_num {
+          color: #ff3b53;
+          margin-left: 8rpx;
+        }
+    
+        &.active {
+          color: #49b856;
+    
+          &:after {
+            background-color: #49b856;
+          }
+        }
+      }
+    }
 
     .page_header {
       margin: 20rpx;
@@ -142,6 +280,29 @@
         }
       }
     }
+    
+    .zwsj {
+      position: absolute;
+      left: 0;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+    
+      .zwsj-img {
+        width: 560rpx;
+      }
+    
+      .zwsj-txt {
+        font-size: 36rpx;
+        font-weight: 700;
+        margin-top: 20rpx;
+        text-align: center;
+      }
+    }
 
     .page_item_wrap {
       width: 100%;