解决代码冲突

components/bigScreen/bigScreen.vue

@@ -510,6 +510,7 @@
       },
       // 底部扫描
       Scanning(qrcodePrefix = '') {
+				// this.ScanningCommon('', '250515541895@_1');
         if (!this.SMFlag) {
           return;
         }

components/errorModel/errorModel.vue

@@ -0,0 +1,209 @@
+<template>
+  <view class="showModel" v-if="speDATA && speDATA.data">
+		<view class="showModel__wrap">
+			<view class="showModel__header">
+			  提示
+			</view>
+			<view class="content">
+				<view class="content-box">
+					<view class="icon">
+						<text class="red newicon newicon-guanbi1"></text>
+					</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 weight">{{speDATA.msg}}</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="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 {
+      addConfig:false,
+			msg:null,
+    };
+  },
+  props: {
+		speDATA:{
+			type:Object,
+			default:{}
+		},
+		errorModal:{
+			type:Boolean,
+			default:false
+		},
+  },
+	watch:{
+		errorModal(e){
+			console.log(2222,e)
+			if(e){
+				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 = '记录本次操作，不在提示'
+				}
+			}
+		}
+	},
+	created(){
+	},
+  methods: {
+		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
+			}
+			console.log(this.addConfig)
+			this.$emit('confirm', data)
+    },
+    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-top: 1px solid #E6E6E6;
+			// margin-bottom: 20rpx;
+			.content-tip{
+				text-align: center;
+				padding: 50rpx 0 30rpx 0;
+				font-size: 28rpx;
+			}
+			.content-box{
+				padding: 24rpx;
+				
+				.icon{
+					text-align: center;
+					.red{
+						font-size: 80rpx;
+					}
+				}
+				
+				.flex{
+					display: flex;
+					justify-content: space-between;
+				}
+				
+				.weight{
+					font-weight: bold;
+				}
+				
+				.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;
+				}
+			}
+		}
+		.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;
+			}
+		}
+  }
+	.green{
+		color: #49B856;
+	}
+	.mar-rig{
+		margin-right: 8rpx;
+	}
+}
+</style>

pages.json

@@ -760,7 +760,23 @@
           "titleNView": false
         }
       }
-    }
+    },
+		{
+		  "path": "pages/speConfigurationGather/speConfigurationGather",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    }
+		  }
+		},
+		{
+		  "path": "pages/searchSqType/searchSqType",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    }
+		  }
+		}
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/newDrug/checkPage/checkPage.vue

@@ -25,8 +25,10 @@
 
     <view class="foot_btn_spe">
       <view class="column">
-        <view class="btn" @click="scanCode()">扫一扫交接</view>
-        <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
+				<view v-if="config.drugsStartCheck==0 && workOrder.gdState.value == 4" class="btn" @click="checkSubmit()">确认交接</view>
+        <view v-if="workOrder.gdState.value == 4 && config.drugsStartCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
+				<view v-if="workOrder.gdState.value == 5 && config.drugsEndCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
+				<view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
         <view class="btn" @click="fillInManually(config.drugsEndManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
       </view>
     </view>
@@ -36,7 +38,12 @@
     </selectAccount>
     <!-- 动态密钥 -->
     <numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
-  </view>
+		<!-- 核对交接 -->
+		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" content="是否核对完成？" @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+	</view>
 </template>
 <script>
   import numberKeyModel from "@/components/numberKeyModel/numberKeyModel.vue";
@@ -63,6 +70,7 @@
         keyNum:4, //密钥位数
         isNumberKey:false, //是否开启动态密钥
         keyArr: [],
+				checkDialog:false
       };
     },
     components: {
@@ -237,7 +245,7 @@
           });
       },
       // 工单完成
-      completeOrder(workOrder, queryObj, accountObj){
+      completeOrder(workOrder, queryObj, accountObj, type){
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -250,20 +258,21 @@
         post('/transflow/checkComplete', postData).then(res => {
           uni.hideLoading();
           if(res.state == 200){
+						if(type=='check'){
+							this.$refs.alertDialog.close()
+						}
             uni.showToast({
               icon: "none",
-              title: workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (workOrder.gdState.value == 5 ? "交接成功，完成配送！" : ""),
-              duration: 60000,
+              title: workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (workOrder.gdState.value == 5 ? "交接成功，完成配送！" : "交接成功"),
+              duration: 2000,
               mask: true,
-              complete(){
-                setTimeout(() => {
-                  uni.hideToast();
-                  uni.redirectTo({
-                    url: `/pages/receiptpage/receiptpage`,
-                  });
-                }, 2000)
-              }
             });
+						setTimeout(() => {
+						  // uni.hideToast();
+						  uni.redirectTo({
+						    url: `/pages/receiptpage/receiptpage`,
+						  });
+						}, 2000)
           }else{
             uni.showToast({
               icon: "none",
@@ -286,7 +295,7 @@
             });
           }else{
             // 起点科室不支持拍照留存
-            this.completeOrder(workOrder, queryObj, accountObj);
+            this.completeOrder(workOrder, queryObj, accountObj, "");
           }
         }else if(workOrder.gdState.value == 5){
           // 待送达
@@ -297,10 +306,22 @@
             });
           }else{
             // 起点科室不支持拍照留存
-            this.completeOrder(workOrder, queryObj, accountObj);
+            this.completeOrder(workOrder, queryObj, accountObj, "");
           }
         }
       },
