药品及标本优化

App.vue

@@ -212,4 +212,11 @@
       flex: 1;
     }
   }
+  .ellipsis-multiline {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2; /* 定义显示的行数 */
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 </style>

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -19,21 +19,29 @@
           检验科室标本数量：
         </view>
         <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
-					<uni-collapse :border="false">
-						<uni-collapse-item titleBorder="none">
-							<template v-slot:title>
-								<view class="page_item_cont_title_coll">
-									<view>{{item.deptName}}</view>
-									<view class="text_big" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
-								</view>
-							</template>
-							<view class="content">
-								<view class="list" v-for="x in item.tubeTypeData" @click="viewSpe(item.deptName,item.deptQrCode,x.tubeTypeId)">
-									{{x.tubeTypeName}}：<text class="underline-item">{{x.speCount}}</text>
-								</view>
-							</view>
-						</uni-collapse-item>
-					</uni-collapse>
+          <template v-if="taskTypeConfig.speExpandTube == 1">
+            <uni-collapse :border="false">
+              <uni-collapse-item titleBorder="none" :open="taskTypeConfig.speDefaultExpandTube == 1">
+                <template v-slot:title>
+                  <view class="page_item_cont_title_coll">
+                    <view>{{item.deptName}}</view>
+                    <view class="text_big" style="padding-right: 20rpx;" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
+                  </view>
+                </template>
+                <view class="content">
+                  <view class="list" v-for="x in item.tubeTypeData" :key="x.id" @click="viewSpe(item.deptName,item.deptQrCode,x.tubeTypeId)">
+                    {{x.tubeTypeName}}：<text class="underline-item">{{x.speCount}}</text>
+                  </view>
+                </view>
+              </uni-collapse-item>
+            </uni-collapse>
+          </template>
+          <template v-else>
+            <view class="page_item_cont_title_coll" style="width: 100%;">
+            	<view>{{item.deptName}}</view>
+            	<view class="text_big" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
+            </view>
+          </template>
         </view>
       </view>
     </view>
@@ -60,6 +68,8 @@
   export default {
     data() {
       return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        taskTypeConfig: {},
         // 弹窗model
         models: {
           disjunctor: false,
@@ -73,6 +83,45 @@
       };
     },
     methods: {
+      // 获取配置
+			getSpecimenTaskTypeConfig(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+          "idx": 0,
+          "sum": 1,
+          "taskTypeConfig": {
+            "taskTypeDTO": {
+              "hosId": {
+                  "id": this.hosId
+              },
+              "associationType": {
+                  "key": "association_types",
+                  "value": "specimen"
+              }
+            }
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            if(result.list.length){
+              this.taskTypeConfig = result.list[0] || {};
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置标本配送任务类型！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
 			viewSpe(deptName, qrCode, id){
 				uni.navigateTo({
 				  url: `../viewSpe/viewSpe?deptName=${deptName}&workOrderId=${this.queryObj.ids}&deptCode=${qrCode}&tubeTypeId=${id}&isScan=1&specimensCheck=1&noScan=1`,
@@ -231,6 +280,7 @@
       console.log(options);
       this.queryObj = options;
       this.getInfo(this.queryObj.ids);
+      this.getSpecimenTaskTypeConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -244,7 +294,7 @@
 	/deep/ .uni-collapse-item--border{
 		border-bottom-color: #fff !important;
 	}
-	
+
 	/deep/ .uni-collapse-item__title-arrow{
 		margin-right: 0 !important;
 	}
@@ -263,7 +313,7 @@
       padding: 0 20rpx;
       text-align: left;
       position: relative;
-      
+
       .text_title{
         flex-shrink: 0;
         margin-right: 16rpx;
@@ -272,18 +322,18 @@
       .text_big {
         font-size: 32rpx;
         font-weight: 700;
-        margin-top: 10rpx;
+        // margin-top: 10rpx;
 
         .underline {
           text-decoration: underline;
         }
       }
-			
+
 			.underline-item{
 				// text-decoration: underline;
 				// margin-right: 40rpx;
 			}
-			
+
       .page_item_cont_T {
         padding-top: 28rpx;
         padding-bottom: 28rpx;
@@ -292,13 +342,14 @@
         border: 1px solid #CBCBCB;
         border-radius: 10rpx;
         padding: 20rpx;
-				
+
         .page_item_cont_title {
           height: 100%;
           font-size: 32rpx;
           display: flex;
           justify-content: space-between;
           align-items: center;
+          margin-top: 10rpx;
 					.content{
 						display: flex;
 						flex-wrap: wrap;
@@ -325,14 +376,14 @@
           align-items: center;
         }
       }
-			
+
 			.page_item_cont_title_coll{
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				margin-right: 8rpx;
 			}
-			
+
       .page_item_cont_B {
         padding-top: 28rpx;
         margin-bottom: 28rpx;

pages/checkAfterScanning/checkAfterScanning.vue

@@ -19,21 +19,29 @@
           检验科室标本数量：
         </view>
         <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
-         <uni-collapse :border="false">
-						<uni-collapse-item titleBorder="none">
-							<template v-slot:title>
-								<view class="page_item_cont_title_coll">
-									<view>{{item.deptName}}</view>
-									<view class="text_big" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
-								</view>
-							</template>
-							<view class="content">
-								<view class="list" v-for="x in item.tubeTypeData" @click="viewSpe(item.deptName,item.deptQrCode,x.tubeTypeId)">
-									{{x.tubeTypeName}}：<text class="underline-item">{{x.speCount}}</text>
-								</view>
-							</view>
-						</uni-collapse-item>
-					</uni-collapse>
+          <template v-if="taskTypeConfig.speExpandTube == 1">
+            <uni-collapse :border="false">
+              <uni-collapse-item titleBorder="none" :open="taskTypeConfig.speDefaultExpandTube == 1">
+                <template v-slot:title>
+                  <view class="page_item_cont_title_coll">
+                    <view>{{item.deptName}}</view>
+                    <view class="text_big" style="padding-right: 20rpx;" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
+                  </view>
+                </template>
+                <view class="content">
+                  <view class="list" v-for="x in item.tubeTypeData" :key="x.id" @click="viewSpe(item.deptName,item.deptQrCode,x.tubeTypeId)">
+                    {{x.tubeTypeName}}：<text class="underline-item">{{x.speCount}}</text>
+                  </view>
+                </view>
+              </uni-collapse-item>
+            </uni-collapse>
+          </template>
+          <template v-else>
+            <view class="page_item_cont_title_coll" style="width: 100%;">
+            	<view>{{item.deptName}}</view>
+            	<view class="text_big" @click.stop="goToSpeDetail(item.deptName,item.deptQrCode)"><text class="underline">{{item.speCount}}</text>只</view>
+            </view>
+          </template>
         </view>
       </view>
     </view>
@@ -67,6 +75,7 @@
   export default {
     data() {
       return {
+        taskTypeConfig: {},
         handoverId: undefined,
         handoverDeptId: undefined,
         info: {},
@@ -175,6 +184,7 @@
 			            let data = res.list[0];
 									uni.hideLoading();
 			        		if(data){
+                    this.taskTypeConfig = data || {};
 										// 输入动态数字密钥
 			              this.enterDynamicDigitalKey = data.enterDynamicDigitalKey
 										console.log(55555,this.enterDynamicDigitalKey)
@@ -608,7 +618,7 @@
       .text_big {
         font-size: 32rpx;
         font-weight: 700;
-        margin-top: 10rpx;
+        // margin-top: 10rpx;
       }
 			
 			.underline{
@@ -635,6 +645,7 @@
           display: flex;
           justify-content: space-between;
           align-items: center;
+          margin-top: 10rpx;
 					.content{
 						display: flex;
 						flex-wrap: wrap;

pages/patientInspectLog/components/patientInspectLogListFilter.vue

@@ -4,13 +4,13 @@
       <view class="container_form">
         <view class="head">
           <text class="name">状态</text>
-          <text class="status">{{getStateNames()}}</text>
+          <text class="status ellipsis-multiline">{{getStateNames()}}</text>
         </view>
         <view class="statusList">
           <view class="statusItem" :class="{ active: item.checked }" v-for="item in searchData.stateList" :key="item.id" @click="item.checked = !item.checked;">{{item.name}}<text class="newicon newicon-xuanzejiaobiao" v-if="item.checked"></text></view>
         </view>
         <view class="category" @click="clickPageRouter('department')">
-          <text class="name">科室</text>
+          <text class="name">患者科室</text>
           <text class="value ellipsis">{{searchData.department ? searchData.department.dept : ''}}</text>
         </view>
         
@@ -359,8 +359,12 @@
       justify-content: space-between;
       background-color: #fff;
       padding: 0 24rpx;
+      .name{
+        flex-shrink: 0;
+      }
       .status{
         color: #5DAAB6;
+        padding-left: 24rpx;
       }
     }
     .statusList{

pages/patientInspectLog/patientInspectLogList.vue

@@ -10,7 +10,7 @@
     </view>
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toDetail(data)">
-        <view class="body_item_head ellipsis-multiline">
+        <view class="body_item_head">
           <text>
             <text class="sign signRed">{{ data.careLevel ? data.careLevel.name : '' }}<template v-if="data.careLevel && data.illnessState">、</template>{{ data.illnessState ? data.illnessState.name : '' }}</text> {{ data.patientName }}<text v-if="data.bedNum">({{ data.bedNum }})</text>
           </text>

pages/specimenChecking/specimenChecking.vue

@@ -4,27 +4,37 @@
     <view class="page_item_wrap" v-for="item in list" :key="item.deptId">
       <view class="page_item">
         <view class="page_item_top">
-					<uni-collapse :border="false">
-						<uni-collapse-item titleBorder="none">
+          <template v-if="taskTypeConfig.speExpandTube == 1">
+            <uni-collapse :border="false">
+						<uni-collapse-item titleBorder="none" :open="taskTypeConfig.speDefaultExpandTube == 1">
 							<template v-slot:title>
 								<view class="page_item_cont_title_coll" @click.stop="gotoDetail(item)">
 									<view class="page_item_top-inner">
-										<!-- <view class="page_item_top_L"> -->
-											<view class="L_text">{{item.deptName}}</view>
-										<!-- </view> -->
+                    <view class="L_text">{{item.deptName}}</view>
 										<view class="page_item_top_R">
-											<view class="L_iocn">{{item.speNum}}</view>
+											<view class="L_iocn" style="margin-right: 20rpx;">{{item.speNum}}</view>
 										</view>
 									</view>
 								</view>
 							</template>
 							<view class="content">
-								<view class="list" v-for="x in item.tubeTypeDataList" @click="viewSpe(item, x.tubeTypeId)">
+								<view class="list" v-for="x in item.tubeTypeDataList" :key="x.id" @click="viewSpe(item, x.tubeTypeId)">
 									{{x.tubeTypeName}}：<text class="underline-item">{{x.speNum}}</text>
 								</view>
 							</view>
 						</uni-collapse-item>
 					</uni-collapse>
+          </template>
+          <template v-else>
+            <view class="page_item_cont_title_coll" @click.stop="gotoDetail(item)">
+              <view class="page_item_top-inner">
+                  <view class="L_text">{{item.deptName}}</view>
+                <view class="page_item_top_R">
+                  <view class="L_iocn">{{item.speNum}}</view>
+                </view>
+              </view>
+            </view>
+          </template>
         </view>
         <!-- <view class="page_item_cont">
           <view class="page_item_cont_T">
@@ -68,6 +78,8 @@
     },
     data() {
       return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        taskTypeConfig: {},
         // 弹窗model
         models: {
           disjunctor: false,
@@ -83,6 +95,45 @@
       };
     },
     methods: {
+      // 获取配置
+			getSpecimenTaskTypeConfig(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+          "idx": 0,
+          "sum": 1,
+          "taskTypeConfig": {
+            "taskTypeDTO": {
+              "hosId": {
+                  "id": this.hosId
+              },
+              "associationType": {
+                  "key": "association_types",
+                  "value": "specimen"
+              }
+            }
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            if(result.list.length){
+              this.taskTypeConfig = result.list[0] || {};
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置标本配送任务类型！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
 			viewSpe(item, tubeTypeId){
 				this.speNumChange = item.speNum;
 				this.changeSpeObj = {
@@ -505,6 +556,7 @@
       console.log(options, "快捷建单");
       this.msg = JSON.parse(options.infoDATA);
       this.getList();
+      this.getSpecimenTaskTypeConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -521,11 +573,11 @@
 	/deep/ .uni-collapse-item--border{
 		border-bottom-color: #fff !important;
 	}
-	
+
 	/deep/ .uni-collapse-item__title-arrow{
 		margin-right: 0 !important;
 	}
-	
+
   .specimenChecking {
     padding-bottom: 100rpx;
 
@@ -607,34 +659,34 @@
           // height: 88rpx;
           // border-bottom: 2rpx dashed #e5e9ed;
           padding: 20rpx 16rpx;
-					
+
 					.page_item_cont_title_coll{
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
 						margin-right: 8rpx;
-						
+
 						.page_item_top-inner {
 						  display: flex;
 						  justify-content: space-between;
 						  align-items: center;
 						  height: 100%;
 							width: 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;
@@ -645,21 +697,21 @@
 						      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;
@@ -668,7 +720,7 @@
 						  }
 						}
 					}
-					
+
 					.content{
 						display: flex;
 						flex-wrap: wrap;
@@ -684,12 +736,12 @@
 						}
 					}
         }
-				
+
 				.underline-item{
 					// text-decoration: underline;
 					// margin-right: 40rpx;
 				}
-				
+
         .page_item_cont {
           min-height: 90rpx;
           padding: 0 16rpx;

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -96,8 +96,9 @@
     data() {
       return {
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
-        type: 'patient',//patient|specimenDesc
+        type: '',//patient|speTubeType|specimenDesc
         queryObj: {}, //路由传递过来的数据
+        taskTypeConfig: {}, //页面控制
         typeList: {
           "patient": {
             id: -1,
@@ -130,6 +131,60 @@
       };
     },
     methods: {
+      getSpecimenTaskTypeConfig(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+          "idx": 0,
+          "sum": 1,
+          "taskTypeConfig": {
+            "taskTypeDTO": {
+              "hosId": {
+                  "id": this.hosId
+              },
+              "associationType": {
+                  "key": "association_types",
+                  "value": "specimen"
+              }
+            }
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            if(result.list.length){
+              this.taskTypeConfig = result.list[0] || {};
+              
+              if(this.taskTypeConfig.speHandoverTubeType == 1){
+                // 患者
+                this.type = 'patient';
+              }else if(this.taskTypeConfig.speHandoverTubeType == 2){
+                // 试管类型
+                this.type = 'speTubeType';
+              }else if(this.taskTypeConfig.speHandoverTubeType == 3){
+                // 检验标本
+                this.type = 'specimenDesc';
+              }else{
+                // 默认-患者
+                this.type = 'patient';
+              }
+              
+              this.clickTab(this.type);
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置标本配送任务类型！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
       ok(){
         this.models.disjunctor = false;
         uni.showLoading({
@@ -307,9 +362,7 @@
         });
       },
       initData(){
-        this.getInfo('patient');
-				// this.getInfo('speTubeType');
-    //     this.getInfo('specimenDesc');
+        this.getSpecimenTaskTypeConfig();
       },
     },
 		onShow(){