components/bigScreen/bigScreen.vue

@@ -510,7 +510,18 @@
       },
       // 底部扫描
       Scanning(qrcodePrefix = '') {
-				// this.ScanningCommon('', '250515541895@_1');
+				// 标本码
+				// this.ScanningCommon('', '250522891576@_1');
+				
+				// 快捷建单-轮巡工单码
+				// this.ScanningCommon('', '3330ec8e-76eb-413e-b000-995f08d2ff96');
+				
+				// 中转科室码--金银湖流转中心
+				// this.ScanningCommon('', '7d047a94-e102-446c-b477-94f977faaebd');
+				
+				// 终点科室核对码--本部住院检验科
+				// this.ScanningCommon('', '95c5de27-c05f-11ea-8cfe-000c29097622');
+				
         if (!this.SMFlag) {
           return;
         }

components/specimenListItem/specimenListItem.vue

@@ -13,7 +13,7 @@
     <view class="page_item_cont">
       <view class="page_item_cont_T">
         <view class="page_item_cont_title">
-          <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} </view>
+          <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} <text v-if="item.tubeType">、</text> {{item.tubeType && item.tubeType.name}}</view>
           <view class="text_big">{{ item.scode || "无" }}</view>
         </view>
         <view class="page_item_cont_title">

manifest.json

@@ -1,5 +1,5 @@
 {
-    /* "name" : "病理全流程", */
+    // "name" : "大势科技",
     "name" : "",
     "appid" : "__UNI__9F2011E",
     "description" : "",

pages.json

@@ -776,6 +776,22 @@
 		      "titleNView": false
 		    }
 		  }