+			// 核对交接
+			checkSubmit(){
+				this.$refs.alertDialog.open()
+			},
+			// 确定核对交接
+			dialogConfirm(){
+				this.completeOrder(this.workOrder, this.queryObj, "", "check")
+			},
+			// 取消核对交接
+			dialogClose(){
+				this.$refs.alertDialog.close()
+			},
       // 扫一扫交接
       scanCode(){
         if (!this.SMFlag) {

pages/receiptpage/receiptpage.vue

@@ -2994,6 +2994,11 @@
       // #endif
     },
     onShow() {
+			uni.removeStorageSync('startDept')
+			uni.removeStorageSync('checkoutDept')
+			uni.removeStorageSync('testTube')
+			uni.removeStorageSync('speState')
+			uni.removeStorageSync('gdData')
 			this.getConfig();
 			let that = this
 			// #ifdef APP-PLUS

pages/scanning_B/scanning_B.vue

@@ -56,6 +56,14 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       :operate="models.operate" @know="know"></showModel>
+			<b></b>
+		<!-- 标本第一次拦截 -->
+		<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>
@@ -92,6 +100,10 @@
         },
         currentCode: "",
         type: "", //类型，orderSign|buildAndOrderSign
+				speCollectLimit:null,
+				speStartCollectShowConfig:null,
+				speContent:null,
+				speData:null
       };
     },
     methods: {
@@ -216,15 +228,24 @@
                 mask: true,
               });
               let postData = {
-                speId
+                speId,
+								speVerifyType:null
               }
               if (orderId) {
                 // 接单并签到
                 postData.orderId = orderId;
               }
+							if(this.speData){
+								postData.speVerifyType = this.speData.speVerifyType
+							}else{
+								delete postData.speVerifyType
+							}
               post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
-                if (res.state == 200 || res.state == 201) {
+								this.speContent = null
+								this.speData = null
+								if (res.state == 200 || res.state == 201) {
                   uni.hideLoading();
+									this.$refs.alertDialog.close()
                   if (res.status == 200) {
                     // 跳转到扫描科室
                     // type1: res.type, //type类型
@@ -247,17 +268,23 @@
                     });
                   }
                 } else if (res.state == "0000") {
+									this.$refs.alertDialog.close()
                   uni.hideLoading();
                   this.currentCode = res.code;
                   this.res.workOrder = res.workOrder;
                   this.showSelectAccount();
-                } else {
+                } else if(res.status == 515){
                   uni.hideLoading();
-                  uni.showToast({
-                    icon: "none",
-                    title: res.msg || "接口获取数据失败！",
-                  });
-                }
+									this.$refs.alertDialog.open()
+									this.speContent = res.msg
+									this.speData = res
+                } else {
+									uni.hideLoading();
+									uni.showToast({
+									  icon: "none",
+									  title: res.msg || "接口获取数据失败！",
+									});
+								}
               });
             } else if (res.cancel) {
               console.log('用户点击取消');
@@ -265,6 +292,65 @@
           }
         });
       },
