动态密钥开发

components/appUpdata/appUpdata.vue

@@ -0,0 +1,219 @@
+<template>
+	<!-- 版本更新提示升级 -->
+	<view class="upbox" v-if="isUpdate">
+		<view class="content">
+	<!-- 		<view class="upimg">
+				<image class="img" src="/static/img/updata.png"></image>
+			</view> -->
+			<view class="versioninfo">
+				<view class="title">发现新版本</view>
+				<view class="schedule" v-if="isSchedule">	
+					<progress :percent="upProgress" show-info stroke-width="15" />
+				</view>
+				<view class="btn">
+					<button type="primary" size="mini" :disabled="isSchedule" @click="nowUpdate()">立即升级</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	  get,
+	  post
+	} from "../../http/http.js";
+	export default {
+		name:"appUpdata",
+		data() {
+			return {
+				isUpdate:false,
+				// 服务器图片地址
+				// baseUrl: configSetting.baseUrl,
+				isSchedule: false,
+				upProgress: 0,
+				Version: true,
+				// manifest 中应用版本名称
+				appVersion: '',
+				// manifest 中应用版本号
+				appVersionCode: '',
+				apkInfo: {},
+				apkUrl:'http://192.168.3.108/getapk/pdaz-v1.0.0.apk',
+				updateContent: []
+			};
+		},
+		created() {
+			this.getProperty()
+		},
+		methods: {
+			getProperty(){
+				// 获取本地应用资源版本号
+				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+					this.appVersion = wgtinfo.version;
+					this.appVersionCode = wgtinfo.versionCode;
+					// this.getVersionNumber();
+				})
+			},
+			// 获取后台版本号 检查是否有新版本
+			getVersionNumber() {
+				let version = this.appVersionCode;
+				// this.isUpdate = true;
+				post("/configuration/updData/workConfigHistory").then((res) => {
+				    if (res.status == 200) {
+				      if(res.appVersionCode > version) {
+				      	this.apkInfo = res;
+				      	this.isUpdate = true;
+				      } else {
+				      	this.isUpdate = false;
+				      }
+				    } else {
+						uni.showToast({
+							icon: "none",
+							title: res.msg || "接口获取数据失败！",
+						});
+					}
+				})	
+			},
+			// 暂不升级
+			notUpdate() {
+				this.isUpdate = false;
+			},
+			// 点击立即升级查看手机是安卓还是ios
+			nowUpdate() {
+				this.androidUpdate();
+			},
+			// 安卓更新
+			androidUpdate() {
+				// 浏览器安装
+				// plus.runtime.openURL(this.apkUrl, function(res) {
+				// 	console.log(res);  
+				// }); 
+				const downloadTask = uni.downloadFile({
+					url: this.apkUrl, //apk下载链接
+					success: (res) => {
+						if (res.statusCode !== 200) {
+							uni.showToast({
+								title: '下载安装包失败',
+								icon: 'error',
+								duration: 2000
+							});
+							this.isSchedule = false;
+							this.isUpdate = false;
+							return;
+						}
+						// 异步请求
+						if (res.statusCode === 200) {
+							console.log('更新成功');
+						// 更新好直接安装，下次启动生效
+						plus.runtime.install(res.tempFilePath, {
+							force: true
+						}, () => {
+							// uni.showModal({
+							// 	title: '安装成功是否重启？',
+							// 	success: res => {
+							// 		if (res.confirm) {
+							// 			//更新完重启app
+							// 			plus.runtime.restart();
+							// 		}
+							// 	}
+							// });				
+						}, err => {
+							uni.showToast({
+								title: '更新失败',
+								icon: 'error',
+								duration: 2000
+							});
+						})
+					 }	
+					},
+					fail: (err) => {
+						console.log('err',err);
+					},
+					//接口调用结束 调用成功、失败都会执行
+					complete: ()=>{
+						downloadTask.offProgressUpdate();//取消监听加载进度
+					}
+				});
+				//监听下载进度
+				downloadTask.onProgressUpdate(res => {
+					this.isSchedule = true;
+					this.upProgress = res.progress;
+					if(res.progress >= 100) {
+						this.isSchedule = false;
+						this.isUpdate = false;
+						this.$emit('getUpdate');
+					}
+				});
+			}
+		},
+		
+	}
+</script>
+
+<style scoped lang="scss">
+.upbox {
+	position: fixed;
+	z-index: 999;
+	top: 0;
+	right: 0;
+	width: 100%;
+	height: 100vh;
+	background-color: rgba(153, 153, 153, 0.75);
+	display: flex;
+	align-items: center;
+}	
+.content {
+	margin: 0 5%;
+	width: 90%;
+	text-align: center;
+	.upimg {
+		height: 420rpx;
+		width: 100%;
+		.img {
+			height: 100%;
+			width: 100%;
+		}
+	}
+	.versioninfo {
+		padding: 15rpx 30rpx;
+		border-radius: 25rpx;
+		background-color: #fff;
+	}
+	.title {
+		// position: absolute;
+		// top: 150rpx;
+		font-size: 40rpx;
+		// color: #fff;
+	}
+	.info {
+		position: relative;
+		padding-left: 38rpx;
+		view {
+			height: 50rpx;
+			line-height: 50rpx;
+		}
+	}
+	.schedule {
+		margin: 15rpx;
+		/deep/.uni-progress-bar {  
+		    border-radius: 30rpx;  
+		}  
+		/deep/.uni-progress-inner-bar {  
+		    border-radius: 30rpx;  
+		}
+	}
+	.btn {
+		height: 110rpx;
+		margin-top: 30rpx;
+		display: flex;
+		justify-content: space-evenly;
+		button {
+			width: 46%;
+			height: 75rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+}
+</style>

components/bigScreen/bigScreen.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="toolbar" @click="Scanning()" hover-class="seimin-btn-hover">
+  <view class="toolbar" :class="!isNumberKey?'fixed-class':''" @click="Scanning()" hover-class="seimin-btn-hover">
     <text class="toolbar-icon newicon newicon-saoma"></text>
     <text class="toolbar-sao">扫一扫</text>
     <!-- 填写交接人工号弹窗 -->
@@ -34,6 +34,9 @@
         SMFlag: true,
       }
     },