+		},
+		{
+		  "path": "pages/viewSpe/viewSpe",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    }
+		  }
+		},
+		{
+		  "path": "pages/speError/speError",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    }
+		  }
 		}
   ],
   "globalStyle": {

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -19,9 +19,21 @@
           检验科室标本数量：
         </view>
         <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
-          <view>{{item[1]}}</view>
-          <view class="text_big" @click="goToSpeDetail(item[1],item[2])"><text class="underline">{{item[3]}}</text>只
-          </view>
+					<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>
         </view>
       </view>
     </view>
@@ -61,6 +73,11 @@
       };
     },
     methods: {
+			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`,
+				});
+			},
       // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
@@ -224,17 +241,25 @@
   };
 </script>
 <style lang="less" scoped>
+	/deep/ .uni-collapse-item--border{
+		border-bottom-color: #fff !important;
+	}
+	
+	/deep/ .uni-collapse-item__title-arrow{
+		margin-right: 0 !important;
+	}
   .checkAfterScanning {
     .checkAfterScanning_title {
       padding: 50rpx 0;
       font-size: 46rpx;
       font-weight: 550;
       text-align: center;
-      border-bottom: 1px solid #ccc;
+      // border-bottom: 1px solid #ccc;
     }
 
     .page_item_cont {
-      min-height: 90rpx;
+      height: 73vh;
+      overflow-y: auto;
       padding: 0 20rpx;
       text-align: left;
       position: relative;
@@ -253,18 +278,41 @@
           text-decoration: underline;
         }
       }
-
+			
+			.underline-item{
+				// text-decoration: underline;
+				// margin-right: 40rpx;
+			}
+			
       .page_item_cont_T {
         padding-top: 28rpx;
         padding-bottom: 28rpx;
         font-size: 28rpx;
-
+        background: #fff;
+        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;
+					.content{
+						display: flex;
+						flex-wrap: wrap;
+						.list{
+							font-size: 28rpx;
+							height: 60rpx;
+							line-height: 60rpx;
+							width: 50%;
+							border-bottom: 1rpx solid #E6E6E6;
+							&:last-child{
+								border-bottom: none;
+							}
+						}
+					}
         }
 
         .page_item_cont_title2 {
@@ -277,7 +325,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,8 +19,21 @@
           检验科室标本数量：
         </view>
         <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
-          <view>{{item[1]}}</view>
-          <view class="text_big" @click="goToSpeDetail(item[1],item[2])"><text class="underline">{{item[3]}}</text>只</view>
+         <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>
         </view>
       </view>
     </view>
@@ -80,6 +93,11 @@
 			numberKeyModel
 		},
     methods: {
+			viewSpe(deptName, qrCode, id){
+				uni.navigateTo({
+				  url: `../viewSpe/viewSpe?deptName=${deptName}&workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${qrCode}&tubeTypeId=${id}&isScan=1&specimensCheck=1`,
+				});
+			},
 			confirmKey(data){
 				this.Scanning_complete('key')
 				this.contentData = data
@@ -558,17 +576,26 @@
   };
 </script>
 <style lang="less" scoped>
+	/deep/ .uni-collapse-item--border{
+		border-bottom-color: #fff !important;
+	}
+	
+	/deep/ .uni-collapse-item__title-arrow{
+		margin-right: 0 !important;
+	}
+	
   .checkAfterScanning {
     .checkAfterScanning_title {
       padding: 50rpx 0;
       font-size: 46rpx;
       font-weight: 550;
       text-align: center;
-      border-bottom: 1px solid #ccc;
+      // border-bottom: 1px solid #ccc;
     }
 
     .page_item_cont {
-      min-height: 90rpx;
+      height: 73vh;
+			overflow-y: auto;
       padding: 0 20rpx;
       text-align: left;
       position: relative;
@@ -582,23 +609,46 @@
         font-size: 32rpx;
         font-weight: 700;
         margin-top: 10rpx;
-
-        .underline{
-          text-decoration: underline;
-        }
       }
-
+			
+			.underline{
+			  text-decoration: underline;
+			}
+			
+			.underline-item{
+				// text-decoration: underline;
+				// margin-right: 40rpx;
+			}
+			
       .page_item_cont_T {
         padding-top: 28rpx;
         padding-bottom: 28rpx;
         font-size: 28rpx;
-
+				background: #fff;
+				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;
+					.content{
+						display: flex;
+						flex-wrap: wrap;
+						.list{
+							font-size: 28rpx;
+							height: 60rpx;
+							line-height: 60rpx;
+							width: 50%;
+							border-bottom: 1rpx solid #E6E6E6;
+							&:last-child{
+								border-bottom: none;
+							}
+						}
+					}
         }
         .page_item_cont_title2{
           margin-top: 36rpx;
@@ -610,7 +660,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/receipt_infopage/receipt_infopage.vue

@@ -431,6 +431,9 @@
           infoDATA.taskType.associationType.value == 'specimen' ||
           infoDATA.taskType.associationType.value == 'specimenPlan'
         " hover-class="seimin-btn-hover">查看标本</view>
+			
+			<view class="btn3" @click="redeployScan(infoDATA)" v-if="(infoDATA.taskType.associationType.value == 'specimen' ||
+			    infoDATA.taskType.associationType.value == 'specimenPlan') && sPehandoverOrder==1 && (infoDATA.gdState.value==4 || infoDATA.gdState.value==5 || infoDATA.gdState.value==8)" hover-class="seimin-btn-hover">转派</view>
       <view class="btn3" @click="viewDrugsBag(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'drugsBag'" hover-class="seimin-btn-hover">查看业务流程</view>
       <view class="btn3" @click="toDrugBatches(infoDATA.drugs.batchNo)" v-if="infoDATA.taskType.associationType.value == 'drugsBag' && taskTypeConfig.drugsBatchInfo == 1" hover-class="seimin-btn-hover">药品批次</view>
       <view class="btn3" @click="viewBlood(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'" hover-class="seimin-btn-hover">查看血制品</view>
@@ -460,6 +463,13 @@
     </checkboxModal>
 		<!-- PDA扫描 -->
 		<scanner></scanner>
+		<!-- 标本转派 -->
+		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
+			<uni-popup-dialog type="info" cancelText="否" confirmText="是" title="提示" @confirm="dialogConfirm"
+				@close="dialogClose">
+				<text v-html="speContent"></text>
+			</uni-popup-dialog>
+		</uni-popup>
   </view>
 </template>
 <script>
@@ -529,6 +539,9 @@
         // 特殊情况关闭原因开关
         textareaFlag: false,
         textareaText: "",
+				tasktype: null,
+				sPehandoverOrder: null ,//是否转派
+				speContent: null,
       };
     },
     filters: {
@@ -1087,6 +1100,82 @@
           url: "../receiptpage/receiptpage",
         });
       },
+			// 转派
+			redeployScan(workOrder){
+				if (!this.SMFlag) {
+				  return;
+				}
+				this.SMFlag = false;
+				SM().then((content) => {
+				  uni.showLoading({
+				    title: "加载中",
+				    mask: true,
+				  });
+					const regex = /^[^{}]+$/; // 验证是否是json对象
+					let code = null
+					console.log(12345,regex.test(content))
+					if(!regex.test(content)){
+						code = JSON.parse(content)
+					}else{
+						code = null
+						uni.hideLoading();
+						uni.showToast({
+						  icon: "none",
+						  title: '请扫描正确的二维码',
+						});
+						this.SMFlag = true;
+						return
+					}
+				  post("/workerOrder/transfer ", {
+							handoverId: code.id ? code.id : null,
+							orderId: workOrder.id
+				    })
+				    .then((result) => {
+				      this.SMFlag = true;
+							uni.hideLoading();
+				      if (result.state == 205) {
+								this.speContent = result.msg
+								this.handoverId = code.id ? code.id : null
+				        this.$refs.alertDialog.open()
+				      }else{
+								uni.showToast({
+								  icon: "none",
+								  title: result.msg,
+								});
+							} 
+				    })
+				}).catch(err => {
+				  this.SMFlag = true;
+				});
+			},
+			dialogConfirm() {
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				post("/workerOrder/transfer ", {
+						handoverId: this.handoverId,
+						orderId: this.infoDATA.id,
+						transferOrder: 1
+				  })
+				.then((result) => {
+					this.SMFlag = true;
+					uni.hideLoading();
+					if (result.state == 200) {
+						uni.showToast({
+						  icon: "none",
+						  title: result.info || "转派成功",
+						});
+						setTimeout(_=>{
+							this.goBack()
+						},2000)
+					} 
+				})
+			},
+			dialogClose() {
+				this.$refs.alertDialog.close()
+				this.speContent = null
+			},
       // 查看标本
       viewSpecimen(workOrder) {
         uni.navigateTo({
@@ -1591,6 +1680,51 @@
           }
         });
       },
+			// 获取标本是否转派配置
+			getSpeTaskConfig(){
+				let postData = {
+					idx: 0,
+					sum: 10,
+					taskType: {
+						simpleQuery: true,
+						hosId: {
+							id: this.hosId
+						},
+						associationType: {
+							key:"association_types",
+							value: "specimen"
+						}
+					}
+				};
+				 
+				post("/simple/data/fetchDataList/taskType", postData).then((result) => {
+					if (result.status == 200) {
+						this.tasktype = result.list[0] || {};
+						this.getSpeConfig();
+					}
+				});
+			},
+			// 获取配置
+			getSpeConfig() {
+				let postData = {
+					idx: 0,
+					sum: 10,
+					taskTypeConfig: {
+						taskTypeDTO: {
+							hosId: {
+								id: this.hosId
+							},
+							associationType: this.tasktype.associationType
+						}
+					}
+				};;
+			  post("/simple/data/fetchDataList/taskTypeConfig", postData).then((result) => {
+					if (result.status == 200) {
+						this.configs = result.list[0] || {};
+						this.sPehandoverOrder = this.configs.handoverOrder || null;
+					}
+			  });
+			},
       // 获取检查页面控制开关
       getTaskConfig(){
         post("/simple/data/fetchDataList/taskTypeConfig", {
@@ -1872,6 +2006,8 @@
         options.associationTypeValue == 'specimen' ||
         options.associationTypeValue == 'specimenPlan'
       ) {
+				// 到达 送达 执行中
+				this.getSpeTaskConfig();
         this.getInfoBySpecimen(id);
       } else {
         this.getInfo(id);

pages/scanning_B/scanning_B.vue

@@ -19,7 +19,7 @@
     </view>
 
     <view class="Scanning_cont" v-if="res.status == 200 || res.status == 666">
-      <view>标本类型 : {{ infoDATA.stype.name || "-" }}</view>
+      <view>标本类型 : {{ infoDATA.stype.name || "-" }} <text v-if="res.data.tubeType">、</text> {{res.data.tubeType && res.data.tubeType.name}}</view>
       <view>标本编码 : {{ infoDATA.scode || "-" }}</view>
       <view>标本状态 : <text :class="{ red: res.data.speState && res.data.speState.value == 8 }">{{ res.data.speState ? res.data.speState.name : "-" }}</text></view>
       <view>申请科室 : {{ infoDATA.sickRoom || "-" }}</view>

pages/scanning_Result/scanning_Result.vue

@@ -38,48 +38,58 @@
         (res.status == 200 && type == 'specimenPlan') ||
         (res.status == 200 && type == 'specimen')
       ">
-      <view>{{ infoDATA.stype.name }}（{{infoDATA.scode}}）</view>
-      <view>检验项目 : {{ infoDATA.specimenDesc || "-" }}</view>
-      <view>
+			<view class="df">
+				<view class="width-100">编 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 码：</view> 
+				<view>
+					<text class="red">{{infoDATA.urgent==1?'急':''}}</text>
+					<text class="mar-le">{{infoDATA.scode}} </text>
+				</view>
+				<view class="po-ab">{{infoDATA.speState && infoDATA.speState.name}}</view>
+			</view>
+      <view class="df"><view class="width-100">检验项目：</view> {{ infoDATA.specimenDesc || "-" }}</view>
+			<view class="df"><view class="width-100">类 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 型：</view>{{ infoDATA.stype.name }} <text v-if="infoDATA.tubeType">、</text> {{infoDATA.tubeType && infoDATA.tubeType.name}}</view>
+      <view class="df">
+				<view class="width-100">科 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 室：</view>
         {{ infoDATA.sickRoom ? infoDATA.sickRoom.dept : "" }}
-        <text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="newicon newicon-arrow-right-full"></text>
+        <text class="newicon newicon-arrow-right-full"></text>
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}</text>
       </view>
-      <view>患者姓名 : {{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
-      <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
+      <view class="df"><view class="width-100">患者姓名：</view>{{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
+      <view class="df"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo || '-' }}</view>
     </view>
 
     <view class="Scanning_cont" v-if="
         (res.status == 11111 && type == 'specimenPlan') ||
         (res.status == 11111 && type == 'specimen')
       ">
-      <view>{{ infoDATA.stype.name }}（{{infoDATA.scode}}）</view>
-      <view>检验项目 : {{ infoDATA.specimenDesc || "-" }}</view>
-      <view>标本状态 : <text style="color: red">{{ infoDATA.speState ? infoDATA.speState.name : '' }}</text></view>
-      <view>
-        {{ infoDATA.sickRoom ? infoDATA.sickRoom.dept : "" }}
-        <text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="newicon newicon-arrow-right-full"></text>
-        <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}</text>
-      </view>
-      <view>患者姓名 : {{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
-      <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
+			<view class="df"><view class="width-100">编码：</view> <text class="red">{{infoDATA.urgent==1?'急':''}}</text> {{infoDATA.scode}} {{infoDATA.speState && infoDATA.speState.name}}</view>
+			<view class="df"><view class="width-100">检验项目：</view> {{ infoDATA.specimenDesc || "-" }}</view>
+			<view class="df"><view class="width-100">类型：</view>{{ infoDATA.stype.name }} <text v-if="infoDATA.tubeType">、</text> {{infoDATA.tubeType && infoDATA.tubeType.name}}</view>
+			<view class="df">
+				<view class="width-100">科室：</view>
+			  {{ infoDATA.sickRoom ? infoDATA.sickRoom.dept : "" }}
+			  <text class="newicon newicon-arrow-right-full"></text>
+			  <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}</text>
+			</view>
+			<view class="df"><view class="width-100">患者姓名：</view>{{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
+			<view class="df"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo || '-' }}</view>
     </view>
 
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
       ">
-      <view v-if="res.patient"> 患者姓名 : {{ res.patient || "-" }} </view>
-      <view v-if="res.residenceNo">
-        住院号 : {{ res.residenceNo || "-" }}
+      <view class="df" v-if="res.patient"> <view class="width-100">患者姓名：</view> {{ res.patient || "-" }} </view>
+      <view class="df" v-if="res.residenceNo">
+        <view class="width-100">住院号：</view> {{ res.residenceNo || "-" }}
       </view>
-      <view v-if="res.deptName">
-        住院科室 : {{ res.deptName !== "undefined" ? res.deptName : "-" }}
+      <view class="df" v-if="res.deptName">
+        <view class="width-100">住院科室：</view> {{ res.deptName !== "undefined" ? res.deptName : "-" }}
       </view>
-      <view v-if="res.bedNum">
-        床号 : {{ res.bedNum !== "undefined" ? res.bedNum : "-" }}
+      <view class="df" v-if="res.bedNum">
+        <view class="width-100">床号：</view> {{ res.bedNum !== "undefined" ? res.bedNum : "-" }}
       </view>
-      <view v-if="res.data">
-        检查项目 :
+      <view class="df" v-if="res.data">
+        <view class="width-100">检查项目：</view>
         <text v-for="(data, i) in res.data" :key="i">{{
           data.inspectName
         }}</text>
@@ -106,18 +116,18 @@
       </view>
     </view>
     <view class="Scanning_cont" v-if="res.status == 200 && (type == 'drugsBag' || type == 'jPBag')">
-      <view> 药包类型 : {{(infoDATA.packType && infoDATA.packType !== 0) ? DRUGSBAG_TYPE[infoDATA.packType] : "-"}} </view>
-      <view v-if="type == 'drugsBag'"> 药包编码 : #{{ infoDATA.packid }} </view>
-      <view
+      <view class="df"> <view class="width-100">药包类型：</view>  {{(infoDATA.packType && infoDATA.packType !== 0) ? DRUGSBAG_TYPE[infoDATA.packType] : "-"}} </view>
+      <view class="df" v-if="type == 'drugsBag'"> <view class="width-100">药包编码：</view>  #{{ infoDATA.packid }} </view>
+      <view class="df"
         v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
-        交接人工号 : {{ accountObj.account }} </view>
-      <view
+        <view class="width-100">交接人工号：</view>  {{ accountObj.account }} </view>
+      <view class="df"
         v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
-        交接人姓名 : {{ accountObj.accountName }} </view>
-      <view v-if="type == 'jPBag'">
-        静配药包编码 : #{{ infoDATA.packid }}
+        <view class="width-100">交接人姓名：</view>  {{ accountObj.accountName }} </view>
+      <view class="df"v-if="type == 'jPBag'">
+        <view class="width-100">静配药包编码：</view>  #{{ infoDATA.packid }}
       </view>
-      <view> 所属科室 : {{ infoDATA.target.dept || "-" }} </view>
+      <view class="df"> <view class="width-100">所属科室：</view>  {{ infoDATA.target.dept || "-" }} </view>
       <view v-if="infoType === 'drug-dsd-2' || infoType === 'jp-dsd-2'">
         工单已完成。
       </view>
@@ -136,8 +146,8 @@
       <view class="btn3" @click="hand_again()">手动录入</view>
       <view class="btn3" @click="getNoScanSpecimen(false)">未扫描标本</view>
       <view class="btn3" @click="getNoScanSpecimen(true)">已扫描标本</view>
-      <view class="btn2" @click="Scanning_complete(dataId)"> 完成扫描 </view>
-			<view class="btn2" v-if="speCollectLimit==1" @click="configuration(dataId)"> 配置收取 </view>
+      <view class="btn3" @click="Scanning_complete(dataId)"> 完成扫描 </view>
+			<view class="btn3" v-if="speCollectLimit==1" @click="configuration(dataId)"> 配置收取 </view>
 		</view>
     <view class="foot_btn" v-if="
         (type != 'specimenPlan' &&
@@ -265,7 +275,7 @@
 		<!-- PDA扫描 -->
 		<scanner></scanner>
 		<!-- 标本扫描拦截 -->
-		<errorModel v-show="errorModal" ref="model11" :errorModal="errorModal" :speDATA="speDATA" @cancel="cancelError" @confirm="confirmError($event)"></errorModel>
+		<!-- <errorModel v-show="errorModal" ref="model11" :errorModal="errorModal" :speDATA="speDATA" @cancel="cancelError" @confirm="confirmError($event)"></errorModel> -->
 	</view>
 </template>
 <script>
@@ -456,7 +466,7 @@
                   //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
                   if ((this.type == "specimenPlan" || this.type == "specimen") && ress.status != 11111) {
                     this.getPageConfigSpecimen((flag, type, ress) => {
-                      if(flag && !this.isShow){
+                      // if(flag && !this.isShow){
                         setTimeout(()=>{
                           if (type === 'scan') {
 														// #ifdef H5
@@ -464,7 +474,7 @@
 														// #endif
                           }
                         },500)
-                      }
+                      // }
                       if(ress){
                         this.infoDATA = ress.data;
                         this.speNum = ress.specimenCount;
@@ -477,7 +487,7 @@
                           JSON.stringify(ress.data)
                         )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                           this.queryObj.deptCode
-                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}&isShow=1`
+                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}`
 												uni.setStorageSync('gdData', JSON.stringify(sessData))
 												
                         uni.redirectTo({
@@ -489,7 +499,7 @@
                           JSON.stringify(ress.data)
                         )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                           this.queryObj.deptCode
-                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}&isShow=1`,
+                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}`,
                         });
                       }
                     }, type, ress.data, ress);
@@ -590,12 +600,22 @@
                     });
                   }
                 } else if (ress.status==513){
-									this.speDATA = ress
-									this.errorModal = true
+									uni.navigateTo({
+									  url: `../speError/speError?type=${
+									  this.queryObj.type
+									}&type1=${
+									  this.queryObj.type1
+									}&infoData=${encodeURIComponent(
+									  JSON.stringify(ress.data)
+									)}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+									  this.queryObj.deptCode
+									}&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}`,
+									});
 								} else if(ress.status==10004){
                   uni.showToast({
                     icon: "none",
-                    title: ress.msg,
+										duration: 3000,
+                    title: ress.msg +'，'+ `扫描内容：${data.speCode}`,
                   });
                 }else{
 									uni.redirectTo({
@@ -621,21 +641,23 @@
               title: result.info || "接口获取数据失败！",
             });
           }
-        });
+        }).catch(err =>{
+					this.SMFlag = true;
+				});
         // ------------------------------
       },
 			// 取消拦截
-			cancelError(){
-				this.errorModal = false
-				this.interceptData = null
-				this.speDATA = null
-			},
-			// 确定标本拦截
-			confirmError(e){
-				this.errorModal = false
-				this.interceptData = e
-				this.hand_scanning_common(this.interceptData.code, 'scan')
-			},
+			// cancelError(){
+			// 	this.errorModal = false
+			// 	this.interceptData = null
+			// 	this.speDATA = null
+			// },
+			// // 确定标本拦截
+			// confirmError(e){
+			// 	this.errorModal = false
+			// 	this.interceptData = e
+			// 	this.hand_scanning_common(this.interceptData.code, 'scan')
+			// },
       // 查看未扫描标本
       // isScan true已扫描标本，false未扫描标本
       getNoScanSpecimen(isScan) {
@@ -659,7 +681,7 @@
       },
       // 继续扫描
       Scanning_again() {
-				// this.hand_scanning_common('250515584338@_1', 'scan')
+				// this.hand_scanning_common('250523620572@_1', 'scan')
         if (!this.SMFlag) {
           return;
         }
@@ -1161,6 +1183,7 @@
 			// #endif
     },
     onLoad(options) {
+			console.log(77776666,options)
 			this.intercept = options.intercept
 			this.isShow = options.isShow
       this.isEndDeptRedShow = options.isEndDeptRed === 'true';
@@ -1172,34 +1195,18 @@
           }
         });
       }
-			else if(options.scanOrHand === 'scan'){
-				if(options.isShow==1){
-					this.getPageConfigSpecimen((flag, type, ress) => {
-						if(flag){
-							setTimeout(()=>{
-								// #ifdef H5
-								this.Scanning_again();
-								// #endif
-							},500)
-						}
-					})
-				}
-			}
-			// else if ((options.scanOrHand === 'scan' || options.type == "specimenPlan" || options.type == "specimen") && options.status != 11111) {
-			// 	if(options.scanOrHand === 'scan' || this.intercept==1){
-			// 		this.getSys()
-			// 	}
-			// 	this.getPageConfigSpecimen((flag, type, ress) => {
-			// 		if(flag){
-			// 			setTimeout(()=>{
-			// 				// if (type === 'scan') {
+			// else if(options.scanOrHand === 'scan'){
+			// 	if(options.isShow==1){
+			// 		this.getPageConfigSpecimen((flag, type, ress) => {
+			// 			if(flag){
+			// 				setTimeout(()=>{
 			// 					// #ifdef H5
 			// 					this.Scanning_again();
 			// 					// #endif
-			// 				// }
-			// 			},500)
-			// 		}
-			// 	})
+			// 				},500)
+			// 			}
+			// 		})
+			// 	}
 			// }
 			console.log(options , "options");
       this.queryObj = options;
@@ -1279,14 +1286,16 @@
 </script>
 <style lang="less">
   .Scanning_Result {
-    padding: 0 20rpx;
-
+    padding: 0 24rpx;
+		height: 96vh;
+		position: relative;
+		
     .Scanning_top {
       .Scanning_top_icon {
         width: 140rpx;
         height: 140rpx;
         margin: 0 auto;
-        margin-top: 116rpx;
+        margin-top: 40rpx;
         border-radius: 50%;
         line-height: 140rpx;
 
@@ -1321,12 +1330,37 @@
 
     .Scanning_cont {
       font-size: 32rpx;
-      text-align: center;
-
-      view {
-        margin-bottom: 16rpx;
-      }
-
+      // text-align: center;
+			margin-top: 40rpx;
+			height: 50vh;
+			overflow-y: auto;
+			
+			.df{
+				display: flex;
+				align-items: center;
+				margin-bottom: 14rpx;
+				position: relative;
+				
+				.newicon{
+					margin: 0 8rpx;
+				}
+				
+				.mar-le{
+					margin-left: 20rpx;
+				}
+				
+				.po-ab{
+					position: absolute;
+					right: 0;
+				}
+			}
+			
+			.width-100{
+				width: 160rpx;
+				font-weight: 600;
+				text-align-last: justify;
+			}
+			
       .Scanning_cont_center {
         text-align: center;
       }
@@ -1366,21 +1400,21 @@
     .foot_btn_spe {
       line-height: 88rpx;
       height: 100rpx;
-      margin-top: 40rpx;
+      // margin-top: 40rpx;
       text-align: center;
       display: flex;
       justify-content: space-between;
       flex-wrap: wrap;
-
-      &::after {
-        content: '';
-        flex: 1;
-      }
+			
+      // &::after {
+      //   content: '';
+      //   flex: 1;
+      // }
 
       view {
         height: 88rpx;
         width: 48%;
-        margin: 0 1%;
+        // margin: 0 1%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;

pages/speError/speError.vue

@@ -0,0 +1,405 @@
+<template>
+  <view class="showModel">
+		<view class="showModel__wrap">
+			<view class="content" v-if="speDATA && speDATA.data">
+				<view class="content-box">
+					<view class="icon">
+						<text class="red newicon newicon-guanbi1"></text>
+						<!-- <text class="error-text">提示</text> -->
+					</view>
+					<view class="list weight red">{{speDATA.msg}}</view>
+					<view class="list flex">
+						<view>条码：<text class="mar-rig" :class="speDATA.data.urgent==0?'green':'red'">{{speDATA.data.urgent==0?'普':'急'}}</text> {{speDATA.data.scode}}</view>
+						<view>{{speDATA.data.speState ? speDATA.data.speState.name : ''}}</view>
+					</view>
+					<view class="list">检查项目：{{ speDATA.data.specimenDesc || "-" }}</view>
+					<view class="list">类型：{{speDATA.data.stype ? speDATA.data.stype.name : ''}} <text v-if="speDATA.data.tubeType">、</text> {{speDATA.data.tubeType && speDATA.data.tubeType.name || ''}}</view>
+					<view class="list">患者：{{ speDATA.data.patientName}} <text v-if="speDATA.data.bedNum">（{{speDATA.data.bedNum}}）</text></view>
+					<view class="list">{{speDATA.data.sickRoom.dept}}
+					<text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="newicon newicon-arrow-right-full"></text>
+					{{speDATA.data.checkDept.dept}}</view>
+					<view class="list" v-if="speDATA.speVerifyType=='collectDept'
+					|| speDATA.speVerifyType=='testDept' || speDATA.speVerifyType=='tubeType'
+					|| speDATA.speVerifyType=='urgent'">
+						<checkbox-group @change="forceDeptInputBlur">
+						  <checkbox value="addConfig" :checked="addConfig" color="#49b856" />{{msg}}
+						</checkbox-group>
+					</view>
+				</view>
+			</view>
+			<view class="foot_btn_spe">
+			  <view class="btn green" @click="confirm()">是</view>
+			  <view class="btn gray" @click="cancel()">否</view>
+			</view>
+		</view>
+  </view>
+</template>
+
+<script>
+import {
+    get,
+    post,
+    SM
+  } from "../../http/http.js";
+export default {
+  data() {
+    return {
+      addConfig:false,
+			msg:null,
+			// 终点科室标红
+			isEndDeptRed: false,
+			currentCode: '', //当前小扫描的科室二维码
+			deptId: undefined,
+			handover: undefined,
+			SMFlag: true,
+			// 交接人信息
+			accountObj: undefined,
+			// 完成扫描的id
+			wcId: "",
+			wcFlag: false,
+			// 弹窗model
+			models: {
+			  disjunctor: false,
+			},
+			// 单选框弹窗model1
+			models1: {
+			  disjunctor: false,
+			},
+			// 完成扫描弹窗model1
+			models2: {
+			  disjunctor: false,
+			},
+			infoDATA: {},
+			res: {},
+			infoType: "",
+			DEPTCode: "",
+			RESData: {},
+			DEPT: "",
+			dataId: "",
+			type: "",
+			model: {},
+			speNum: 0,
+			queryObj: {}, //路由传递过来的数据
+			selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
+			gotoFlag: true,
+			content: "",
+			taskTypeId:"",
+			errorModal:null,
+			speDATA:null,
+			interceptData:null,
+			intercept:null,
+    };
+  },
+	onLoad(options){
+		console.log(77776666,options)
+		this.intercept = options.intercept
+		this.queryObj = options;
+		if (options.model) {
+		  this.infoDATA = JSON.parse(options.model);
+			this.speDATA = JSON.parse(options.model);
+		}
+		
+		if (options.accountObj && options.accountObj != "undefined") {
+		  this.accountObj = JSON.parse(options.accountObj);
+		}
+		if (options.deptId && options.deptId != "undefined") {
+		  this.deptId = options.deptId;
+		}
+		if (options.handover && options.handover != "undefined") {
+		  this.handover = options.handover;
+		}
+		this.dataId = options.id;
+		if(options.taskTypeId){
+			this.taskTypeId = options.taskTypeId
+		}else if(this.infoDATA.workOrderList && this.infoDATA.workOrderList.length>0){
+			this.taskTypeId = this.infoDATA.workOrderList[0].taskType.id
+		}
+		this.RESData = options.resData;
+		this.res["status"] = options.status;
+		this.res["msg"] = options.msg;
+		this.res["patient"] = options.patient;
+		this.res["patientCode"] = options.patientCode;
+		this.res["deptName"] = options.deptName;
+		this.res["bedNum"] = options.bedNum;
+		this.infoType = options.type1;
+	
+		if (options.dept) {
+		  this.DEPT = options.dept;
+		}
+		if (options.speNum) {
+		  this.speNum = options.speNum;
+		}
+		this.DEPTCode = options.deptCode;
+		this.type = options.type;
+		this.setMsg()
+	},
+  methods: {
+		setMsg(){
+			if(this.speDATA.speVerifyType=='collectDept'){
+				this.msg = '增加收取科室'
+			}else if(this.speDATA.speVerifyType=='testDept'){
+				this.msg = '收取本科室不在提示'
+			}else if(this.speDATA.speVerifyType=='tubeType'){
+				this.msg = '收取此试管类型不在提示'
+			}else if(this.speDATA.speVerifyType=='urgent'){
+				this.msg = '记录本次操作，不在提示'
+			}
+		},
+		forceDeptInputBlur(e){
+			this.addConfig = e.detail.value.length > 0
+		},
+    confirm(){
+			if(this.speDATA.speVerifyType!='collectDept'
+			&& this.speDATA.speVerifyType!='testDept' && this.speDATA.speVerifyType!='tubeType'
+			&& this.speDATA.speVerifyType!='urgent'){
+				this.addConfig = true
+			}
+			let data = {
+				code: this.speDATA.data.scode,
+				addConfig: this.addConfig
+			}
+			this.interceptData = data
+			this.hand_scanning_common(this.interceptData.code, 'scan')
+    },
+		// 手动输入标本和扫码公共方法
+		hand_scanning_common(ress1, type) {
+		  // ----------------
+		  uni.showLoading({
+		    title: "加载中",
+		    mask: true,
+		  });
+		  //检验二维码的有效性
+		  post("/dept/scanning", {
+		    content: ress1,
+		  }).then((result) => {
+		    this.SMFlag = true;
+		    this.currentCode = result.code;
+		    if (result.state == 200 || result.state == 201) {
+		      let codes = result.code;
+		      if (codes) {
+		        let speCode = codes;
+		        let data = {
+		          code: speCode,
+		          type: this.queryObj.type1,
+		          deptCode: this.DEPTCode,
+		          ids: [],
+							speVerifyType:null,
+							addConfig:null
+		        };
+						if(this.speDATA){
+							data.speVerifyType = this.speDATA.speVerifyType
+						}else{
+							delete data.speVerifyType
+						}
+						if(this.interceptData && this.interceptData.addConfig){
+							data.addConfig = 1
+						}else{
+							delete data.addConfig
+						}
+		        data.ids.push(this.dataId);
+		        let postType = "";
+		        if (this.type == "jPBag" || this.type == "drugsBag") {
+		          postType = "handleDrugsAndJp";
+		          if(this.type == "drugsBag"){
+		            delete data.ids;
+		          }
+		          data.deptId = this.deptId;
+		          data.handover = this.handover;
+		        }
+		        if (this.type == "specimen") {
+		          data["speCode"] = data.code;
+		          delete data.code;
+		          postType = "handleSpes";
+		        }
+		        if (this.type == "specimenPlan") {
+		          data["speCode"] = data.code;
+		          delete data.code;
+		          postType = "handlePlanSpes";
+		        }
+		        if (this.type == "inspect") {
+		          postType = "handleIns";
+		        }
+		        if (this.type == "patientTransport") {
+		          postType = "handleTrans";
+		        }
+		        post("/workerOrder/" + postType, data).then((ress) => {
+		          uni.hideLoading();
+							this.speDATA = null
+							this.interceptData = null
+		          if (ress.status == 200 || ress.status == 11111) {
+		            //标本和标本轮巡工单，扫描标本后会自动调用摄像头，继续扫描，直到status不是200
+		            if ((this.type == "specimenPlan" || this.type == "specimen") && ress.status != 11111) {
+									if(ress){
+										this.infoDATA = ress.data;
+										this.speNum = ress.specimenCount;
+										uni.redirectTo({
+											url: `../scanning_Result/scanning_Result?type=${
+											this.queryObj.type
+										}&type1=${
+											this.queryObj.type1
+										}&infoData=${encodeURIComponent(
+											JSON.stringify(ress.data)
+										)}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+											this.queryObj.deptCode
+										}&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=scan&isEndDeptRed=${this.isEndDeptRed}`,
+										});
+									}
+		            }
+		          } else if (ress.status==513){
+								this.speDATA = ress
+								this.setMsg()
+							} else if(ress.status==10004){
+		            uni.showToast({
+		              icon: "none",
+		              title: ress.msg,
+		            });
+		          }else{
+								uni.redirectTo({
+								  url: `../scanning_Result/scanning_Result?type=${
+								  this.queryObj.type
+								}&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
+								  ress.msg
+								}&deptCode=${this.queryObj.deptCode}&dept=${
+								  this.queryObj.dept
+								}&id=${this.dataId}&model=${encodeURIComponent(
+								  JSON.stringify(this.infoDATA)
+								)}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=scan&qrcode=${this.currentCode}`,
+								});
+							}
+		        });
+		      } else {
+		        uni.hideLoading();
+		      }
+		    } else {
+		      uni.hideLoading();
+		      uni.showToast({
+		        icon: "none",
+		        title: result.info || "接口获取数据失败！",
+		      });
+		    }
+		  });
+		},
+    cancel(){
+			uni.navigateBack();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.showModel {
+  // position: fixed;
+  // left: 0;
+  // right: 0;
+  // top: 0;
+  // bottom: 0;
+  // background-color: rgba(0, 0, 0, 0.2);
+  // z-index: 99;
+
+  .showModel__wrap {
+    // width: 90%;
+    // position: absolute;
+    // left: 50%;
+    // top: 50%;
+    // transform: translate(-50%, -50%);
+    background-color: #fff;
+    // border-radius: 12rpx;
+		height: 100vh;
+    .showModel__header {
+      font-size: 36rpx;
+      color: #000;
+			font-weight: bold;
+      height: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+		.content{
+			background: #fff;
+			border-top: 1px solid #E6E6E6;
+			.content-tip{
+				text-align: center;
+				padding: 50rpx 0 30rpx 0;
+				font-size: 28rpx;
+			}
+			.content-box{
+				padding: 24rpx;
+				height: 83vh;
+				
+				.icon{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					.red{
+						font-size: 80rpx;
+					}
+					.error-text{
+						margin-left: 30rpx;
+						font-size: 40rpx;
+					}
+				}
+				
+				.flex{
+					display: flex;
+					justify-content: space-between;
+				}
+				
+				.weight{
+					font-weight: bold;
+					text-align: center;
+					font-size: 38rpx;
+				}
+				
+				.list{
+					padding: 20rpx 0;
+				}
+				
+				.content-item{
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 10rpx;
+					border: 1px solid #CCCCCC;
+					color: #000;
+					font-size: 32rpx;
+					// margin: 0 20rpx;
+					text-align: center;
+				}
+			}
+		}
+		.foot_btn_spe {
+			padding: 24rpx;
+		  line-height: 88rpx;
+		  height: 100rpx;
+		  text-align: center;
+		  display: flex;
+		  justify-content: space-between;
+		  flex-wrap: wrap;
+			
+		  view {
+		    height: 88rpx;
+		    width: 48%;
+		    color: #fff;
+		    border-radius: 8rpx;
+		    font-size: 32rpx;
+		    margin-top: 16rpx;
+		  }
+			
+			.green{
+				background-image: linear-gradient(to right, #72c172, #3bb197);
+				color: #fff !important;
+			}
+			
+			.gray{
+				background: #afafaf;
+				color: #fff;
+			}
+		}
+  }
+	.green{
+		color: #49B856;
+	}
+	.mar-rig{
+		margin-right: 8rpx;
+	}
+}
+</style>

pages/specimenChecking/specimenChecking.vue

@@ -1,17 +1,30 @@
 <template>
   <view class="specimenChecking">
     <view class="title">请您确认一下科室标本数量！</view>
-    <view class="page_item_wrap" v-for="item in list" :key="item.deptId" @click="gotoDetail(item)">
+    <view class="page_item_wrap" v-for="item in list" :key="item.deptId">
       <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.speNum}}</view>
-            </view>
-          </view>
+					<uni-collapse :border="false">
+						<uni-collapse-item titleBorder="none">
+							<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="page_item_top_R">
+											<view class="L_iocn">{{item.speNum}}</view>
+										</view>
+									</view>
+								</view>
+							</template>
+							<view class="content">
+								<view class="list" v-for="x in item.tubeTypeDataList" @click="viewSpe(item, x.tubeTypeId)">
+									{{x.tubeTypeName}}：<text class="underline-item">{{x.speNum}}</text>
+								</view>
+							</view>
+						</uni-collapse-item>
+					</uni-collapse>
         </view>
         <!-- <view class="page_item_cont">
           <view class="page_item_cont_T">
@@ -70,6 +83,17 @@
       };
     },
     methods: {
+			viewSpe(item, tubeTypeId){
+				this.speNumChange = item.speNum;
+				this.changeSpeObj = {
+				  infoDATA: this.msg,
+				  id: item.deptId,
+				  endDepts:this.msg.targetDept,
+				}
+				uni.navigateTo({
+				  url: `../../pages/specimenCheckingDetail/specimenCheckingDetail?infoDATA=${encodeURIComponent(JSON.stringify(this.changeSpeObj.infoDATA))}&id=${this.changeSpeObj.id}&endDepts=${this.changeSpeObj.endDepts}&tubeTypeId=${tubeTypeId}`,
+				});
+			},
       //确认数量并建单-返回
       know() {
         this.models.disjunctor = false;
@@ -494,6 +518,14 @@
   };
 </script>
 <style lang="less" scoped>
+	/deep/ .uni-collapse-item--border{
+		border-bottom-color: #fff !important;
+	}
+	
+	/deep/ .uni-collapse-item__title-arrow{
+		margin-right: 0 !important;
+	}
+	
   .specimenChecking {
     padding-bottom: 100rpx;
 
@@ -572,64 +604,92 @@
         }
 
         .page_item_top {
-          height: 88rpx;
+          // 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;
-              }
-            }
-          }
+          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;
+						      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;
+						    }
+						  }
+						}
+					}
+					
+					.content{
+						display: flex;
+						flex-wrap: wrap;
+						.list{
+							font-size: 28rpx;
+							height: 60rpx;
+							line-height: 60rpx;
+							width: 50%;
+							border-bottom: 1rpx solid #E6E6E6;
+							&:last-child{
+								border-bottom: none;
+							}
+						}
+					}
         }
-
+				
+				.underline-item{
+					// text-decoration: underline;
+					// margin-right: 40rpx;
+				}
+				
         .page_item_cont {
           min-height: 90rpx;
           padding: 0 16rpx;

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -35,7 +35,7 @@
         <view class="page_item_cont">
           <view class="page_item_cont_T">
             <view class="page_item_cont_title">
-              <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} </view>
+              <view style="width: 10em;"> {{item.stype ? item.stype.name : '无'}} <text v-if="item.tubeType">、</text> {{item.tubeType && item.tubeType.name}}</view>
               <view class="text_big">{{ item.scode || "无" }}</view>
             </view>
             <view class="page_item_cont_title">
@@ -64,7 +64,7 @@
       <view class="R-l"></view>
     </view>
     <view class="foot_btn2">
-      <view class="btn2" @click="showChangeSpe()">修改数量</view>
+      <view class="btn2" @click="showChangeSpe()" v-if="!tubeTypeId">修改数量</view>
       <view class="btn2" @click="goto()">返回</view>
     </view>
     <!-- 修改标本数量弹窗 -->
@@ -122,6 +122,7 @@
         models: {
           disjunctor: false,
         },
+				tubeTypeId: null //试管类型
       };
     },
     methods: {
@@ -376,6 +377,7 @@
           checkDept: this.options.endDepts, //终点科室
           transDept: Number(this.msg.startDept), //起点科室id
           gdId: this.msg.uuid, //工单id或uuid
+					tubeTypeId: null //试管类型id
         };
         if (this.selectDeptId != "undefined") {
           if (Number(this.msg.startDept) != Number(this.selectDeptId)) {
@@ -385,6 +387,11 @@
             }
           }
         }
+				if(this.tubeTypeId){
+					postData.tubeTypeId = this.tubeTypeId
+				}else{
+					delete postData.tubeTypeId
+				}
         post(`/api/getTransDeptSpecimens`, postData).then((res) => {
           uni.hideLoading();
           uni.stopPullDownRefresh();
@@ -650,8 +657,15 @@
     onLoad(options) {
       console.log(options, "快捷建单");
       this.options = options;
-      this.msg = JSON.parse(options.infoDATA);
+			if(options.infoDATA){
+				this.msg = JSON.parse(options.infoDATA);
+			}
       this.selectDeptId = options.id;
+			if(options.tubeTypeId){
+				this.tubeTypeId = options.tubeTypeId
+			}else{
+				this.tubeTypeId = null
+			}
       // this.msg = JSON.parse(options.infoDATA);
       // this.targetDeptShow = this.msg.targetDeptShow.split(",");
       this.getList();

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -25,6 +25,14 @@
           <view class="name" v-if="type === 'specimenDesc'">
             项目名称<text class="red">({{typeList.specimenDesc.titleCount}})</text>
           </view>
+					<view class="name" v-if="type === 'speTubeType'">
+					  试管类型<text class="red">({{typeList.speTubeType.titleCount}})</text>
+					</view>
+					<view class="value" v-if="type === 'speTubeType'">
+					  <view>
+					    标本数量<text class="red">({{typeList.speTubeType.count}})</text>
+					  </view>
+					</view>
           <view class="value" v-if="type === 'patient'">
             <view>
               标本数量<text class="red">({{typeList.patient.count}})</text>
@@ -44,7 +52,17 @@
             <view class="name" v-if="type === 'specimenDesc'">
               {{item.specimen_desc}}
             </view>
-            <view class="value">
+						<view class="name" v-if="type === 'speTubeType'">
+						  {{item.tubeTypeName}}
+						</view>
+						
+						<view class="value" v-if="type === 'speTubeType'">
+						  <view>
+						    {{item.count}}
+						  </view>
+						</view>
+						
+            <view class="value" v-if="type != 'speTubeType'">
               <view>
                 {{item.count}}
               </view>
@@ -87,6 +105,12 @@
             count: 0,
             titleCount: 0,
           },
+					"speTubeType":{
+						id: -3,
+						name: '试管类型',
+						count: 0,
+						titleCount: 0,
+					},
           "specimenDesc": {
             id: -2,
             name: '检验项目',
@@ -246,7 +270,7 @@
       },
       clickTab(key){
         this.type = key;
-        this.initData();
+				this.getInfo(key);
       },
       onClick(){
         this.allStart();
@@ -272,6 +296,7 @@
             this.typeList[type].titleCount = result.title || 0;
             if(this.type === type){
               this.dataList = result.data || [];
+							console.log(7777,this.dataList)
             }
           } else {
             uni.showToast({
@@ -283,7 +308,8 @@
       },
       initData(){
         this.getInfo('patient');
-        this.getInfo('specimenDesc');
+				// this.getInfo('speTubeType');
+    //     this.getInfo('specimenDesc');
       },
     },
 		onShow(){
@@ -292,7 +318,7 @@
 			// #endif
 		},
     onLoad(options) {
-      console.log(options, "result");
+      console.log(JSON.parse(options.model), "result");
       this.queryObj = options;
       this.initData();
       // #ifdef APP-PLUS
@@ -306,7 +332,7 @@
 </script>
 <style lang="less" scoped>
   .Scanning_Result {
-    height: 100vh;
+    height: 98vh;
     display: flex;
     flex-direction: column;
     background-color: #fafbfd;
@@ -410,6 +436,11 @@
             border-bottom: none;
             flex-shrink: 0;
           }
+					
+					.underline{
+						text-decoration: underline;
+					}
+					
           .name,
           .value{
             padding: 0 40rpx;
@@ -430,11 +461,12 @@
       line-height: 66rpx;
       display: flex;
       justify-content: center;
-
+			padding: 0 20rpx;
+			
       .btn {
         height: 66rpx;
         flex: 1;
-        margin-right: 1%;
+        margin-right: 4%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;

pages/specimenOrderComplete/specimenOrderComplete.vue

@@ -12,13 +12,15 @@
     <view class="Scanning_cont">
       <view>您已到达{{queryObj.deptName}}，请核对以下数量</view>
       <view class="table_head">
-        <view>科室</view>
-        <view>是否配送完成</view>
+        <view>科室名称</view>
+				<view>标本数量</view>
+        <view>是否签到</view>
       </view>
       <view class="table_bodys">
         <view class="table_body" v-for="(item, index) in dataList" :key="index">
           <view>{{item.dept}}</view>
-          <view :class="{red: item.all != item.complete}">{{item.all == item.complete ? '是' : '否'}}</view>
+					<view>{{item.complete}}/{{item.all}}</view>
+          <view :class="item.all != item.complete ? 'red' : 'green'">{{item.all == item.complete ? '是' : '否'}}</view>
         </view>
       </view>
     </view>
@@ -101,6 +103,9 @@
   };
 </script>
 <style lang="less" scoped>
+	.green{
+		color: #35b34a !important;
+	}
   .Scanning_Result {
     padding: 0 20rpx;
     display: flex;
@@ -175,17 +180,15 @@
       }
 
       .table_body{
-        background: #F3FAF7;
-        border-radius: 8px;
-        border: 1px solid #E9E9E9;
+        // background: #F3FAF7;
+        border-bottom: 1px solid #E9E9E9;
         display: flex;
-        margin-bottom: 20rpx;
         padding: 30rpx 20rpx;
         view {
           line-height: 1;
           flex: 1;
           color: #555;
-          font-size: 38rpx;
+          font-size: 28rpx;
           display: flex;
           justify-content: center;
           align-items: center;

pages/viewSpe/viewSpe.vue

@@ -0,0 +1,329 @@
+<template>
+  <view class="pharmacyDetails">
+    <view class="pharmacyDetails_title">检验科室标本信息</view>
+    <view class="page_item footerOtherMargin">
+      <view class="page_item_wrap" v-for="(spe, i) in specimens" :key="spe.id">
+        <specimenListItem :i="i" :item="spe"></specimenListItem>
+        <view class="L-l"></view>
+        <view class="R-l"></view>
+      </view>
+    </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: {}, //路由传递过来的数据
+        isScan: false,//true是已扫描标本，false是未扫描标本
+        workOrderId: -1,
+        deptCode: '',
+        specimens: [],
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 获取已扫描或未扫描标本信息
+      getNoScanSpecimen(isScan) {
+        let postData = {
+          gdIds: this.workOrderId,
+          currentPage: 0,
+          pageSize: 999,
+					tubeTypeId:this.tubeTypeId
+        };
+        
+        if(this.queryObj.specimensCheck){
+          //标本核对页面过来的
+          if(this.queryObj.deptName){
+            // 标本核对,已扫描总数
+            postData.deptQrCode = this.deptCode||undefined;
+            postData.specimensCheck = 1;
+          }
+        }else{
+          postData.deptQrCode = this.deptCode||undefined;
+        }
+        // 是否是已扫描
+        if(isScan && !this.queryObj.noScan){
+          // 显示已扫描，但添加scanned参数
+          postData.scanned = 1;
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/api/noScanSpecimenData", postData).then((res) => {
+          uni.hideLoading();
+          if (res.data) {
+            this.specimens = res.data;
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
+      this.workOrderId = JSON.parse(options.workOrderId);
+      this.deptCode = options.deptCode;
+			this.tubeTypeId = options.tubeTypeId;
+      this.isScan = Boolean(options.isScan);
+      this.getNoScanSpecimen(this.isScan);
+      // #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;
+
+    .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>