+			dialogConfirm() {
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let postData = {
+				  orderId: null,
+					speId: this.speData.data.id,
+					speVerifyType:null
+				}
+				if (this.res.workOrder) {
+				  // 接单并签到
+				  postData.orderId = this.res.workOrder.id;
+				}else{
+					delete postData.orderId
+				}
+				if(this.speData){
+					postData.speVerifyType = this.speData.speVerifyType
+				}else{
+					delete postData.speVerifyType
+				}
+				post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
+				 this.speContent = null
+				 this.speData = null
+					if (res.state == 200 || res.state == 201) {
+						this.$refs.alertDialog.close()
+				    uni.hideLoading();
+				    if (res.status == 200) {
+				      this.breforeJump(res);
+				    } else {
+				      uni.navigateTo({
+				        url: `/pages/scanning_Result/scanning_Result?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&status=600&msg=${res.msg}&isKs=1`,
+				      });
+				    }
+				  } else if (res.state == "0000") {
+						this.$refs.alertDialog.close()
+				    uni.hideLoading();
+				    this.currentCode = res.code;
+				    this.res.workOrder = res.workOrder;
+				    this.showSelectAccount();
+				  } else if(res.status == 515){
+				    uni.hideLoading();
+						this.$refs.alertDialog.open()
+						this.speContent = res.msg
+						this.speData = res
+				  } else {
+						uni.hideLoading();
+						uni.showToast({
+						  icon: "none",
+						  title: res.msg || "接口获取数据失败！",
+						});
+					}
+				});
+			},
+			dialogClose() {
+				this.$refs.alertDialog.close()
+				this.speContent = null
+				this.speData = null
+			},
       know() {
         this.models.disjunctor = false;
         if (this.models.icon === 'success') {
@@ -507,7 +593,8 @@
                     this.bigScanArriveNotOwner = data.bigScanArriveNotOwner === 1;
                     this.bigScanShowCreateBtn = data.bigScanShowCreateBtn === 1;
                     this.defaultScanSpe = data.defaultScanSpe === 1;
-
+										this.speCollectLimit = data.speCollectLimit;
+										this.speStartCollectShowConfig = data.speStartCollectShowConfig;
                     if(this.defaultScanSpe){
                       this.defaultJumpPage();
                     }else{
@@ -554,7 +641,7 @@
             orderId: workOrder.id,
           }
           post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
-            if (res.state == 200 || res.state == 201) {
+						if (res.state == 200 || res.state == 201) {
               if (res.status == 200) {
                 // 跳转到扫描科室
                 // type1: res.type, //type类型
@@ -582,7 +669,12 @@
               this.currentCode = res.code;
               this.res.workOrder = res.workOrder;
               this.showSelectAccount();
-            } else {
+            } else if(res.status == 515){
+							uni.hideLoading();
+							this.$refs.alertDialog.open()
+							this.speContent = res.msg
+							this.speData = res
+						}else {
               uni.hideLoading();
               uni.showToast({
                 icon: "none",
@@ -609,23 +701,45 @@
             ress.msg = '成功';
             ress.specimenCount = res.specimenCount;
             ress.type = resObj.type;
-            uni.navigateTo({
-              url: `../scanning_Result/scanning_Result?type=${
-              resObj.workOrder.taskType.associationType.value
-            }&type1=${
-              resObj.type
-            }&infoData=${encodeURIComponent(
-              JSON.stringify(ress.data)
-            )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-              this.currentCode
-            }&dept=${
-              resObj.dept
-            }&taskTypeId=${
-              resObj.workOrder.taskType.id
-            }&deptId=${resObj.deptId}&id=${resObj.workOrder.id}&model=${encodeURIComponent(
-              JSON.stringify(ress)
-            )}&speNum=${res.specimenCount}`,
-            });
+						if(this.speCollectLimit==1 && this.speStartCollectShowConfig==1){
+							let sessData = `type=${
+							  resObj.workOrder.taskType.associationType.value
+							}&type1=${
+							  resObj.type
+							}&infoData=${encodeURIComponent(
+							  JSON.stringify(ress.data)
+							)}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+							  this.currentCode
+							}&dept=${
+							  resObj.dept
+							}&taskTypeId=${
+							  resObj.workOrder.taskType.id
+							}&deptId=${resObj.deptId}&id=${resObj.workOrder.id}&model=${encodeURIComponent(
+							  JSON.stringify(ress)
+							)}&speNum=${res.specimenCount}`
+							uni.setStorageSync('gdData', JSON.stringify(sessData))
+							uni.navigateTo({
+							  url: `../speConfigurationGather/speConfigurationGather?id=${resObj.workOrder.id}`,
+							});
+						}else{
+							uni.navigateTo({
+							  url: `../scanning_Result/scanning_Result?type=${
+							  resObj.workOrder.taskType.associationType.value
+							}&type1=${
+							  resObj.type
+							}&infoData=${encodeURIComponent(
+							  JSON.stringify(ress.data)
+							)}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+							  this.currentCode
+							}&dept=${
+							  resObj.dept
+							}&taskTypeId=${
+							  resObj.workOrder.taskType.id
+							}&deptId=${resObj.deptId}&id=${resObj.workOrder.id}&model=${encodeURIComponent(
+							  JSON.stringify(ress)
+							)}&speNum=${res.specimenCount}`,
+							});
+						}
           })
         })
       },

pages/scanning_Result/scanning_Result.vue

@@ -137,7 +137,8 @@
       <view class="btn3" @click="getNoScanSpecimen(false)">未扫描标本</view>
       <view class="btn3" @click="getNoScanSpecimen(true)">已扫描标本</view>
       <view class="btn2" @click="Scanning_complete(dataId)"> 完成扫描 </view>
-    </view>
+			<view class="btn2" v-if="speCollectLimit==1" @click="configuration(dataId)"> 配置收取 </view>
+		</view>
     <view class="foot_btn" v-if="
         (type != 'specimenPlan' &&
           type != 'specimen' &&
@@ -263,11 +264,14 @@
 		 <questionCode v-if="isQuestionModel" :orderId="dataId" @know="isQuestionModel = false"></questionCode>
 		<!-- PDA扫描 -->
 		<scanner></scanner>
+		<!-- 标本扫描拦截 -->
+		<errorModel v-show="errorModal" ref="model11" :errorModal="errorModal" :speDATA="speDATA" @cancel="cancelError" @confirm="confirmError($event)"></errorModel>
 	</view>
 </template>
 <script>
 	import scanner from "../../components/scanner/scanner.vue";
   import showModel from "../../components/showModel/showModel.vue";
+	import errorModel from "../../components/errorModel/errorModel.vue";
 	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
@@ -284,7 +288,8 @@
   export default {
 		components:{
 			questionCode,
-			scanner
+			scanner,
+			errorModel
 		},
     data() {
       return {
@@ -335,6 +340,13 @@
         gotoFlag: true,
         content: "",
 				taskTypeId:"",
+				speCollectLimit:null,
+				errorModal:null,
+				speDATA:null,
+				interceptData:null,
+				intercept:null,
+				num: 0,
+				isShow:null
       };
     },
     methods: {
@@ -397,7 +409,19 @@
                 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") {
@@ -426,11 +450,13 @@
               }
               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) {
                     this.getPageConfigSpecimen((flag, type, ress) => {
-                      if(flag){
+                      if(flag && !this.isShow){
                         setTimeout(()=>{
                           if (type === 'scan') {
 														// #ifdef H5
@@ -442,6 +468,18 @@
                       if(ress){
                         this.infoDATA = ress.data;
                         this.speNum = ress.specimenCount;
+												// 标本拦截收取参数
+												let sessData = `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}&isShow=1`
+												uni.setStorageSync('gdData', JSON.stringify(sessData))
+												
                         uni.redirectTo({
                           url: `../scanning_Result/scanning_Result?type=${
                           this.queryObj.type
@@ -451,7 +489,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}`,
+                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}&scanOrHand=${type}&isEndDeptRed=${this.isEndDeptRed}&isShow=1`,
                         });
                       }
                     }, type, ress.data, ress);
@@ -551,19 +589,27 @@
                     }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
                     });
                   }
-                } 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=${type}&qrcode=${this.currentCode}`,
+                } else if (ress.status==513){
+									this.speDATA = ress
+									this.errorModal = true
+								} 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=${type}&qrcode=${this.currentCode}`,
+									});
+								}
               });
             } else {
               uni.hideLoading();
@@ -578,6 +624,18 @@
         });
         // ------------------------------
       },
+			// 取消拦截
+			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) {
@@ -601,6 +659,7 @@
       },
       // 继续扫描
       Scanning_again() {
+				// this.hand_scanning_common('250515584338@_1', 'scan')
         if (!this.SMFlag) {
           return;
         }
@@ -760,6 +819,13 @@
           url: "../receiptpage/receiptpage",
         });
       },
+			// 配置收取
+			configuration(id){
+				
+				uni.navigateTo({
+				  url: `../speConfigurationGather/speConfigurationGather?id=${id}`
+				});
+			},
       // 完成扫描
       Scanning_complete(id) {
         // 如果是标本配送和标本轮巡,则进入标本核对页面
@@ -981,9 +1047,10 @@
                 if (res.status == 200) {
                   let data = res.list[0];
               		if(data){
+										// this.speCollectLimit = data.speCollectLimit;
                     let deptNotAlertList = data.deptNotAlertList || [];
                     deptNotAlertList = deptNotAlertList.map(v => v.id);
-                    if(deptNotAlertList.includes(specimenDTO.checkDept.id)){
+                    if(deptNotAlertList.includes(specimenDTO && specimenDTO.checkDept.id)){
                       this.isEndDeptRed = true;
                       console.log('红色')
                       fn(false, type, ress);
@@ -1019,6 +1086,68 @@
           }
         });
       },
+			getSys(){
+				const userData = uni.getStorageSync("userData");
+				console.log('userData', userData);
+				// 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) => {
+				        // uni.hideLoading();
+				        if (res.status == 200) {
+				          let data = res.list[0];
+				      		if(data){
+										this.speCollectLimit = data.speCollectLimit;
+				          }
+				        } else {
+				          uni.showToast({
+				            icon: "none",
+				            title: res.msg || "接口获取数据失败！",
+				          });
+				        }
+				      });
+				    }else{
+				      uni.hideLoading();
+				      uni.showToast({
+				        icon: "none",
+				        title: "未查询到标本配送业务！",
+				      });
+				    }
+				  } else {
+				    uni.hideLoading();
+				    uni.showToast({
+				      icon: "none",
+				      title: res.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			}
     },
     onShow() {
       this.SMFlag = true;
@@ -1032,14 +1161,46 @@
 			// #endif
     },
     onLoad(options) {
+			this.intercept = options.intercept
+			this.isShow = options.isShow
       this.isEndDeptRedShow = options.isEndDeptRed === 'true';
-      if (options.status == 200&&options.scanOrHand === 'hand'&&(options.type === "specimen"||options.type === "specimenPlan")) {
-        this.getPageConfigSpecimen((flag) => {
+			this.getSys()
+      if (options.status == 200&&(options.scanOrHand === 'hand')&&(options.type === "specimen"||options.type === "specimenPlan")) {
+				this.getPageConfigSpecimen((flag) => {
           if(flag){
             this.hand_again();
           }
         });
       }
+			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') {
+			// 					// #ifdef H5
+			// 					this.Scanning_again();
+			// 					// #endif
+			// 				// }
+			// 			},500)
+			// 		}
+			// 	})
+			// }
 			console.log(options , "options");
       this.queryObj = options;
       this.isKs = this.queryObj.isKs;
@@ -1049,6 +1210,7 @@
         this.infoDATA = JSON.parse(options.model);
       }
 			console.log(this.infoDATA , "infoDATA");
+			
       if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
@@ -1073,6 +1235,7 @@
       this.res["deptName"] = options.deptName;
       this.res["bedNum"] = options.bedNum;
       this.infoType = options.type1;
+			
 			if((this.infoType == 'trans-dsd-1' || this.infoType == 'ins-dsd-1'
 				|| this.infoType == 'ins-half-ok' || this.infoDATA.type == 'ins-half-ok')
 				&& this.res.status == 200){
@@ -1095,6 +1258,16 @@
       }
       this.DEPTCode = options.deptCode;
       this.type = options.type;
+			
+			// 标本收取拦截参数
+			let sessData = `type=${
+			  this.queryObj.type
+			}&type1=${
+			  this.queryObj.type1
+			}&infoData=${options.infoData}&status=${options.status}&msg=${options.msg}&deptCode=${
+			  this.queryObj.deptCode
+			}&dept=${this.queryObj.dept}&id=${this.dataId}&model=${options.model}&speNum=${this.speNum}&scanOrHand=${options.scanOrHand}&isEndDeptRed=${options.isEndDeptRed}`
+			uni.setStorageSync('gdData', JSON.stringify(sessData))
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/searchSqType/searchSqType.vue

@@ -0,0 +1,411 @@
+<template>
+	<view class="content">
+		<view class="search-keyword">
+			<view class="padding">
+				<uni-easyinput prefixIcon="search" v-model="key" :clearable="false" placeholder="请输入" @input="searchKey">
+				</uni-easyinput>
+			</view>
+			<scroll-view class="keyword-list-box" scroll-y>
+				<label v-for="(row, index) in dataList" :key="row.id" @click="itemClick(row)"
+					>
+					<view class="keyword-entry" :class="selectData.includes(row.id) ? 'selectStyle' : ''">
+						<view class="keyword-text">
+							{{type=="startDept" || type=="checkoutDept" ? row.dept : row.name}}
+						</view>
+					</view>
+				</label>
+			</scroll-view>
+		</view>
+		<view class="toolbar">
+			<view class="btn cancel" @click="determine('back')" hover-class="seimin-btn-hover">
+				取消
+			</view>
+			<view class="btn affirm" @click="determine('submit')" hover-class="seimin-btn-hover">
+				确定
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		post,
+		webHandle
+	} from "../../http/http.js";
+	import debounce from 'lodash-es/debounce'
+	export default {
+		data() {
+			return {
+				key:null,
+				type: "", //进入该页面的类型
+				hosId: "",
+				dataList: [],
+				selectData: [],
+				allData:[],
+				// startDept: [],
+				// checkoutDept: [],
+				// testTube: [],
+				// speState: []
+				gdId:null
+			};
+		},
+		onLoad(options) {
+			this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
+			console.log(options, 'options');
+			this.type = options.type
+			this.gdId = options.id
+			if(options.type=='startDept'){
+				this.getStartDept()
+			}else if (options.type=='checkoutDept'){
+				this.getCheckoutDept()
+			}else if (options.type=='testTube'){
+				this.getTestTube()
+			}else if (options.type=='speState'){
+				this.getSpeState()
+			}
+		},
+		methods: {
+			searchKey(e){
+				if(this.type=='startDept'){
+					this.handleSearch1()
+				}else if (this.type=='checkoutDept'){
+					this.handleSearch2()
+				}
+			},
+			handleSearch1: debounce(function() {
+			  this.getStartDept();
+			}, 500),
+			handleSearch2: debounce(function() {
+			  this.getCheckoutDept();
+			}, 500),
+			//获取起点科室
+			getStartDept() {
+				let postData = {
+					idx: 0,
+					sum: 20,
+					department:{
+						searchType: 1,
+						hospital: {
+							id: this.hosId
+						},
+						dept: this.key
+					}
+				}
+				post("/simple/data/fetchDataList/department", postData).then((res) => {
+					this.dataList = res.list
+				})
+			},
+			// 获取检验科室
+			getCheckoutDept(){
+				let postData1 = {
+					key:'dept_type',
+					type: "list"
+				}
+				post("/common/common/getDictionary", postData1).then((res2) => {
+					let item = res2.find(i=>i.name=='检验科室')
+					let data1 = {
+					  idx: 0,
+					  sum: 20,
+					  department: {
+					    hospital: { id: this.hosId || "" },
+					    type: { id: item.id || "" },
+							dept: this.key,
+					  },
+					};
+					post("/simple/data/fetchDataList/department", data1).then((res) => {
+						this.dataList = res.list;
+					});
+				})
+			},
+			// 获取试管类型
+			getTestTube(){
+				let postData1 = {
+					key:'specimen_tube_type',
+					type: "list"
+				}
+				post("/common/common/getDictionary", postData1).then((res) => {
+					this.dataList = res
+				})
+			},
+			// 获取标本状态
+			getSpeState(){
+				let postData1 = {
+					key:'speState',
+					type: "list"
+				}
+				post("/common/common/getDictionary", postData1).then((res) => {
+					this.dataList = res
+				})
+			},
+			// 确认
+			determine(type) {
+				this.allData = []
+				this.dataList.forEach(i=>{
+					for(let x of this.selectData){
+						if(i.id == x){
+							this.allData.push(i)
+						}
+					}
+				})
+				console.log(3333, this.allData)
+				if (type == 'back') {
+					uni.navigateBack({
+						delta: 1,
+					})
+				} else {
+					if(this.type=='startDept'){
+						let data = uni.getStorageSync('startDept')
+						if(data){
+							let arr = JSON.parse(data)
+							for(let i of this.allData){
+								arr.push(i)
+							}
+							uni.setStorageSync('startDept', JSON.stringify(arr))
+						}else{
+							uni.setStorageSync('startDept', JSON.stringify(this.allData))
+						}
+					}else if (this.type=='checkoutDept'){
+						let data = uni.getStorageSync('checkoutDept')
+						if(data){
+							let arr = JSON.parse(data)
+							for(let i of this.allData){
+								arr.push(i)
+							}
+							uni.setStorageSync('checkoutDept', JSON.stringify(arr))
+						}else{
+							uni.setStorageSync('checkoutDept', JSON.stringify(this.allData))
+						}
+					}else if (this.type=='testTube'){
+						uni.setStorageSync('testTube', JSON.stringify(this.allData))
+					}else if (this.type=='speState'){
+						uni.setStorageSync('speState', JSON.stringify(this.allData))
+					}
+					uni.navigateTo({
+						url: `../speConfigurationGather/speConfigurationGather?type=${this.type}&id=${this.gdId}&back=1`
+					});
+				}
+			},
+			// 选择楼栋
+			itemClick(item) {
+				let index = this.selectData.indexOf(item.id)
+				if (index == -1) {
+					this.selectData.push(item.id)
+				} else {
+					this.selectData.splice(index, 1)
+				}
+			}
+		},
+	};
+</script>
+<style scoped>
+	.is-input-border{
+		border-color: #eee !important
+	}
+</style>
+<style scoped lang="less">
+	view {
+		display: block;
+	}
+
+	.title {
+		padding: 30rpx;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	// 底部
+	.toolbar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 30rpx;
+		width: 96%;
+		margin-left: 2%;
+		z-index: 9999;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+
+		.btn {
+			width: 48%;
+			height: 88rpx;
+			line-height: 88rpx;
+			text-align: center;
+			border-radius: 10rpx;
+		}
+
+		.affirm {
+			background-color: #49B856;
+			color: #fff;
+		}
+
+		.cancel {
+			background-color: #AFAFAF;
+			color: #fff;
+		}
+	}
+
+	.search-box {
+		width: 95%;
+		background-color: rgb(242, 242, 242);
+		padding: 15upx 2.5%;
+		display: flex;
+		justify-content: space-between;
+		position: sticky;
+		top: 0;
+	}
+
+	.search-box .mSearch-input-box {
+		width: 100%;
+	}
+
+	.search-box .input-box {
+		width: 85%;
+		flex-shrink: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.search-box .search-btn {
+		width: 15%;
+		margin: 0 0 0 2%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		font-size: 28upx;
+		color: #fff;
+		background: linear-gradient(to right, #ff9801, #ff570a);
+		border-radius: 60upx;
+	}
+
+	.search-box .input-box>input {
+		width: 100%;
+		height: 60upx;
+		font-size: 32upx;
+		border: 0;
+		border-radius: 60upx;
+		-webkit-appearance: none;
+		-moz-appearance: none;
+		appearance: none;
+		padding: 0 3%;
+		margin: 0;
+		background-color: #ffffff;
+	}
+
+	.placeholder-class {
+		color: #9e9e9e;
+	}
+
+	.search-keyword {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+	}
+	
+	.padding{
+		// padding: 0 20rpx;
+	}
+	
+	.keyword-list-box {
+		height: calc(100vh - 220rpx);
+		padding-top: 10upx;
+		border-radius: 20upx 20upx 0 0;
+		background-color: #fff;
+	}
+
+	.selectStyle {
+		color: #49B856 !important;
+	}
+
+	.keyword-entry-tap {
+		background-color: #eee;
+	}
+
+	.keyword-entry {
+		width: 94%;
+		height: 80rpx;
+		margin: 0 3%;
+		font-size: 30rpx;
+		color: #333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-bottom: solid 1rpx #DEDEDE;
+	}
+
+	.keyword-entry image {
+		width: 60upx;
+		height: 60upx;
+	}
+
+	.keyword-entry .keyword-text,
+	.keyword-entry .keyword-img {
+		height: 80upx;
+		display: flex;
+		align-items: center;
+	}
+
+	.keyword-entry .keyword-text {
+		// width: 90%;
+	}
+
+	.keyword-entry .keyword-img {
+		width: 10%;
+		justify-content: center;
+	}
+
+	.keyword-box {
+		height: calc(100vh - 110upx);
+		border-radius: 20upx 20upx 0 0;
+		background-color: #fff;
+	}
+
+	.keyword-box .keyword-block {
+		padding: 10upx 0;
+	}
+
+	.keyword-box .keyword-block .keyword-list-header {
+		width: 94%;
+		padding: 10upx 3%;
+		font-size: 27upx;
+		color: #333;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.keyword-box .keyword-block .keyword-list-header image {
+		width: 40upx;
+		height: 40upx;
+	}
+
+	.keyword-box .keyword-block .keyword {
+		width: 94%;
+		padding: 3px 3%;
+		display: flex;
+		flex-flow: wrap;
+		justify-content: flex-start;
+	}
+
+	.keyword-box .keyword-block .hide-hot-tis {
+		display: flex;
+		justify-content: center;
+		font-size: 28upx;
+		color: #6b6b6b;
+	}
+
+	.keyword-box .keyword-block .keyword>view {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 60upx;
+		padding: 0 20upx;
+		margin: 10upx 20upx 10upx 0;
+		height: 60upx;
+		font-size: 28upx;
+		background-color: rgb(242, 242, 242);
+		color: #6b6b6b;
+	}
+</style>

pages/speConfigurationGather/speConfigurationGather.vue

@@ -0,0 +1,446 @@
+<template>
+  <view class="container">
+		<view class="title">标本收取限制配置</view>
+		<view class="content">
+			<view class="list" v-if="this.list.collectDeptList && this.list.collectDeptList.length>0">
+				<view class="top">
+					<view class="title">起点科室</view>
+					<text class="right-icon newicon newicon-weibiaoti2010104" @click="search('startDept')"></text>
+				</view>
+				<view class="content" v-for="(item, index) in startDept" :key="index">
+					<view class="name">{{item.dept}}</view>
+					<text class="right-icon newicon newicon-lajitong" v-if="index!=0" @click="delect(index, '1')"></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="top">
+					<view class="title">检验科室</view>
+					<text class="right-icon newicon newicon-weibiaoti2010104" @click="search('checkoutDept')"></text>
+				</view>
+				<view class="content" v-for="(item, index) in checkoutDept" :key="index">
+					<view class="name">{{item.dept}}</view>
+					<text class="right-icon newicon newicon-lajitong" @click="delect(index, '2')"></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="top">
+					<view class="title">试管类型</view>
+					<text class="right-icon newicon newicon-weibiaoti2010104" @click="search('testTube')"></text>
+				</view>
+				<view class="content" v-for="(item, index) in testTube" :key="index">
+					<view class="name">{{item.name}}</view>
+					<text class="right-icon newicon newicon-lajitong" @click="delect(index, '3')"></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="top">
+					<view class="title">标本状态</view>
+					<text class="right-icon newicon newicon-weibiaoti2010104" @click="search('speState')"></text>
+				</view>
+				<view class="content" v-for="(item, index) in speStateData" :key="index">
+					<view class="name">{{item.name}}</view>
+					<text class="right-icon newicon newicon-lajitong" @click="delect(index, '4')"></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="top">
+					<view class="title">紧急普通</view>
+					<checkbox-group @change="checkboxChange">
+						<label v-for="item in urgencyData" :key="item.value">
+							<view>
+								<checkbox :value="item.value" :checked="item.checked" color="#42b983"/>
+							</view>
+							<view>{{item.name}}</view>
+						</label>
+					</checkbox-group>
+				</view>
+			</view>
+			<view class="list">
+				<view class="top">
+					<view class="title">重复收取</view>
+					<radio-group @change="radioChange">
+						<label v-for="(item, index) in repetition" :key="item.value">
+							<view>
+								<radio :value="item.value" :checked="index === current" color="#42b983"/>
+							</view>
+							<view>{{item.name}}</view>
+						</label>
+					</radio-group>
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<view class="btn cancel" hover-class="seimin-btn-hover" @click="goBack()">取消</view>
+			<view class="btn affirm" hover-class="seimin-btn-hover" @click="submit()">确定</view>
+		</view>
+  </view>
+</template>
+
+<script>
+  import { get, post} from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        list: [],
+				startDept:[],
+				checkoutDept:[],
+				speStateData:[],
+				testTube:[],
+				urgencyData:[
+					{value:'1',name:'紧急',checked:false},
+					{value:'0',name:'普通',checked:false},
+				],
+				repetition:[
+					{value:'1',name:'是'},
+					{value:'0',name:'否'},
+				],
+				current:null,
+				gdId:null,
+				id:null,
+				detailHosId:null,
+				back:0
+      };
+    },
+		onLoad(options) {
+			console.log('options111111', options);
+			this.gdId = options.id
+			if(options.back){
+				this.back = 1
+			}else{
+				this.back = 0
+			}
+			this.getSpeDetail()
+			let startDept = uni.getStorageSync('startDept')
+			let checkoutDept = uni.getStorageSync('checkoutDept')
+			let testTube = uni.getStorageSync('testTube')
+			let speState = uni.getStorageSync('speState')
+			if(startDept){ //需要追加
+				this.startDept = JSON.parse(startDept)
+			}
+			 if (checkoutDept){ //需要追加
+				this.checkoutDept = JSON.parse(checkoutDept)
+			}
+			 if (testTube){
+				this.testTube = JSON.parse(testTube)
+			}
+			 if (speState){
+				this.speStateData = JSON.parse(speState)
+			}
+		},
+    methods:{
+			getSpeDetail(){
+				post("/simple/data/fetchDataList/speOrderCollectInfo", {
+					idx: 0,
+					sum: 9999,
+					speOrderCollectInfo:{
+						gdId: this.gdId,
+						hosId: this.hosId
+					}
+				}).then((result) => {
+				  uni.hideLoading();
+				  if (result.status == 200) {
+						this.list = result.list[0] || [];
+						this.id = result.list[0].id
+						this.detailHosId = result.list[0].hosId
+						this.createTime = result.list[0].createTime
+						if(result.list[0].collectDeptList){
+							for(let i of this.startDept){
+								result.list[0].collectDeptList.push(i)
+							}
+							let data = result.list[0].collectDeptList
+							let newList2 = []
+							let newList3 = []
+							data.forEach((item) => {
+								if (!newList2.includes(item.id)) {
+									newList2.push(item.id)
+								}
+							})
+							newList2.forEach(i=>{
+								newList3.push(data.find(x=> x.id == i))
+							})
+							this.startDept = newList3
+						}
+						if(result.list[0].testDeptList){
+							for(let i of this.checkoutDept){
+								result.list[0].testDeptList.push(i)
+							}
+							let data = result.list[0].testDeptList
+							let newList2 = []
+							let newList3 = []
+							data.forEach((item) => {
+								if (!newList2.includes(item.id)) {
+									newList2.push(item.id)
+								}
+							})
+							newList2.forEach(i=>{
+								newList3.push(data.find(x=> x.id == i))
+							})
+							this.checkoutDept = newList3
+						}else{
+							let data = this.checkoutDept
+							let newList2 = []
+							let newList3 = []
+							data.forEach((item) => {
+								if (!newList2.includes(item.id)) {
+									newList2.push(item.id)
+								}
+							})
+							newList2.forEach(i=>{
+								newList3.push(data.find(x=> x.id == i))
+							})
+							this.checkoutDept = newList3
+						}
+						if(result.list[0].tubeTypeList){
+							if(this.back == 0 || this.testTube.length==0){
+								this.testTube = this.testTube.concat(result.list[0].tubeTypeList) 
+							}
+						}
+						if(result.list[0].speStateList){
+							if(this.back == 0 || this.speStateData.length==0){
+								this.speStateData = this.speStateData.concat(result.list[0].speStateList) 
+							}
+						}
+						if(result.list[0].urgent){
+							let urgent = result.list[0].urgent.split(',')
+							this.urgencyData.forEach(i=>{
+								for(let x of urgent){
+									if(i.value == x){
+										i.checked = true
+									}
+								}
+							})
+						}
+						result.list[0].repeatCollect = result.list[0].repeatCollect+''
+						if(result.list[0].repeatCollect){
+							for (let i = 0; i < this.repetition.length; i++) {
+									if (this.repetition[i].value == result.list[0].repeatCollect) {
+											this.current = i;
+											break;
+									}
+							}
+						}
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: result.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			},
+      goBack() {
+        uni.navigateBack();
+      },
+			search(type){
+				uni.navigateTo({
+				  url: `../searchSqType/searchSqType?type=${type}&id=${this.gdId}`
+				});
+			},
+			delect(index, type){
+				if(type=='1'){
+					this.startDept.splice(index, 1)
+					uni.setStorageSync('startDept', JSON.stringify(this.startDept))
+				}else if (type=='2'){
+					this.checkoutDept.splice(index, 1)
+					uni.setStorageSync('checkoutDept', JSON.stringify(this.checkoutDept))
+				}else if (type=='3'){
+					this.testTube.splice(index, 1)
+					uni.setStorageSync('testTube', JSON.stringify(this.testTube))
+				}else if (type=='4'){
+					this.speStateData.splice(index, 1)
+					uni.setStorageSync('speState', JSON.stringify(this.speStateData))
+				}
+			},
+			submit(){
+				uni.showLoading({
+				  title: '加载中',
+				  mask: true,
+				})
+				let data = {
+					id: this.id,
+					gdId: this.gdId,
+					hosId: this.detailHosId,
+					createTime: this.createTime,
+					collectDept: this.startDept && this.startDept.length>0 ? this.startDept.map(i => { return i.id}).join(',') : undefined,
+					repeatCollect: this.repetition[this.current] && this.repetition[this.current].value || undefined,
+					speState: this.speStateData && this.speStateData.length>0 ? this.speStateData.map(i => { return i.id}).join(',') : undefined,
+					testDept: this.checkoutDept && this.checkoutDept.length>0 ? this.checkoutDept.map(i => { return i.id}).join(',') : undefined,
+					tubeType: this.testTube && this.testTube.length>0 ? this.testTube.map(i => { return i.id}).join(',') : undefined,
+					urgent: null
+				}
+				let value = []
+				this.urgencyData.forEach(i=>{
+					if(i.checked){
+						value.push(i.value)
+					}
+				})
+				if(value.length>0){
+					data.urgent = value.join(',')
+				}else{
+					delete data.urgent
+				}
+				post("/simple/data/updData/speOrderCollectInfo", data).then((result) => {
+				  uni.hideLoading();
+				  if (result.status == 200) {
+						uni.removeStorageSync('startDept')
+						uni.removeStorageSync('checkoutDept')
+						uni.removeStorageSync('testTube')
+						uni.removeStorageSync('speState')
+						let sessData = uni.getStorageSync('gdData')
+						let data = null
+						if(sessData){
+							data = JSON.parse(sessData)
+						}else{
+							data = null
+						}
+						uni.navigateTo({
+						  url: `../scanning_Result/scanning_Result?${data}&intercept=1&isShow=0`,
+						});
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: result.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			},
+			radioChange(evt) {
+					for (let i = 0; i < this.repetition.length; i++) {
+							if (this.repetition[i].value == evt.detail.value) {
+									this.current = i;
+									break;
+							}
+					}
+			},
+			checkboxChange(e){
+				var items = this.urgencyData,
+						values = e.detail.value;
+					for (var i = 0, lenI = items.length; i < lenI; ++i) {
+						const item = items[i]
+						if(values.includes(item.value)){
+							this.$set(item,'checked',true)
+						}else{
+							this.$set(item,'checked',false)
+						}
+					}
+			},
+      selectItem(user){
+        uni.redirectTo({
+          url: `/pages/transferWorkOrder/transferWorkOrderPatient?userId=${user.id}&userName=${user.name}&userAccount=${user.account}`,
+        });
+      },
+      getList(keyword){
+        uni.showLoading({
+          title: "加载中",
+        });
+        post("/simple/data/fetchDataList/user", {
+          idx: 0,
+          sum: 25,
+          user: {
+            hosId: this.hosId,
+            name: keyword || undefined,
+            online: true,
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            this.list = result.list || [];
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+	uni-checkbox-group,
+	uni-radio-group{
+		display: flex;
+	}
+	.uni-label-pointer{
+		display: flex;
+		margin-left: 20rpx;
+	}
+/* 	uni-radio-group{
+		
+	} */
+</style>
+<style lang="less" scoped>
+.container{
+  width: 100%;
+	height: 100vh;
+	.title{
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #49B856;
+		text-align: center;
+		padding: 20rpx 0;
+	}
+	.content{
+		height: 82vh;
+		overflow-y: auto;
+		.list{
+			.top{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 20rpx;
+				border-bottom: 1px solid #E6E6E6;
+				.title{
+					font-size: 32rpx;
+					font-weight: bold;
+					color: #000;
+				}
+				.right-icon{
+					color: #888;
+				}
+			}
+			.content{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 20rpx;
+				height: 80rpx;
+				.name{
+					
+				}
+				.right-icon{
+					color: #888;
+				}
+			}
+		}
+	}
+  .footer{
+		padding: 0 20rpx;
+    margin-top: 24rpx;
+    margin-bottom: 24rpx;
+    line-height: 80rpx;
+    height: 80rpx;
+    background: #fff;
+    display: flex;
+		justify-content: space-between;
+    align-items: center;
+    .btn {
+			width: 48%;
+      height: 80rpx;
+      border-radius: 8rpx;
+      font-size: 32rpx;
+      text-align: center;
+    }
+		.affirm{
+			background-color: #49B856;
+			color: #fff;
+		}
+		.cancel{
+			background-color: #AFAFAF;
+			color: #fff;
+		}
+  }
+}
+
+</style>

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe644;</span>
+                <div class="name">修改</div>
+                <div class="code-name">&amp;#xe644;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xea89;</span>
                 <div class="name">休息中</div>
                 <div class="code-name">&amp;#xea89;</div>
@@ -732,9 +738,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1744858396442') format('woff2'),
-       url('iconfont.woff?t=1744858396442') format('woff'),
-       url('iconfont.ttf?t=1744858396442') format('truetype');
+  src: url('iconfont.woff2?t=1747104804641') format('woff2'),
+       url('iconfont.woff?t=1747104804641') format('woff'),
+       url('iconfont.ttf?t=1747104804641') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -761,6 +767,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-weibiaoti2010104"></span>
+            <div class="name">
+              修改
+            </div>
+            <div class="code-name">.newicon-weibiaoti2010104
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-xiuxizhong"></span>
             <div class="name">
               休息中
@@ -1779,6 +1794,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-weibiaoti2010104"></use>
+                </svg>
+                <div class="name">修改</div>
+                <div class="code-name">#newicon-weibiaoti2010104</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-xiuxizhong"></use>
                 </svg>
                 <div class="name">休息中</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304849 */
-  src: url('~@/static/font/iconfont.woff2?t=1744858396442') format('woff2'),
-       url('~@/static/font/iconfont.woff?t=1744858396442') format('woff'),
-       url('~@/static/font/iconfont.ttf?t=1744858396442') format('truetype');
+  src: url('~@/static/font/iconfont.woff2?t=1747104804641') format('woff2'),
+       url('~@/static/font/iconfont.woff?t=1747104804641') format('woff'),
+       url('~@/static/font/iconfont.ttf?t=1747104804641') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-weibiaoti2010104:before {
+  content: "\e644";
+}
+
 .newicon-xiuxizhong:before {
   content: "\ea89";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "1069107",
+      "name": "修改",
+      "font_class": "weibiaoti2010104",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
       "icon_id": "8189388",
       "name": "休息中",
       "font_class": "xiuxizhong",