+		props:{
+			isNumberKey:Boolean
+		},
     methods: {
       // 填写交接人工号-确认
       hosOk(data) {
@@ -465,8 +468,11 @@
 
 <style lang="less">
   // 底部扫一扫
+	.fixed-class{
+		position: fixed;
+	}
   .toolbar {
-    position: fixed;
+    // position: fixed;
     left: 0;
     right: 0;
     bottom: 30rpx;
@@ -477,8 +483,8 @@
     align-items: center;
     box-sizing: border-box;
     border-radius: 4rpx;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.24);
-    background-color: #e5e9ed;
+    // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.24);
+    // background-color: #e5e9ed;
 
     .toolbar-icon {
       font-size: 52rpx;

components/numberKeyModel/numberKeyModel.vue

@@ -0,0 +1,161 @@
+<template>
+  <view class="showModel">
+		<view class="showModel__wrap">
+			<view class="showModel__header">
+			  数字密钥
+			</view>
+			<view class="content">
+				<view class="content-tip">请输入数字密钥。</view>
+				<view class="content-box">
+					<input class="content-item" v-for="(i, index) in keyArr" :key="index" v-model="i.value"/>
+				</view>
+			</view>
+			<view class="bottom">
+				<button class="bottom-btn confirm-btn" @click="confirm">确定</button>
+				<button class="bottom-btn" @click="cancel">取消</button>
+			</view>
+		</view>
+  </view>
+</template>
+
+<script>
+import {
+    get,
+    post,
+    SM
+  } from "../../http/http.js";
+export default {
+  data() {
+    return {
+      
+    };
+  },
+  watch: {
+
+  },
+  props: {
+		keyArr:{
+			type:Array,
+			default:[]
+		}
+  },
+	created(){
+		for(let i of this.keyArr){
+			i.value = null
+		}
+	},
+  methods: {
+    confirm(){
+			for(let i of this.keyArr){
+				if(!i.value){
+					uni.showToast({
+						title: `数字密钥为${this.keyArr.length}位数`,
+						duration: 1000,
+						icon:'none'
+					});
+					return
+				}
+			}
+			let arr = []
+			for(let i of this.keyArr){
+				arr.push(i.value)
+			}
+			post(`/dept/check/${arr.join('')}`).then((res) => {
+				if (res.status == 200) {
+					this.$emit('confirm',res.data)
+				}else{
+					uni.showToast({
+						title: res.msg,
+						duration: 1000,
+						icon:'none'
+					});
+				}
+			});
+    },
+    cancel(){
+      this.$emit('cancel')
+    },
+  },
+};
+</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;
+
+    .showModel__header {
+      font-size: 36rpx;
+      color: #000;
+			font-weight: bold;
+      height: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+		.content{
+			background: #FAFBFD;
+			border: 1px solid #E6E6E6;
+			margin-bottom: 20rpx;
+			.content-tip{
+				text-align: center;
+				padding: 50rpx 0 30rpx 0;
+				font-size: 28rpx;
+			}
+			.content-box{
+				display: flex;
+				justify-content: space-around;
+				margin-bottom: 20rpx;
+				.content-item{
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 10rpx;
+					border: 1px solid #CCCCCC;
+					color: #000;
+					font-size: 32rpx;
+					// margin: 0 20rpx;
+					text-align: center;
+				}
+			}
+		}
+		.bottom{
+			border-top: 1px solid #ccc;
+			display: flex;
+			uni-button{
+				border-radius: 0 !important;
+				background: #fff !important;
+			}
+			uni-button:after{
+				border: none !important;
+			}
+			.bottom-btn{
+				color: #A8A8A8;
+				font-size: 30rpx;
+				padding: 20rpx 0;
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			.confirm-btn{
+				color: #5DAC6B;
+				border-right: 1px solid #ccc;
+			}
+		}
+  }
+}
+</style>

pages/checkAfterScanning/checkAfterScanning.vue

@@ -24,17 +24,24 @@
         </view>
       </view>
     </view>
-    <view class="foot_btn_spe">
-      <view class="btn1" @click="Scanning_complete()">核对完成</view>
-      <view class="btn3" @click="goBack">返回</view>
-    </view>
+		<view class="foot_btn_spe" v-if="enterDynamicDigitalKey==0">
+		  <view class="btn1" @click="Scanning_complete('scan')">核对完成</view>
+		  <view class="btn3" @click="goBack">取消</view>
+		</view>
+		<view class="foot_btn_spe" v-if="enterDynamicDigitalKey==1">
+			<view class="btn1" @click="Scanning_complete('scan')">扫一扫核对</view>
+		  <view class="btn1" @click="isShowKey()">数字核对</view>
+		  <view class="btn3" @click="goBack">返回</view>
+		</view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
     <!-- 弹窗 -->
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
       @ok="ok2" @know="know2" @cancel="cancel2" :operate="models2.operate"></showModel>
-  </view>
+		<!-- 动态密钥 -->
+		<numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
+	</view>
 </template>
 <script>
   import {
@@ -43,6 +50,7 @@
     SM,
     webHandle
   } from "../../http/http.js";
+	import numberKeyModel from "../../components/numberKeyModel/numberKeyModel.vue";
   export default {
     data() {
       return {
@@ -59,9 +67,120 @@
         models2: {
           disjunctor: false,
         },
+				showKey:false,
+				keyNum:4, //密钥位数
+				isNumberKey:false, //是否开启动态密钥
+				keyArr: [],
+				enterDynamicDigitalKey:null,
+				keyType:null,
+				contentData:null,
       };
     },
+		components: {
+			numberKeyModel
+		},
     methods: {
+			confirmKey(data){
+				this.Scanning_complete('key')
+				this.contentData = data
+				this.showKey = false
+			},
+			isShowKey(){
+				this.showKey = true
+			},
+			// 获取配置
+			getConfig() {
+				// 判断开关
+				const userData = uni.getStorageSync("userData");	
+				let postData = {
+					idx: 0,
+					sum: 9999,
+					hospitalConfig:{
+						hosId:userData.user.currentHospital.id,
+						model:"all"
+					}
+				};
+			
+				post("/simple/data/fetchDataList/hospitalConfig",postData).then((result) => {
+						if (result.status == 200) {
+							this.keyArr = []
+							for(let i of result.list){
+								if(i.key=='digitalSecretKey'){
+									if(i.value==1){
+										this.isNumberKey = true
+									}else{
+										this.isNumberKey = false
+									}
+								}else if(i.key=='numberDigitalSecretKey'){
+									this.keyNum = Number(i.value) 
+								}
+							}
+							for(let i = 0; i < this.keyNum; i++){
+								this.keyArr.push({
+									value:null
+								})
+							}
+						}
+					});
+				
+			  uni.showLoading({
+			    title: "加载中",
+			    mask: true,
+			  });
+			  // 查询标本配送业务
+			  post("/simple/data/fetchDataList/taskType",{
+			      "idx": 0,
+			      "sum": 10,
+			      "taskType": {
+			          "simpleQuery": true,
+			          "hosId": {
+			              "id": userData.user.currentHospital.id
+			          },
+			          "associationType": {
+			              "key": "association_types",
+			              "value": "specimen"
+			          }
+			      }
+			  }).then((res) => {
+			    if (res.status == 200) {
+			      let taskTypeDTO = res.list[0];
+			  		if(taskTypeDTO){
+			        // 查询业务页面控制-标本
+			        post("/simple/data/fetchDataList/taskTypeConfig",{
+			            "idx": 0,
+			            "sum": 10,
+			            "taskTypeConfig": {
+			              taskTypeDTO,
+			            }
+			        }).then((res) => {
+			          if (res.status == 200) {
+			            let data = res.list[0];
+									uni.hideLoading();
+			        		if(data){
+										// 输入动态数字密钥
+			              this.enterDynamicDigitalKey = data.enterDynamicDigitalKey
+										console.log(55555,this.enterDynamicDigitalKey)
+			            }
+			          } else {
+			            uni.hideLoading();
+			            uni.showToast({
+			              icon: "none",
+			              title: res.msg || "接口获取数据失败！",
+			            });
+			          }
+			        });
+			      }else{
+			        uni.hideLoading();
+			      }
+			    } else {
+			      uni.hideLoading();
+			      uni.showToast({
+			        icon: "none",
+			        title: res.msg || "接口获取数据失败！",
+			      });
+			    }
+			  });
+			},
       // 获取核对信息
       getInfo(gdId){
         uni.showLoading({
@@ -130,34 +249,61 @@
                     if(data.arriveScanCode == 1){
                       // 扫描科室二维码
                       uni.hideLoading();
-                      SM().then((content) => {
-                        let postData = {
-                          code: content,
-                          type: 'specimen',
-                          hosId: userData.user.currentHospital.id,
-                          orderId: +this.queryObj.id,
-                        };
-                        console.log(postData)
-                        uni.showLoading({
-                          title: "加载中",
-                          mask: true,
-                        });
-                        post("/workerOrder/arriveScanCheck", postData).then((res) => {
-                          uni.hideLoading();
-                          if (res.state == 200) {
-                            this.handoverId = res.handover;//扫动态码或静态码，后端会返回交接人，核对完成接口传过去
-                            this.handoverDeptId = res.handoverDeptId;//扫动态码或静态码，后端会返回科室，核对完成接口传过去
-                            fn();
-                          } else {
-                            uni.showToast({
-                              icon: "none",
-                              title: res.msg || "接口获取数据失败！",
-                            });
-                          }
-                        })
-                      }).catch(err => {
-                        
-                      });
+											if(this.keyType=='key'){
+												let postData = {
+													code: this.contentData,
+													type: 'specimen',
+													hosId: userData.user.currentHospital.id,
+													orderId: +this.queryObj.id,
+												};
+												console.log(postData)
+												uni.showLoading({
+													title: "加载中",
+													mask: true,
+												});
+												post("/workerOrder/arriveScanCheck", postData).then((res) => {
+													uni.hideLoading();
+													if (res.state == 200) {
+														this.handoverId = res.handover;//扫动态码或静态码，后端会返回交接人，核对完成接口传过去
+														this.handoverDeptId = res.handoverDeptId;//扫动态码或静态码，后端会返回科室，核对完成接口传过去
+														fn();
+													} else {
+														uni.showToast({
+															icon: "none",
+															title: res.msg || "接口获取数据失败！",
+														});
+													}
+												})
+											}else{
+												SM().then((content) => {
+												  let postData = {
+												    code: content,
+												    type: 'specimen',
+												    hosId: userData.user.currentHospital.id,
+												    orderId: +this.queryObj.id,
+												  };
+												  console.log(postData)
+												  uni.showLoading({
+												    title: "加载中",
+												    mask: true,
+												  });
+												  post("/workerOrder/arriveScanCheck", postData).then((res) => {
+												    uni.hideLoading();
+												    if (res.state == 200) {
+												      this.handoverId = res.handover;//扫动态码或静态码，后端会返回交接人，核对完成接口传过去
+												      this.handoverDeptId = res.handoverDeptId;//扫动态码或静态码，后端会返回科室，核对完成接口传过去
+												      fn();
+												    } else {
+												      uni.showToast({
+												        icon: "none",
+												        title: res.msg || "接口获取数据失败！",
+												      });
+												    }
+												  })
+												}).catch(err => {
+												  
+												});
+											}
                     }else{
                       uni.hideLoading();
                       fn();
@@ -194,7 +340,8 @@
         
       },
       // 完成核对
-      Scanning_complete() {
+      Scanning_complete(type) {
+				this.keyType = type
         this.beforeScanning(() => {
           if (
             this.queryObj.type1 == "plan-spe-ddd-2" ||
@@ -400,6 +547,7 @@
       console.log(options);
       this.queryObj = options;
       this.getInfo(this.queryObj.id);
+			this.getConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/homePage/homePage.vue

@@ -78,7 +78,9 @@
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
       @ok="ok2" @cancel="cancel2" :operate="models2.operate">
     </showModel>
-  </view>
+		<!-- apk自动更新 -->
+		<appUpdata v-if="isApp && isUpdate" @getUpdate="isUpdate=false"></appUpdata>
+	</view>
 </template>
 
 <script>
@@ -89,6 +91,7 @@
     webHandle
   } from "../../http/http.js";
   import showModel from "../../components/showModel/showModel.vue";
+	import appUpdata from "../../components/appUpdata/appUpdata.vue";
   import {
     AES,
     mode,
@@ -151,9 +154,13 @@
         models2: {
           disjunctor: false,
         },
-        objHistory: {}
+        objHistory: {},
+				isUpdate:true
       };
     },
+		components: {
+			appUpdata
+		},
     methods: {
       //aes加密
       encryptByEnAES(data) {
@@ -1113,6 +1120,11 @@
       if (uni.getStorageSync("userData")) {
         this.online = uni.getStorageSync("userData").user.online;
       }
+			// #ifdef APP-PLUS
+			this.isApp = true;
+			this.isUpdate = true;
+			uni.closeSocket();
+			// #endif
       if (!this.workSchemeType) {
         return;
       }
@@ -1124,9 +1136,6 @@
       let userId = uni.getStorageSync("userData").user.id;
       this.getWorkScheme(true, uni.getStorageSync("userData").user.currentHospital.id);
       this.getHistorys(userId); //获取上班历史记录
-      // #ifdef APP-PLUS
-      uni.closeSocket();
-      // #endif
       // #ifdef H5
       document.body.addEventListener("touchmove", this.stop, {
         passive: false,
@@ -1164,6 +1173,7 @@
       //#endif
       // #ifdef APP-PLUS
       this.isApp = true;
+			this.isUpdate = true;
       // 通知权限 start
       // var main = plus.android.runtimeMainActivity();
       // var pkName = main.getPackageName();
@@ -1200,7 +1210,6 @@
 <style lang="less" scoped>
   .HomeItem {
     height: 100vh;
-
     .login {
       height: 420rpx;
       padding: 0 32rpx;

pages/receipt_infopage/receipt_infopage.vue

@@ -446,9 +446,12 @@
     <checkboxModal v-if="checkboxModels.disjunctor" :content="checkboxModels.content" :disjunctor="checkboxModels.disjunctor"
       @ok="checkboxOk" @cancel="checkboxCancel">
     </checkboxModal>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
   </view>
 </template>
 <script>
+	import scanner from "../../components/scanner/scanner.vue";
   import selectAccount from "../../components/selectAccount/selectAccount.vue";
   import smallScreen from "../../components/smallScreen/smallScreen.vue";
   import {
@@ -464,6 +467,7 @@
   export default {
     components: {
       selectAccount,
+			scanner
     },
     data() {
       return {
@@ -1581,7 +1585,217 @@
           }
         });
       },
+			// 获取是否需要选择陪检方式
+			getInspectAndPatientTransform(content){
+				let sData = this.infoDATA
+				let sType = null
+				if(((!sData.worker)||(sData.worker&&sData.worker.id == this.currentUserId))&&sData.gdState.value != 6&&sData.gdState.value != 7&&sData.gdState.value != 11){
+					if(sData.gdState.value != 2 &&
+				  sData.taskType.associationType.value != 'jPBag' &&
+				  sData.taskType.associationType.value != 'drugsBag' &&
+				  sData.taskType.associationType.value != 'specimen' &&
+				  sData.taskType.associationType.value != 'specimenPlan' &&
+				  sData.taskType.associationType.value != 'ordinary' &&
+				  !(sData.taskType.associationType.value == 'other' && (sData.gdState.value == 4 && sData.taskType.carryingCourses[0].actionsSwitch || sData.gdState.value == 5 && sData.taskType.carryingCourses[1].actionsSwitch))){
+						sType = 1
+					}
+				}
+				if(sData.gdState.value != 2 &&
+				  sData.taskType.associationType.value != 'patientTransport' &&
+				  sData.taskType.associationType.value != 'inspect' &&
+				  sData.taskType.associationType.value != 'other' &&
+				  sData.taskType.associationType.value != 'ordinary'){
+						sType = 2
+					}
+			  // 患者陪检，患者其他服务，工单状态是待到达
+			  if((sData.taskType.associationType.value === 'inspect' || sData.taskType.associationType.value === 'patientTransport') && sData.gdState.value == 4){
+			    const postData = {
+			      "idx":0,
+			      "sum":1,
+			      "taskTypeConfig":{
+			        "taskTypeDTO":{
+			          "hosId": {"id": this.hosId},
+			          "associationType": {
+			            "key": "association_types",
+			            "value":"inspect",
+			          },
+			        },
+			      },
+			    };
+			    uni.showLoading({
+			      mask: true,
+			      title: '加载中'
+			    })
+			    post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+			      console.log(res)
+			      if (res.status == 200) {
+			        res.list = res.list || [];
+			        if(res.list[0] && res.list[0].signTypeIds){
+			          // 如果开启
+			          const postData = {
+			            "idx":0,
+			            "sum":9999,
+			            "workOrderInspectScore":{
+			              "hosId": this.hosId,
+			            },
+			          };
+			          post("/simple/data/fetchDataList/workOrderInspectScore", postData).then((res) => {
+			            console.log(res)
+			            uni.hideLoading();
+			            if (res.status == 200) {
+			              res.list = res.list || [];
+			              let radioInspectionDistanceItem = res.list.map(v => ({id: v.id + "__" + v.inspectMode, inspectMode: v.inspectMode}));
+			              console.log(radioInspectionDistanceItem)
+			              this.models4 = {
+			                disjunctor: true,
+			                title: "请选择陪检方式",
+			                radioInspectionDistanceItem,
+			                icon: "",
+			                operate: {
+			                  ok: "确定",
+			                  cancel: "取消",
+			                },
+			              };
+			            } else {
+			              uni.showToast({
+			                icon: "none",
+			                title: res.msg || "接口获取数据失败！",
+			              });
+			            }
+			          })
+			        }else{
+			          uni.hideLoading();
+			          this.Scan_ss(content,sData,sType);
+			        }
+			      } else {
+			        uni.hideLoading();
+			        uni.showToast({
+			          icon: "none",
+			          title: res.msg || "接口获取数据失败！",
+			        });
+			      }
+			    })
+			  }else{
+			    this.Scan_ss(content,sData,sType);
+			  }
+			},
+			Scan_ss(content, data, type) {
+			  if (!this.SMFlag) {
+			    return;
+			  }
+			  this.SMFlag = false;
+			  this.currentData = data;
+				if(content){
+					content = content.replace('\n','')
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					});
+					//检验二维码的有效性
+					post("/dept/scanning", {
+						content: content,
+						taskTypeId: data.taskType.id,
+						gdState: data.gdState.id,
+					}).then((result) => {
+						this.SMFlag = true;
+						this.currentCode = result.code;
+						if (result.state == 200 || result.state == 201) {
+							if (result.account) {
+								if (type == 1) {
+									this.isOpenTransportationProcessRemarks(this.currentData, {
+										account: result.account,
+										accountName: result.name,
+										accountId: result.id,
+									}, 'nextDeptOrder_ss');
+								} else if (type == 2) {
+									this.nextDeptOrder_s(this.currentData, {
+										account: result.account,
+										accountName: result.name,
+										accountId: result.id,
+									});
+								}
+							} else {
+								if (type == 1) {
+									this.isOpenTransportationProcessRemarks(this.currentData, undefined, 'nextDeptOrder_ss');
+								} else if (type == 2) {
+									this.nextDeptOrder_s(this.currentData);
+								}
+							}
+						} else if (result.state == '0000') {
+							uni.hideLoading();
+							// this.showSelectAccount(); //yeye
+						} else {
+							uni.hideLoading();
+							uni.showToast({
+								icon: "none",
+								title: result.info || "接口获取数据失败！",
+							});
+						}
+					});
+				}
+			},
+			// 其他临床服务-运输过程-终点科室是否开通备注填写
+			isOpenTransportationProcessRemarks(data, accountObj, funName){
+			  const tasktype = data.taskType;
+			  console.log(tasktype, data);
+			  if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[1].logSwitch && data.gdState.value == 5){
+			    uni.navigateTo({
+			      url: `../../pages/transportationProcessRemarks/transportationProcessRemarks?data=${data ? encodeURIComponent(JSON.stringify(data)) : ''}&accountObj=${accountObj ? encodeURIComponent(JSON.stringify(accountObj)) : ''}&currentCode=${this.currentCode}&funName=${funName}&actions=${this.actions ? encodeURIComponent(JSON.stringify(this.actions)) : ''}&imageValue=${this.imageValue ? encodeURIComponent(JSON.stringify(this.imageValue)) : ''}`
+			    })
+			  }else{
+			    this[funName](data, accountObj);
+			  }
+			},
+			// 如果不是患者陪检或患者转运或其他
+			// 科室签到
+			nextDeptOrder_s(data, accountObj) {
+			  console.log(this.currentCode);
+			  let ids = [];
+			  let id = data.id;
+			  ids.push(id);
+			  let code = "";
+			  let postData = {
+			    ids
+			  };
+			  if (accountObj) {
+			    postData.handover = [accountObj.accountId];
+			  }
+			  if (this.currentCode) {
+			    code = this.currentCode;
+			    // 科室签到
+			    post("/workerOrder/orderSign/" + code, postData).then((res) => {
+			      uni.hideLoading();
+			      if (res.status == 200) {
+			        // 跳转到扫描科室
+			        // type1: res.type, //type类型
+			        // id: data.id, //工单ID
+			        // deptCode: code, //二维码
+			        // dept: res.dept //科室名称
+			        console.log(data,'工单')
+			        let endDepts = data.endDepts.map(v=>v.id).toString();
+			        console.log(endDepts,'smallScreen');
+			        uni.navigateTo({
+			          url: `../../pages/scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}&endDepts=${endDepts}`,
+			        });
+			      } else {
+			        uni.navigateTo({
+			          url: `../../pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1&qrcode=${this.currentCode}`,
+			        });
+			      }
+			    });
+			  }
+			},
     },
+		onShow(){
+		  this.SMFlag = true;
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.getInspectAndPatientTransform(data)
+			})
+			// #endif
+		},
     onLoad(options) {
       console.log(options, 'options');
       options.associationTypeValue === 'drugsBag' && this.isShowDrugsBatchInfo();

pages/receiptpage/receiptpage.vue

@@ -316,15 +316,22 @@
         </view>
       </scroll-view>
     </view>
-    <!-- 底部扫一扫 -->
-    <view class="bigScreenWrap">
-      <bigScreen ref="bigscreen"></bigScreen>
-      <view class="more" v-if="arrayBigScreen.length"></view>
-      <picker class="more_picker" @cancel="cancelPicker" @click.stop @change="execFilterBigScreen($event)" :value="indexBigScreen"
-        :range="arrayBigScreen" range-key="name" v-if="arrayBigScreen.length">
-        <view class="uni-input">{{ arrayBigScreen[indexBigScreen].name }}</view>
-      </picker>
-    </view>
+		<view class="bigScreenWrap">
+			<view class="left" @click="isShowKey" v-if="isNumberKey">
+				<text class="left-icon newicon newicon-miyue"></text>
+				<view class="left-title">数字密钥</view>
+			</view>
+			<!-- 底部扫一扫 -->
+			<view class="right" :class="!isNumberKey?'right-100':''">
+			  <bigScreen ref="bigscreen" :isNumberKey="isNumberKey"></bigScreen>
+			  <view class="more" v-if="arrayBigScreen.length"></view>
+			  <picker class="more_picker" @cancel="cancelPicker" @click.stop @change="execFilterBigScreen($event)" :value="indexBigScreen"
+			    :range="arrayBigScreen" range-key="name" v-if="arrayBigScreen.length">
+			    <view class="uni-input">{{ arrayBigScreen[indexBigScreen].name }}</view>
+			  </picker>
+			</view>
+		</view>
+
 		<!-- 悬浮按钮 -->
     <uni-fab :pattern="pattern" :content="content" :direction="direction" @fabClick="fabClick" @trigger="trigger"></uni-fab>
 		<!-- 弹窗 -->
@@ -413,6 +420,8 @@
     <!-- 示闲弹窗 -->
     <showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
 		<scanner></scanner>
+		<!-- 动态密钥 -->
+		<numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
 	</view>
 </template>
 <script>
@@ -421,11 +430,13 @@
 	import scanner from "../../components/scanner/scanner.vue";
   import showModel from "../../components/showModel/showModel.vue";
   import bigScreen from "../../components/bigScreen/bigScreen.vue";
+	import numberKeyModel from "../../components/numberKeyModel/numberKeyModel.vue";
   // https://ext.dcloud.net.cn/plugin?id=144
   import uniFab from "@/components/uni-fab/uni-fab.vue";
 	import uniDrawer from "@/components/uni-drawer/uni-drawer.vue";
 	import ldSelect from "@/components/ld-select/ld-select.vue";
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
+	
   import {
     get,
     post,
@@ -577,6 +588,17 @@
         scroll_top: 0, //距离顶部的距离
         scroll_refresher_enabled: true, //是否开启自定义下拉刷新
         quiltCode: '',
+				tabType: "", //当前选中项
+				selectArr: [], //选中项
+				workData: [],
+				userId: {
+				  ids: [],
+				},
+				code: "",
+				showKey:false,
+				keyNum:4, //密钥位数
+				isNumberKey:false, //是否开启动态密钥
+				keyArr: []
       };
     },
 		components: {
@@ -616,15 +638,184 @@
       uniFab,
       showModel,
       bigScreen,
+			numberKeyModel,
 			scanner,
       selectAccount,
     },
     methods: {
+			confirmKey(data){
+				this.padChange(data)
+				this.showKey = false
+			},
+			isShowKey(){
+				this.showKey = true
+			},
+			// 获取配置
+			getConfig() {
+			  let postData = {
+			    idx: 0,
+			    sum: 9999,
+					hospitalConfig:{
+						hosId:this.hosId,
+						model:"all"
+					}
+			  };
+
+			  post("/simple/data/fetchDataList/hospitalConfig",postData).then((result) => {
+			      if (result.status == 200) {
+							this.keyArr = []
+							for(let i of result.list){
+								if(i.key=='digitalSecretKey'){
+									if(i.value==1){
+										this.isNumberKey = true
+									}else{
+										this.isNumberKey = false
+									}
+								}else if(i.key=='numberDigitalSecretKey'){
+									this.keyNum = Number(i.value) 
+								}
+							}
+							for(let i = 0; i < this.keyNum; i++){
+								this.keyArr.push({
+									value:null
+								})
+							}
+							console.log(444,this.keyArr)
+			      }
+			    });
+			},
+			// 标本配送-待送达-运输过程-标本数字交接,则,科室签到不需要填写交接人
+			validateHandoverSpecimen(){
+			  return post("/simple/data/fetchDataList/taskType", {
+			    "idx": 0,
+			    "sum": 1,
+			    "taskType": {
+			        "hosId": {
+			            "id": this.hosId
+			        },
+			        "associationType": {
+			            "key": "association_types",
+			            "value": "specimen"
+			        }
+			    }
+			  });
+			},
+			//科室签到
+			//trueBigScanner----判断是否大扫描
+			//bigScanner----判断是否需要交接人
+			//accountObj----弹窗填写的交接人信息
+			async orderDeptHandler(bigScanner, accountObj) {
+			  console.log(this.infoDATA);
+			  uni.showLoading({
+			    title: "加载中",
+			    mask: true,
+			  });
+			  if(this.tabType === 'specimen' && this.infoDATA.specimen && this.infoDATA.specimen[0].gdState.value == 5){
+			    let result = await this.validateHandoverSpecimen();
+			    if (result.status == 200) {
+			      if(result.list.length){
+			        // 标本-运送过程-终点科室-标本数字交接
+			        if(result.list[0].carryingCourses[1].checkoutMethod.value == 3){
+			          bigScanner = false;
+			        }
+			      }else{
+			        uni.showToast({
+			          icon: "none",
+			          title: "请配置标本配送任务类型！",
+			        });
+			        uni.hideLoading();
+			        return;
+			      }
+			    }
+			  }
+			  let type = "orderSign/" + this.code;
+			  let list = {
+			    ids: this.userId.ids,
+			    trueBigScanner: ['666']
+			  };
+			  bigScanner && (list.bigScanner = ['666']);
+			  if (accountObj) {
+			    list.handover = [accountObj.accountId];
+			  }
+			
+			  post("/workerOrder/" + type, list).then((res) => {
+			    console.log(this.tabType)
+			    uni.hideLoading();
+			    if (res.status == 200) {
+			      if (this.tabType == 'specimenPlan') {
+			        // -----------------------------
+			        console.log(this.selectArr, '选中工单')
+			        let gd = this.infoDATA.specimenPlan.find(v => v.id == this.selectArr[0]);
+			        let startDeptId = gd.startDept.id; //起点科室id
+			        let isDigitalHandover = gd.taskType.isDigitalHandover; //是否数字交接开关
+			        let signDeptId = res.deptId; //签到的科室id
+			        let gdId = gd.id;
+			        let gdState = gd.gdState.value;
+			        let endDepts = gd.endDepts.map(v => v.id).toString();
+			        uni.navigateTo({
+			          url: `../scanning_djEnd/scanning_djEnd?type=${
+			            this.tabType
+			          }&type1=${res.type}&code=${this.code}&dept=${
+			            res.dept
+			          }&ids=${encodeURIComponent(
+			            JSON.stringify(this.userId.ids)
+			          )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}&startDeptId=${startDeptId}&isDigitalHandover=${isDigitalHandover}&signDeptId=${signDeptId}&gdId=${gdId}&gdState=${gdState}&endDepts=${endDepts}`,
+			        });
+			      } else if (this.tabType == 'specimen') {
+			        // 同济是false
+			        if (res.deptType && res.deptType.value === 'middleRoom') {
+			        // if (false) {
+			          // 如果是中转科室
+			          uni.navigateTo({
+			            url: `../checkAfterBigScreen/checkAfterBigScreen?type=${
+			            this.tabType
+			          }&type1=${res.type}&code=${this.code}&dept=${
+			            res.dept
+			          }&ids=${encodeURIComponent(
+			            JSON.stringify(this.userId.ids)
+			          )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+			          });
+			        } else if(res.type === 'spe-dsd-4'){
+			          // 检验方式是标本数字交接
+			          uni.navigateTo({
+			            url: `/pages/specimenHandoverNew/specimenHandoverNew?type=${
+			            this.tabType
+			          }&type1=${res.type}&code=${this.code}&dept=${
+			            res.dept
+			          }&ids=${encodeURIComponent(
+			            JSON.stringify(this.userId.ids)
+			          )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+			          });
+			        } else{
+			          uni.navigateTo({
+			            url: `../scanning_djEnd/scanning_djEnd?type=${
+			            this.tabType
+			          }&type1=${res.type}&code=${this.code}&dept=${
+			            res.dept
+			          }&ids=${encodeURIComponent(
+			            JSON.stringify(this.userId.ids)
+			          )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+			          });
+			        }
+			      }
+			    } else if (res.status == "0000") {
+			      this.showSelectAccount();
+			    } else {
+			      this.flag = true;
+			      uni.navigateTo({
+			        url: `../scanning_djEnd/scanning_djEnd?type=${this.tabType}&type1=${
+			        res.type
+			      }&code=${this.code}&dept=${res.dept}&ids=${encodeURIComponent(
+			        JSON.stringify(this.userId.ids)
+			      )}&model=${encodeURIComponent(JSON.stringify(res))}&deptId=${res.deptId}`,
+			      });
+			    }
+			  });
+			},
 			padChange(scannerCode){
-				scannerCode = scannerCode.replace('\n','')
-				// if(e.detail.value.length<5){
-				// 	return
-				// }
+				if(!this.isNumberKey){
+					scannerCode = scannerCode.replace('\n','')
+				}
 				if (!this.SMFlag) {
 				  return;
 				}
@@ -2742,7 +2933,7 @@
       // #endif
       this.selectedLabelSlots = "执行中";
       this.initList();
-      
+      this.getConfig();
       // 科室二维码切换科室回显
       if (options.showDepartmentQrcodeId && options.showDepartmentQrcodeDept) {
         this.updateUser({id: options.showDepartmentQrcodeId, dept: options.showDepartmentQrcodeDept})
@@ -2755,11 +2946,11 @@
       // #endif
     },
     onShow() {
+			this.getConfig();
 			let that = this
 			// #ifdef APP-PLUS
 			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
 			uni.$on('scan', function(data) {
-				console.log(888,data)
 				that.padChange(data)
 			})
 			// #endif
@@ -2924,6 +3115,31 @@
       bottom: 30rpx;
       z-index: 999;
       height: 88rpx;
+			padding: 0 8rpx;
+			display: flex;
+			.left{
+				width: 25%;
+				background-color: #e5e9ed;
+				margin-right: 8rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.left-title{
+					font-size: 30rpx;
+				}
+				.left-icon{
+					font-size: 34rpx;
+					margin-right: 10rpx;
+					color: #07863c;
+				}
+			}
+			.right{
+				width: 75%;
+				background-color: #e5e9ed;
+			}
+			.right-100{
+				width: 100% !important;
+			}
     }
 
     .red {

pages/scanning/scanning.vue

@@ -270,6 +270,15 @@
         };
       },
     },
+		onShow() {
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			// uni.$on('scan', function(data) {
+			// 	that.pdaChange(data)
+			// })
+			// #endif
+		},
     onLoad(options) {
       console.log(options, 'options')
       this.queryObj = options;

pages/scanning_B/scanning_B.vue

@@ -419,6 +419,15 @@
         };
       },
     },
+		onShow() {
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			// uni.$on('scan', function(data) {
+			// 	that.pdaChange(data)
+			// })
+			// #endif
+		},
     onLoad(options) {
       this.res = JSON.parse(options.res);
       this.infoDATA = JSON.parse(options.infoDATA); //详细信息

pages/scanning_Result/scanning_Result.vue

@@ -261,9 +261,12 @@
     </handViewSpecimen>
 		<!-- 调查问卷二维码 -->
 		 <questionCode v-if="isQuestionModel" :orderId="dataId" @know="isQuestionModel = false"></questionCode>
-  </view>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
+	</view>
 </template>
 <script>
+	import scanner from "../../components/scanner/scanner.vue";
   import showModel from "../../components/showModel/showModel.vue";
 	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
@@ -280,7 +283,8 @@
   } from '../../tools/enum.drugsbagType.js';
   export default {
 		components:{
-			questionCode
+			questionCode,
+			scanner
 		},
     data() {
       return {
@@ -429,7 +433,9 @@
                       if(flag){
                         setTimeout(()=>{
                           if (type === 'scan') {
-                            this.Scanning_again();
+														// #ifdef H5
+														this.Scanning_again();
+														// #endif
                           }
                         },500)
                       }
@@ -605,6 +611,11 @@
           this.SMFlag = true;
         });
       },
+			// pda扫描
+			pdaChange(content){
+				content = content.replace('\n','')
+				this.hand_scanning_common(content, 'scan');
+			},
       // 正常完成扫描
       overFinish() {
         let data = {
@@ -1012,6 +1023,13 @@
     onShow() {
       this.SMFlag = true;
       this.gotoFlag = true;
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.pdaChange(data)
+			})
+			// #endif
     },
     onLoad(options) {
       this.isEndDeptRedShow = options.isEndDeptRed === 'true';

pages/scanning_all/scanning_all.vue

@@ -909,6 +909,12 @@
       setTimeout(() => {
         this.texiao();
       }, 500);
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			// uni.$on('scan', function(data) {
+			// 	that.pdaChange(data)
+			// })
+			// #endif
     },
     onHide() {
       this.animationData = {};

pages/scanning_blood/scanning_blood.vue

@@ -322,6 +322,12 @@
     },
     onShow() {
       this.gotoFlag = true;
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			// uni.$on('scan', function(data) {
+			// 	that.pdaChange(data)
+			// })
+			// #endif
     },
     onLoad(options) {
 			this.hosId = uni.getStorageSync('userData').user.currentHospital.id;

pages/scanning_blood_process/scanning_blood_process.vue

@@ -63,9 +63,12 @@
     <handViewBlood v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
       @ok="speOk" @cancel="speCancel">
     </handViewBlood>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
   </view>
 </template>
 <script>
+	import scanner from "../../components/scanner/scanner.vue";
   import {
     get,
     post,
@@ -87,6 +90,9 @@
         queryObj: {}, //路由传递过来的数据
       };
     },
+		components:{
+			scanner
+		},
     methods: {
       // 录入到工单
       input_common(ress1, type, isFlag = false){
@@ -248,6 +254,11 @@
           this.SMFlag = true;
         });
       },
+			// pda扫描
+			pdaChange(content){
+				content = content.replace('\n','')
+				this.hand_scanning_common(content, 'scan', isFlag);
+			},
       // 清点核对
       countAndCheck() {
         if(this.forceDept){
@@ -263,6 +274,13 @@
     },
     onShow() {
       this.SMFlag = true;
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.pdaChange(data)
+			})
+			// #endif
     },
     onLoad(options) {
       console.log(options, "result", this.forceDept);

pages/scanning_code/scanning_code.vue

@@ -365,9 +365,12 @@
     </changeSpeNum>
 		<!-- 调查问卷二维码 -->
 		 <questionCode v-if="isQuestionModel" :orderId="infoDATA.id" @know="isQuestionModel = false"></questionCode>
-  </view>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
+	</view>
 </template>
 <script>
+	import scanner from "../../components/scanner/scanner.vue";
   import showModel from "../../components/showModel/showModel.vue";
 	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
@@ -381,7 +384,8 @@
   } from "../../tools/photograph.js";
   export default {
 		components:{
-			questionCode
+			questionCode,
+			scanner
 		},
     data() {
       return {
@@ -900,7 +904,9 @@
                       if(flag){
                         if (type === 'scan') {
                           setTimeout(() => {
-                            this.Scanning_again(this.dataId);
+														// #ifdef H5
+														this.Scanning_again(this.dataId);
+														// #endif
                           }, 500)
                         }
                       }
@@ -1097,6 +1103,11 @@
           this.SMFlag = true;
         });
       },
+			// pda扫描
+			pdaChange(content){
+				content = content.replace('\n','')
+				this.hand_scanning_common(content, 'scan');
+			},
       show(type) {
         this.showType = type;
         if (type === "show") {
@@ -1384,6 +1395,13 @@
     },
     onShow() {
       this.SMFlag = true;
+			let that = this
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.pdaChange(data)
+			})
+			// #endif
     },
     onLoad(options) {
       console.log(options);

pages/scanning_djEnd/scanning_djEnd.vue

@@ -214,10 +214,13 @@
     </changeSpeNum>
 		<!-- 调查问卷二维码 -->
 		 <questionCode v-if="isQuestionModel" :orderId="questionId" @know="isQuestionModel = false"></questionCode>
-  </view>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
+	</view>
 </template>
 <script>
   import showModel from "../../components/showModel/showModel.vue";
+	import scanner from "../../components/scanner/scanner.vue";
 	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
@@ -227,7 +230,8 @@
   } from "../../http/http.js";
   export default {
 		components:{
-			questionCode
+			questionCode,
+			scanner
 		},
     data() {
       return {
@@ -686,7 +690,9 @@
                     if(flag){
                       if (type === 'scan') {
                         setTimeout(()=>{
-                          this.Scanning_again();
+													// #ifdef H5
+													this.Scanning_again();
+													// #endif
                         },500)
                       }
                     }
@@ -1082,6 +1088,11 @@
             this.SMFlag = true;
           });
       },
+			// pda扫描
+			pdaChange(content){
+				content = content.replace('\n','')
+				this.hand_scanning_common(content, 'scan');
+			},
       // 知道了
       showAlert() {
         uni.navigateTo({
@@ -1227,6 +1238,13 @@
     onShow() {
       this.SMFlag = true;
       this.gotoFlag = true;
+			let that = this;
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.pdaChange(data)
+			})
+			// #endif
     },
     onLoad(options) {
       console.log(options, "djEnd");

pages/scanning_djInfo/scanning_djInfo.vue

@@ -162,10 +162,13 @@
     </handViewSpecimen>
 		<!-- 调查问卷二维码 -->
 		 <questionCode v-if="isQuestionModel" :orderId="gdId" @know="isQuestionModel = false"></questionCode>
-  </view>
+		<!-- PDA扫描 -->
+		<scanner></scanner>
+	</view>
 </template>
 <script>
   import showModel from "../../components/showModel/showModel.vue";
+	import scanner from "../../components/scanner/scanner.vue";
 	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
@@ -178,7 +181,8 @@
   } from '../../tools/enum.drugsbagType.js';
   export default {
 		components:{
-			questionCode
+			questionCode,
+			scanner
 		},
     data() {
       return {
@@ -347,7 +351,9 @@
                       if(flag){
                         if (type === 'scan') {
                           setTimeout(()=>{
-                            this.Scanning_again();
+														// #ifdef H5
+														this.Scanning_again();
+														// #endif
                           },500)
                         } else if (type === 'hand') {
                           this.hand_again();
@@ -680,6 +686,11 @@
             this.SMFlag = true;
           });
       },
+			// pda扫描
+			pdaChange(content){
+				content = content.replace('\n','')
+				this.hand_scanning_common(content, 'scan');
+			},
       // 知道了
       showAlert() {
         uni.navigateTo({
@@ -799,6 +810,13 @@
     onShow() {
       this.SMFlag = true;
       this.gotoFlag = true;
+			let that = this;
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			uni.$on('scan', function(data) {
+				that.pdaChange(data)
+			})
+			// #endif
     },
     onLoad(options) {
       this.isEndDeptRedShow = options.isEndDeptRed === 'true';

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -286,6 +286,11 @@
         this.getInfo('specimenDesc');
       },
     },
+		onShow(){
+			// #ifdef APP-PLUS
+			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
+			// #endif
+		},
     onLoad(options) {
       console.log(options, "result");
       this.queryObj = options;

pages/specimenPort/specimenPort.vue

@@ -13,7 +13,7 @@
 				<view>{{item.status.name}}</view>
 			</view>
 			<view class="df-list">
-				<view class="df-list-over-left">申请科室：{{item.patientDTO.department.dept}}</view>
+				<view class="df-list-over-left">科室：{{item.patientDTO.department.dept}}</view>
 				<view class="df-list-over">部位：{{item.takePart}}</view>
 			</view>
 			<view class="df-list">

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe653;</span>
+                <div class="name">密钥</div>
+                <div class="code-name">&amp;#xe653;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe659;</span>
                 <div class="name">筛选</div>
                 <div class="code-name">&amp;#xe659;</div>
@@ -714,9 +720,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1728893186075') format('woff2'),
-       url('iconfont.woff?t=1728893186075') format('woff'),
-       url('iconfont.ttf?t=1728893186075') format('truetype');
+  src: url('iconfont.woff2?t=1731394849627') format('woff2'),
+       url('iconfont.woff?t=1731394849627') format('woff'),
+       url('iconfont.ttf?t=1731394849627') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -743,6 +749,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-miyue"></span>
+            <div class="name">
+              密钥
+            </div>
+            <div class="code-name">.newicon-miyue
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-shaixuan"></span>
             <div class="name">
               筛选
@@ -1734,6 +1749,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-miyue"></use>
+                </svg>
+                <div class="name">密钥</div>
+                <div class="code-name">#newicon-miyue</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-shaixuan"></use>
                 </svg>
                 <div class="name">筛选</div>

static/font/iconfont.css

@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-miyue:before {
+  content: "\e653";
+}
+
 .newicon-shaixuan:before {
   content: "\e659";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "8655877",
+      "name": "密钥",
+      "font_class": "miyue",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
       "icon_id": "12911869",
       "name": "筛选",
       "font_class": "shaixuan",