Merge branch 'master' into develop

components/bigScreen/bigScreen.vue

@@ -516,8 +516,15 @@
       },
       // 底部扫描
       Scanning(qrcodePrefix = '') {
-				// 标本码
-				// this.ScanningCommon('', '250529338897@_1');
+				// 起点科室-综合交接
+				// this.ScanningCommon('', '87bdf1c7-1514-4fa8-8fa4-07f37c06bec7');
+				// 起点科室-非综合交接
+				// this.ScanningCommon('', '5465456466546546565');
+				// 终点科室-综合交接
+				// this.ScanningCommon('', '7868686868688');
+				
+				// 发起中转配送
+				// this.ScanningCommon('', '05ae81fc-3f07-4b8a-bbcb-53c40ede7d3d');
 				
 				// 快捷建单-轮巡工单码
 				// this.ScanningCommon('', '3330ec8e-76eb-413e-b000-995f08d2ff96');
@@ -763,7 +770,17 @@
                           url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${res.code}`,
                         });
                       }
-                    }
+											// 扫描中转交接码/终点科室-综合交接
+                    } else if(res.type == 'businessHandover'){
+                      uni.navigateTo({
+                        url: `/pages/transferConnect/transferConnect?data=${JSON.stringify(res)}`,
+                      });
+											// 扫描中转配送建单
+                    } else if(res.type == 'quickOrderBusinessHandover'){
+											uni.navigateTo({
+											  url: `/pages/transferDistribution/transferDistribution?data=${JSON.stringify(res)}`,
+											});
+										}
                   } else {
                     if(res.bigScanSpecialMsg){
                       uni.navigateTo({

pages.json

@@ -818,7 +818,52 @@
         },
         "enablePullDownRefresh": true
       }
-    }
+    },
+		{
+		  "path": "pages/transferConnect/transferConnect",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    },
+		    "enablePullDownRefresh": false
+		  }
+		},
+		{
+		  "path": "pages/sponsorTask/sponsorTask",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    },
+		    "enablePullDownRefresh": false
+		  }
+		},
+		{
+		  "path": "pages/sponsorTaskBuild/sponsorTaskBuild",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    },
+		    "enablePullDownRefresh": false
+		  }
+		},
+		{
+		  "path": "pages/taskTypeSearch/taskTypeSearch",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    },
+		    "enablePullDownRefresh": false
+		  }
+		},
+		{
+		  "path": "pages/transferDistribution/transferDistribution",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    },
+		    "enablePullDownRefresh": false
+		  }
+		}
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -24,6 +24,12 @@
           </radio-group>
         </view>
       </view>
+			<view class="goWorkSelect history" v-if="digitalHandoverSwitch">
+			  <view class="goWorkSelect-head">请填写交接数量</view>
+			  <view class="goWorkSelect-list">
+					<input class="input-num" type="number" v-model="digitalNum">
+			  </view>
+			</view>
       <view class="goWorkSelect history" v-if="actionPhotoSwitch">
         <view class="goWorkSelect-head">您需要拍摄现场照片才可{{tips}}！</view>
         <view class="goWorkSelect-list">
@@ -70,6 +76,9 @@
         currentData: {}, //当前小扫描的工单对象
         orderId: undefined,
         order: {},
+				digitalNum:null,
+				// 数字交接
+				digitalHandoverSwitch: false,
         // 拍照动作开关
         actionPhotoSwitch: false,
         // 确认动作开关
@@ -88,7 +97,6 @@
       // 其他临床服务-运输过程-终点科室是否开通备注填写
       isOpenTransportationProcessRemarks(data, accountObj, funName){
         const tasktype = data.taskType;
-        console.log(tasktype, data);
         if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[this.currentIndex].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)) : ''}`
@@ -138,7 +146,6 @@
         }
         this.hosModels.disjunctor = false;
         let associationTypeValue = this.currentData.taskType.associationType.value;
-        console.log(associationTypeValue)
         if(this.actionPhotoSwitch && this.actionConfirmSwitch){
           this.isOpenTransportationProcessRemarks(this.currentData, data, 'uploadToOther');
         }else if(this.actionConfirmSwitch){
@@ -147,6 +154,9 @@
         }else if(this.actionPhotoSwitch){
           // 拍照
           this.isOpenTransportationProcessRemarks(this.currentData, data, 'uploadToOther');
+        }else if(this.digitalHandoverSwitch){
+          // 数字交接
+          this.isOpenTransportationProcessRemarks(this.currentData, data, 'nextDeptOrder_ss');
         }
       },
       // 填写交接人工号-取消
@@ -197,6 +207,15 @@
           });
           return;
         }
+				if(this.digitalHandoverSwitch && !this.digitalNum){
+				  uni.showToast({
+				    icon: "none",
+				  	title: '请填写交接数量',
+				  	duration: 2000
+				  });
+				  return;
+				}
+				
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -235,7 +254,10 @@
             }else if(this.actionPhotoSwitch){
               // 拍照
               this.isOpenTransportationProcessRemarks(data, accountObj, 'uploadToOther');
-            }
+            }else if(this.digitalHandoverSwitch){
+							// 数字交接
+							this.isOpenTransportationProcessRemarks(data, accountObj, 'nextDeptOrder_ss');
+						}
           } else if (result.state == '0000') {
             uni.hideLoading();
             this.showSelectAccount();
@@ -306,7 +328,7 @@
           value: i,
           name: v,
         }));
-        
+        this.digitalHandoverSwitch = options.taskType.carryingCourses[this.currentIndex].digitalHandover;
         this.actionPhotoSwitch = options.taskType.carryingCourses[this.currentIndex].actionPhotoSwitch;
         this.actionConfirmType = options.taskType.carryingCourses[this.currentIndex].actionConfirmType;
       }
@@ -431,7 +453,16 @@
 
         .goWorkSelect-list {
           padding: 16rpx;
-
+					
+					.input-num {
+					  height: 60rpx;
+					  border: 2rpx solid #E5E5E5;
+					  border-radius: 5rpx;
+					  // width: 100%;
+					  padding-left: 10rpx;
+					  // padding-right: 10rpx;
+					}
+					
           .goWorkSelect-item {
             height: 52rpx;
             display: flex;

pages/receiptpage/receiptpage.vue

@@ -1741,6 +1741,10 @@
             this.content.push({
               text: "陪检闭环",
             });
+          } else if (item.link === "sponsorTask") {
+            this.content.push({
+              text: "发起任务",
+            });
           }
         });
       },
@@ -2213,6 +2217,10 @@
           uni.navigateTo({
             url: "/pages/patientInspectLog/patientInspectLogList",
           });
+        } else if (e.item.text === "发起任务") {
+          uni.navigateTo({
+            url: "/pages/sponsorTask/sponsorTask",
+          });
         }
       },
       //确定

pages/scanning_all/scanning_all.vue

@@ -422,7 +422,7 @@
                 )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
                 });
               }
-            } else {
+            } else { //一键操作 走这里
               uni.navigateTo({
                 url: `../scanning_djEnd/scanning_djEnd?type=${
                 this.tabType
@@ -435,7 +435,22 @@
             }
           } else if (res.status == "0000") {
             this.showSelectAccount();
-          } else {
+          } else if (res.status == "2001") {
+						uni.navigateTo({
+						  url: `../otherCompleteOrder/otherCompleteOrder?orderId=${this.userId.ids[0]}&taskType=${res.workOrder.taskType ? encodeURIComponent(JSON.stringify(res.workOrder.taskType)) : ''}&order=${res.workOrder ? encodeURIComponent(JSON.stringify(res.workOrder)) : ''}`,
+						});
+          }else if (res.status == "2005") {
+            uni.showToast({
+              icon: "none",
+              title: res.info,
+            });
+						this.flag = true;
+						// setTimeout(_=>{
+						// 	uni.redirectTo({
+						// 		url:'/pages/receiptpage/receiptpage'
+						// 	})
+						// },1000)
+          }else {
             this.flag = true;
             uni.navigateTo({
               url: `../scanning_djEnd/scanning_djEnd?type=${this.tabType}&type1=${

pages/sponsorTask/sponsorTask.vue

@@ -0,0 +1,327 @@
+<template>
+  <view class="HomeItem">
+    <view class="goWorkAll">
+			<view class="title">请选择要建单的任务类型</view>
+			<view class="goWorkSelect history">
+			  <view class="goWorkSelect-list" v-for="(item, i) in list" @click="itemClick(item)">
+					{{item.taskName}}
+				</view>
+			</view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn3" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+				list:[],
+				hosId: uni.getStorageSync('userData').user.currentHospital.id,
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+				uni.navigateTo({
+					url:'/pages/receiptpage/receiptpage'
+				})
+      },
+			itemClick(item){
+				uni.navigateTo({
+					url:'/pages/sponsorTaskBuild/sponsorTaskBuild?data=' + JSON.stringify(item)
+				})
+			},
+			getTaskType(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let postData= {
+					idx: 0,
+					sum: 9999,
+					taskType:{
+						hosIds: this.hosId,
+						simpleQuery: true
+					}
+				}
+				post("/configuration/fetchDataList/taskType", postData).then((res) => {
+					uni.hideLoading();
+				  if(res.status == 200){
+						let data = res.list.filter(i=>i.deliveryUserCreate && i.deliveryUserCreate==1)
+						this.list = data
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: res.info || "接口获取数据失败！",
+				    });
+				  }
+				});
+			}
+    },
+    onLoad(options) {
+      this.getTaskType();
+      this.options = options;
+      if(options.order){
+        options.order = JSON.parse(options.order);
+        this.order = options.order;
+        if(this.order.gdState.value == 4){
+          this.currentIndex = 0;
+          this.tips = '确认到达';
+        }else if(this.order.gdState.value == 5){
+          this.currentIndex = 1;
+          this.tips = '完成工单';
+        }
+      }
+      if(options.orderId){
+        this.orderId = options.orderId;
+      }
+      if(options.taskType){
+        options.taskType = JSON.parse(options.taskType);
+        this.actionConfirmSwitch = options.taskType.carryingCourses[this.currentIndex].actionConfirmSwitch;
+        let actions = options.taskType.carryingCourses[this.currentIndex].actionRemarks || "";
+        this.actions = actions.split('$').map((v, i) => ({
+          value: i,
+          name: v,
+        }));
+        this.digitalHandoverSwitch = options.taskType.carryingCourses[this.currentIndex].digitalHandover;
+        this.actionPhotoSwitch = options.taskType.carryingCourses[this.currentIndex].actionPhotoSwitch;
+        this.actionConfirmType = options.taskType.carryingCourses[this.currentIndex].actionConfirmType;
+      }
+    },
+  };
+</script>
+
+<style lang="less" scoped>
+  .HomeItem {
+    .foot_btn_spe {
+      width: 100%;
+      position: fixed;
+      bottom: 30rpx;
+      left: 0;
+      line-height: 88rpx;
+      height: 88rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+    
+      &::after {
+        content: '';
+        flex: 1;
+      }
+    
+      view {
+        height: 88rpx;
+        width: 100%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+
+    .login {
+      height: 420rpx;
+      padding: 0 32rpx;
+      padding-top: 164rpx;
+      position: relative;
+      z-index: 999;
+
+      .savePassword {
+        margin-top: 32rpx;
+      }
+
+      /deep/ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+        border-color: #42b983 !important;
+      }
+
+      .login_input {
+        margin-top: 32rpx;
+        background-color: #ffffff;
+        height: 72rpx;
+        box-sizing: border-box;
+        padding: 16rpx;
+      }
+
+      .title {
+        font-size: 36rpx;
+        color: #42b983;
+        text-align: center;
+      }
+
+      .tips {
+        font-size: 28rpx;
+        color: red;
+        margin-top: 16rpx;
+      }
+
+      .page_item_btn {
+        height: 88rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        border-radius: 8rpx;
+        line-height: 88rpx;
+        color: #fff;
+        font-size: 36rpx;
+        font-weight: 700;
+        margin-top: 64rpx;
+        text-align: center;
+      }
+    }
+
+    //上班页面
+    .goWorkAll {
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      /deep/ .uni-radio-input-checked {
+        background-color: #42b983 !important;
+        border-color: #42b983 !important;
+      }
+      /deep/ .uni-checkbox-input-checked {
+        color: #42b983 !important;
+      }
+			
+			.title{
+				text-align: center;
+				color: #64BD7B;
+				line-height: 80rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
+			}
+			
+      .goWorkSelect {
+        &.history {
+          height: 81vh;
+          overflow-y: auto;
+          margin-top: 80rpx;
+          padding-bottom: 16rpx;
+        }
+
+        &.combination {
+          .goWorkSelect-head {}
+
+          .goWorkSelect-list {}
+        }
+
+        .goWorkSelect-head {
+          font-size: 28rpx;
+          line-height: 80rpx;
+          border-bottom: 2rpx solid #E5E5E5;
+          text-align: center;
+        }
+
+        .goWorkSelect-list {
+          text-align: center;
+					line-height: 80rpx;
+					border-bottom: 1rpx solid #E5E5E5;
+					
+					.input-num {
+					  height: 60rpx;
+					  border: 2rpx solid #E5E5E5;
+					  border-radius: 5rpx;
+					  // width: 100%;
+					  padding-left: 10rpx;
+					  // padding-right: 10rpx;
+					}
+					
+          .goWorkSelect-item {
+            height: 52rpx;
+            display: flex;
+            align-items: center;
+            border-bottom: 2rpx solid #e5e9ed;
+            padding: 16rpx;
+
+            &.relative {
+              position: relative;
+
+              .picker {
+                position: absolute;
+                width: 100%;
+                padding-left: 64rpx;
+              }
+            }
+
+            button {
+              font-size: 32rpx;
+              height: 52rpx;
+              line-height: 52rpx;
+              margin: 0;
+              margin-left: 16rpx;
+              color: rgb(7, 134, 60);
+              font-weight: 700;
+            }
+          }
+        }
+      }
+    }
+
+    .goWork {
+      margin: 0 auto 48rpx;
+      width: 240rpx;
+      height: 240rpx;
+
+      .goWork_btn_E {
+        width: 100%;
+        height: 100%;
+        background: #bee1a7;
+        border-radius: 30%;
+
+        .goWork_btn_W {
+          width: 75%;
+          height: 75%;
+          background-image: linear-gradient(to right, #72c172, #3bb197);
+          border-radius: 30%;
+          margin: 0 auto;
+          position: relative;
+          top: 12.5%;
+          line-height: 180rpx;
+          color: #fff;
+          font-size: 36rpx;
+          text-align: center;
+        }
+      }
+    }
+
+    .goWork_text {
+      width: 100%;
+
+      view {
+        text-align: center;
+      }
+
+      .goWork_text-p {
+        font-size: 36rpx;
+        margin-bottom: 48rpx;
+      }
+    }
+
+    .botImg {
+      height: 600rpx;
+      width: 100%;
+      position: fixed;
+      bottom: 0;
+
+      .img {
+        height: 100%;
+        background: url("../../static/img/BG.png") no-repeat center center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+</style>

pages/sponsorTaskBuild/sponsorTaskBuild.vue

@@ -0,0 +1,655 @@
+<template>
+  <view class="HomeItem">
+    <view class="goWorkAll">
+			<view class="title">{{taskName}}</view>
+			<view class="goWorkSelect history">
+			  <view class="goWorkSelect-list">
+					<view class="list-title">申请科室：</view>
+					<view @click="searchDept('applyDept')" :class="applyDeptId ? 'black' : 'gray'">
+						{{applyDept}}
+					</view>
+					<text class="right-icon newicon newicon-weibiaoti2010104" @click="searchDept('applyDept')"></text>
+					<text class="toolbar-icon newicon newicon-saoma" @click="scan()"></text>
+				</view>
+				<view class="goWorkSelect-list">
+					<view class="list-title">起点科室：</view>
+					<view @click="searchDept('startDept')" :class="startDeptId ? 'black' : 'gray'">
+						{{startDept}}
+					</view>
+					<text v-if="startTarget==202 || startTarget==204 || startTarget==205" class="right-icon newicon newicon-weibiaoti2010104" @click="searchDept('startDept')"></text>
+				</view>
+				<view class="goWorkSelect-list">
+					<view class="list-title">终点科室：</view>
+					<view @click="searchDept('endDept')" :class="endDeptId ? 'black' : 'gray'">
+						{{endDept}}
+					</view>
+					<text v-if="endTarget==202 || endTarget==204 || endTarget==205" class="right-icon newicon newicon-weibiaoti2010104" @click="searchDept('endDept')"></text>
+				</view>
+				<view class="goWorkSelect-list besides" v-if="remarksSwitch==1">
+					<view class="list-title">备注信息：</view>
+					<textarea v-model="remark" :placeholder="remarksPrompts"/>
+				</view>
+			</view>
+    </view>
+    <view class="foot_btn_spe">
+			<view class="btn3" @click="submit">建单</view>
+      <view class="btn3" @click="goBack">返回</view>
+    </view>
+		
+		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" :content="content" @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+  </view>
+</template>
+
+<script>
+  import {
+    get,
+    post,
+    webHandle,
+		SM
+  } from "../../http/http.js";
+	
+  export default {
+    data() {
+      return {
+				list:[],
+				hosId: uni.getStorageSync('userData').user.currentHospital.id,
+				SMFlag:true,
+				applyDept:"请选择申请科室",
+				applyDeptId:null,
+				startDept:"请选择起点科室",
+				startDeptId:null,
+				endDept:"请选择终点科室",
+				endDeptId:null,
+				remark:null,
+				itemTaskType:null,
+				remarksSwitch:null,
+				remarksPrompts:null,
+				startTarget:null,
+				endTarget:null,
+				taskTypeData:null, //点击的任务类型数据
+				taskTypeId: null,
+				content:null,
+				tipsCreateOder:null
+      };
+    },
+    methods: {
+			// 清空缓存
+			setSess(){
+				uni.setStorageSync('applyDept', null)
+				uni.setStorageSync('taskStartDept', null)
+				uni.setStorageSync('taskEndDept', null)
+				uni.setStorageSync('sponsorTaskBuildData', null)
+			},
+      // 返回
+      goBack() {
+				this.setSess();
+				uni.navigateTo({
+					url:'/pages/sponsorTask/sponsorTask'
+				})
+      },
+			// 建单
+			submit(){
+				if(!this.applyDeptId){
+					uni.showToast({
+					  icon: 'none',
+					  title: '申请科室不能为空'
+					});
+					return
+				}
+				if(!this.startDeptId){
+					uni.showToast({
+					  icon: 'none',
+					  title: '起点科室不能为空'
+					});
+					return
+				}
+				if(!this.endDeptId){
+					uni.showToast({
+					  icon: 'none',
+					  title: '终点科室不能为空'
+					});
+					return
+				}
+				this.content = `您将前往【${this.startDept}】执行【${this.taskName}】,送往【${this.endDept}】,确定建单吗？`
+				this.$refs.alertDialog.open()
+			},
+			
+			// 确定中转
+			dialogConfirm(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let data = {
+					workOrder:{
+						tipsCreateOder: null,
+						worker:{
+							id: uni.getStorageSync('userData').user.id
+						},
+						createDept: this.applyDeptId,
+						startDept:{
+							id: this.startDeptId
+						},
+						endDepts:{
+							id: this.endDeptId
+						},
+						sourceId: 4,
+						workOrderRemark: this.remark,
+						taskType:{
+							id : this.taskTypeId
+						}
+					}
+				}
+				if(this.tipsCreateOder == 1){
+					data.tipsCreateOder = 1
+				}else{
+					data.tipsCreateOder = undefined
+				}
+				post("/api/startOrder", data).then((res2) => {
+				  uni.hideLoading();
+				  if (res2.status == 200) {
+						this.tipsCreateOder = null
+						uni.showToast({
+						  icon: 'none',
+						  title: '操作成功'
+						});
+						this.setSess()
+						setTimeout(_=>{
+							uni.redirectTo({
+								url:'/pages/receiptpage/receiptpage'
+							})
+						},1500)
+				  } else if(res2.status == 1000033){
+						this.tipsCreateOder = 1
+						this.content = res2.msg
+						this.$refs.alertDialog.close()
+						setTimeout(_=>{
+							this.$refs.alertDialog.open()
+						},500)
+				  } else {
+						uni.showToast({
+						  icon: 'none',
+						  title: res2.msg || '请求数据失败！'
+						});
+					}
+				});
+			},
+			// 取消
+			dialogClose(){
+				this.tipsCreateOder = null
+				this.$refs.alertDialog.close()
+			},
+			// 搜索科室
+			searchDept(type){
+				if(type=='startDept'){
+					if(this.startTarget==201 || this.startTarget==203){
+						return
+					}
+				}
+				if(type=='endDept'){
+					if(this.endTarget==201 || this.endTarget==203){
+						return
+					}
+				}
+				let data = {
+					applyDept:this.applyDept,
+					applyDeptId:this.applyDeptId,
+					startDept:this.startDept,
+					startDeptId:this.startDeptId,
+					endDept:this.endDept,
+					endDeptId:this.endDeptId,
+					remark:this.remark
+				}
+				uni.setStorageSync('sponsorTaskBuildData', JSON.stringify(data))
+				uni.navigateTo({
+				  url: `../taskTypeSearch/taskTypeSearch?type=${type}&startTarget=${this.startTarget}&endTarget=${this.endTarget}&taskTypeData=${JSON.stringify(this.taskTypeData)}&taskTypeId=${this.taskTypeId}&taskName=${this.taskName}`
+				});
+			},
+			// 扫描科室
+			scan(){
+				if (!this.SMFlag) {
+				  return;
+				}
+				this.SMFlag = false;
+				// let content = '87bdf1c7-1514-4fa8-8fa4-07f37c06bec7'
+				SM().then((content) => {
+					uni.showLoading({
+					  title: "加载中",
+					  mask: true,
+					});
+					let data = {
+						getDeptInfo: true,
+						content: content
+					}
+					post("/dept/scanning" , data).then((res2) => {
+						this.SMFlag = true;
+					  uni.hideLoading();
+					  if (res2.state == 200) {
+							this.applyDept = res2.data.dept
+							this.applyDeptId = res2.data.id
+							if(this.startTarget==201){
+								this.startDept = res2.data.dept
+								this.startDeptId = res2.data.id
+							}
+							if(this.endTarget==201){
+								this.endDept = res2.data.dept
+								this.endDeptId = res2.data.id
+							}
+					  } else {
+					    uni.showToast({
+					      icon: 'none',
+					      title: res2.msg || '请求数据失败！'
+					    });
+					  }
+					});
+				}).catch(err => {
+				  this.SMFlag = true;
+				});
+			},
+			getTaskType(id){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let postData= {
+					taskTypeId: id
+				}
+				post("/ser/getdeptList", postData).then((res) => {
+					uni.hideLoading();
+				  this.taskTypeData = res
+					this.startTarget = this.taskTypeData.startStatus
+					this.endTarget = this.taskTypeData.endStatus
+					if(this.startTarget==203){
+						this.startDept = this.taskTypeData.startDept[0].dept
+						this.startDeptId = this.taskTypeData.startDept[0].id
+					}
+					if(this.endTarget==203){
+						this.endDept = this.taskTypeData.endDept[0].dept
+						this.endDeptId = this.taskTypeData.endDept[0].id
+					}
+					this.remarksSwitch = this.taskTypeData.taskType.remarksSwitch
+					this.remarksPrompts = this.taskTypeData.taskType.remarksPrompts
+				});
+			}
+    },
+		onUnload(){
+			this.setSess();
+		},
+		onShow(options){
+			
+		},
+    onLoad(options) {
+			console.log(111, options)
+			let sponsorTaskBuildData = uni.getStorageSync('sponsorTaskBuildData')
+			let applyDept = uni.getStorageSync('applyDept')
+			let taskStartDept = uni.getStorageSync('taskStartDept')
+			let taskEndDept = uni.getStorageSync('taskEndDept')
+			if(applyDept){
+				// 科室类型：201：默认发起科室
+				// 科室类型：202：固定科室范围
+				// 科室类型：203：固定科室
+				// 科室类型：204：自主填写
+				// 科室类型：205：固定科室类型
+				let data = JSON.parse(applyDept)
+				this.applyDept = data.dept
+				this.applyDeptId = data.id
+				if(options.startTarget){
+					this.startTarget = options.startTarget
+				}
+				if(options.endTarget){
+					this.endTarget = options.endTarget
+				}
+				console.log(456, this.startTarget)
+				if(this.startTarget==201){
+					this.startDept = data.dept
+					this.startDeptId = data.id
+				}
+				if(this.endTarget==201){
+					this.endDept = data.dept
+					this.endDeptId = data.id
+				}
+			}
+			 if (taskStartDept){
+				 let data = JSON.parse(taskStartDept)
+				 if(this.startTarget!=201){
+					 this.startDept = data.dept
+					 this.startDeptId = data.id
+				 }
+			}
+			 if (taskEndDept){
+				 let data = JSON.parse(taskEndDept)
+				 if(this.endTarget!=201){
+						this.endDept = data.dept
+						this.endDeptId = data.id
+				 }
+			}
+			// 之前有填写过数据-回显
+			if(sponsorTaskBuildData){
+				let data = JSON.parse(sponsorTaskBuildData)
+				console.log(777, data)
+				if(!applyDept){
+					if(data.applyDept){
+						this.applyDept = data.applyDept
+						this.applyDeptId = data.applyDeptId
+					}
+				}
+				
+				if(!taskStartDept){
+					if(data.startDept && this.startTarget!=201){
+						this.startDept = data.startDept
+						this.startDeptId = data.startDeptId
+					}
+				}
+				
+				if(!taskEndDept){
+					if(data.endDept && this.endTarget!=201){
+						this.endDept = data.endDept 
+						this.endDeptId = data.endDeptId 
+					}
+				}
+
+				if(data.remark){
+					this.remark = data.remark
+				}
+			}
+			
+      if(options.data){
+        options.data = JSON.parse(options.data);
+				this.getTaskType(options.data.id);
+				this.taskTypeId = options.data.id;
+				this.taskName = options.data.taskName;
+			}
+			
+			if(options.taskTypeId){
+				this.taskTypeId = options.taskTypeId;
+				this.taskName = options.taskName;
+				this.getTaskType(options.taskTypeId);
+			}
+    },
+  };
+</script>
+
+<style scoped>
+	/deep/ .uni-textarea-wrapper{
+	border: 1rpx solid #E5E5E5;
+	padding-left: 6rpx;
+}
+/deep/ .uni-textarea-placeholder{
+	padding: 6rpx;
+}
+/deep/ .uni-button-color{
+	color: #64BD7B;
+}
+</style>
+<style lang="less" scoped>
+	.black{
+		color: #000;
+		width: 400rpx;
+		// overflow:hidden;/*内容超出后隐藏*/
+		// text-overflow:ellipsis;/*超出内容显示为省略号*/
+		// white-space:nowrap;
+	}
+	.gray{
+		color: #7b7b7b;
+		width: 400rpx;
+		// overflow:hidden;/*内容超出后隐藏*/
+		// text-overflow:ellipsis;/*超出内容显示为省略号*/
+		// white-space:nowrap;
+	}
+  .HomeItem {
+    .foot_btn_spe {
+      width: 100%;
+      position: fixed;
+      bottom: 30rpx;
+      left: 0;
+      line-height: 88rpx;
+      height: 88rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+    
+      &::after {
+        content: '';
+        flex: 1;
+      }
+    
+      view {
+        height: 88rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+
+    .login {
+      height: 420rpx;
+      padding: 0 32rpx;
+      padding-top: 164rpx;
+      position: relative;
+      z-index: 999;
+
+      .savePassword {
+        margin-top: 32rpx;
+      }
+
+      /deep/ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+        border-color: #42b983 !important;
+      }
+
+      .login_input {
+        margin-top: 32rpx;
+        background-color: #ffffff;
+        height: 72rpx;
+        box-sizing: border-box;
+        padding: 16rpx;
+      }
+
+      .title {
+        font-size: 36rpx;
+        color: #42b983;
+        text-align: center;
+      }
+
+      .tips {
+        font-size: 28rpx;
+        color: red;
+        margin-top: 16rpx;
+      }
+
+      .page_item_btn {
+        height: 88rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        border-radius: 8rpx;
+        line-height: 88rpx;
+        color: #fff;
+        font-size: 36rpx;
+        font-weight: 700;
+        margin-top: 64rpx;
+        text-align: center;
+      }
+    }
+
+    //上班页面
+    .goWorkAll {
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      /deep/ .uni-radio-input-checked {
+        background-color: #42b983 !important;
+        border-color: #42b983 !important;
+      }
+      /deep/ .uni-checkbox-input-checked {
+        color: #42b983 !important;
+      }
+			
+			.title{
+				text-align: center;
+				color: #64BD7B;
+				line-height: 80rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+			}
+			
+      .goWorkSelect {
+        &.history {
+          padding-bottom: 16rpx;
+        }
+
+        &.combination {
+          .goWorkSelect-head {}
+
+          .goWorkSelect-list {}
+        }
+
+        .goWorkSelect-head {
+          font-size: 28rpx;
+          line-height: 80rpx;
+          border-bottom: 2rpx solid #E5E5E5;
+          text-align: center;
+        }
+				
+				.besides{
+					align-items: start !important;
+				}
+				
+        .goWorkSelect-list {
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					padding: 20rpx;
+					border-bottom: 1rpx solid #E5E5E5;
+					position: relative;
+					
+					.list-title{
+						width: 180rpx;
+					}
+					
+					.input-sign{
+						user-select: none; 
+						pointer-events: none;
+					}
+					
+					.right-icon{
+						font-size: 38rpx !important;
+						margin: 0 40rpx 0 10rpx;
+						position: relative;
+						top: -2rpx;
+					}
+					
+					.toolbar-icon{
+						position: absolute;
+						right: 20rpx;
+					}
+					
+					.newicon{
+						font-size: 32rpx;
+						color: #b8b8b8;
+					}
+					
+					.input-num {
+					  height: 60rpx;
+					  border: 2rpx solid #E5E5E5;
+					  border-radius: 5rpx;
+					  // width: 100%;
+					  padding-left: 10rpx;
+					  // padding-right: 10rpx;
+					}
+					
+          .goWorkSelect-item {
+            height: 52rpx;
+            display: flex;
+            align-items: center;
+            border-bottom: 2rpx solid #e5e9ed;
+            padding: 16rpx;
+
+            &.relative {
+              position: relative;
+
+              .picker {
+                position: absolute;
+                width: 100%;
+                padding-left: 64rpx;
+              }
+            }
+
+            button {
+              font-size: 32rpx;
+              height: 52rpx;
+              line-height: 52rpx;
+              margin: 0;
+              margin-left: 16rpx;
+              color: rgb(7, 134, 60);
+              font-weight: 700;
+            }
+          }
+        }
+				
+				.goWorkSelect-list:last-child {
+					border-bottom: none;
+				}
+      }
+    }
+
+    .goWork {
+      margin: 0 auto 48rpx;
+      width: 240rpx;
+      height: 240rpx;
+
+      .goWork_btn_E {
+        width: 100%;
+        height: 100%;
+        background: #bee1a7;
+        border-radius: 30%;
+
+        .goWork_btn_W {
+          width: 75%;
+          height: 75%;
+          background-image: linear-gradient(to right, #72c172, #3bb197);
+          border-radius: 30%;
+          margin: 0 auto;
+          position: relative;
+          top: 12.5%;
+          line-height: 180rpx;
+          color: #fff;
+          font-size: 36rpx;
+          text-align: center;
+        }
+      }
+    }
+
+    .goWork_text {
+      width: 100%;
+
+      view {
+        text-align: center;
+      }
+
+      .goWork_text-p {
+        font-size: 36rpx;
+        margin-bottom: 48rpx;
+      }
+    }
+
+    .botImg {
+      height: 600rpx;
+      width: 100%;
+      position: fixed;
+      bottom: 0;
+
+      .img {
+        height: 100%;
+        background: url("../../static/img/BG.png") no-repeat center center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+</style>

pages/taskTypeSearch/taskTypeSearch.vue

@@ -0,0 +1,429 @@
+<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="selectId == row.id ? 'selectStyle' : ''">
+						<view class="keyword-text">
+							{{row.dept}}
+						</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:[],
+				gdId:null,
+				startTarget:null,
+				endTarget:null,
+				selectId:null,
+				taskTypeData:null,
+				taskTypeId:null,
+				taskName:null
+			};
+		},
+		onLoad(options) {
+			this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
+			this.taskTypeData = JSON.parse(options.taskTypeData)
+			console.log(this.options, '777');
+			console.log(this.taskTypeData, '123');
+			this.taskTypeId = options.taskTypeId
+			this.taskName = options.taskName
+			this.type = options.type
+			// 科室类型：201：默认发起科室
+			// 科室类型：202：固定科室范围
+			// 科室类型：203：固定科室
+			// 科室类型：204：自主填写
+			// 科室类型：205：固定科室类型
+			this.startTarget = this.taskTypeData.startStatus
+			this.endTarget = this.taskTypeData.endStatus
+			this.gdId = options.id
+			if(options.type=='applyDept'){
+				this.getapplyDept()
+			}else if (options.type=='startDept'){
+				this.getStartDept()
+			}else if (options.type=='endDept'){
+				this.getEndDept()
+			}
+		},
+		methods: {
+			searchKey(e){
+				if(this.type=='applyDept'){
+					this.handleSearch1()
+				}else if (this.type=='startDept'){
+					this.handleSearch2()
+				}else if (this.type=='endDept'){
+					this.handleSearch3()
+				}
+			},
+			handleSearch1: debounce(function() {
+			  this.getapplyDept();
+			}, 500),
+			handleSearch2: debounce(function() {
+			  this.getStartDept();
+			}, 500),
+			handleSearch3: debounce(function() {
+			  this.getEndDept();
+			}, 500),
+			//获取申请科室
+			getapplyDept() {
+				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
+				})
+			},
+			//获取起点科室
+			getStartDept() {
+				// 科室类型：201：默认发起科室
+				// 科室类型：202：固定科室范围
+				// 科室类型：203：固定科室
+				// 科室类型：204：自主填写
+				// 科室类型：205：固定科室类型
+				if(this.startTarget == 204 || this.startTarget== 205){
+					let postData = {
+						idx: 0,
+						sum: 20,
+						department:{
+							searchType: 1,
+							cascadeHosId: this.hosId,
+							type:{
+								id: null
+							},
+							dept: this.key
+						}
+					}
+					if(this.startTarget == 204){
+						delete postData.department.type
+					}else{
+						postData.department.type.id = this.taskTypeData.startTypeId
+					}
+					post("/simple/data/fetchDataList/department", postData).then((res) => {
+						this.dataList = res.list
+					})
+				}else if(this.startTarget== 202){
+					if(this.key){
+						this.dataList = this.taskTypeData.startDept.filter(i=>i.dept.indexOf(this.key)!=-1)
+					}else{
+						this.dataList = this.taskTypeData.startDept
+					}
+				}else{
+					this.dataList = this.taskTypeData.startDept
+				}
+			},
+			// 获取终点科室
+			getEndDept(){
+				// 科室类型：201：默认发起科室
+				// 科室类型：202：固定科室范围
+				// 科室类型：203：固定科室
+				// 科室类型：204：自主填写
+				// 科室类型：205：固定科室类型
+				if(this.endTarget == 204 || this.endTarget== 205){
+					let postData = {
+						idx: 0,
+						sum: 20,
+						department:{
+							searchType: 1,
+							cascadeHosId: this.hosId,
+							type:{
+								id: null
+							},
+							dept: this.key
+						}
+					}
+					if(this.endTarget == 204){
+						delete postData.department.type
+					}else{
+						postData.department.type.id = this.taskTypeData.endTypeId
+					}
+					post("/simple/data/fetchDataList/department", postData).then((res) => {
+						this.dataList = res.list
+					})
+				}else if(this.endTarget== 202){
+					if(this.key){
+						this.dataList = this.taskTypeData.endDept.filter(i=>i.dept.indexOf(this.key)!=-1)
+					}else{
+						this.dataList = this.taskTypeData.endDept
+					}
+				}else{
+					this.dataList = this.taskTypeData.endDept
+				}
+			},
+			// 确认
+			determine(type) {
+				this.allData = this.selectData
+				if (type == 'back') {
+					uni.navigateBack({
+						delta: 1,
+					})
+				} else {
+					if(this.type=='applyDept'){
+						uni.setStorageSync('applyDept', JSON.stringify(this.allData))
+					}else if (this.type=='startDept'){
+						uni.setStorageSync('taskStartDept', JSON.stringify(this.allData))
+					}else if (this.type=='endDept'){
+						uni.setStorageSync('taskEndDept', JSON.stringify(this.allData))
+					}
+					uni.redirectTo ({
+						url: `../sponsorTaskBuild/sponsorTaskBuild?type=${this.type}&startTarget=${this.startTarget}&endTarget=${this.endTarget}&taskTypeId=${this.taskTypeId}&taskName=${this.taskName}`
+					});
+				}
+			},
+			// 选择楼栋
+			itemClick(item) {
+				this.selectData = item
+				this.selectId = item.id
+			}
+		},
+	};
+</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/transferConnect/transferConnect.vue

@@ -0,0 +1,494 @@
+<template>
+  <view class="HomeItem">
+    <view class="goWorkAll">
+			<view class="title">{{optData.deptName}}-{{optData.handoverType.name}}</view>
+			<view class="goWorkSelect history">
+			  <view class="goWorkSelect-head">总数量：{{optData.totalNum}}</view>
+			  <view class="goWorkSelect-list" v-for="(item, i) in optData.data">
+					{{item.deptName}}: {{item.num}}
+				</view>
+			</view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="submit()">{{optData.handoverType.value==1 ? '确认中转' : '确认交接'}}</view>
+      <view class="btn3" @click="goBack">取消</view>
+    </view>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+		
+		<!-- 中转 -->
+		<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 * as commonFun from '../../tools/commonFun.js';
+  import {
+    pathUrl
+  } from "../../tools/photograph.js";
+  import selectAccount from "../../components/selectAccount/selectAccount.vue";
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    components: {
+      selectAccount,
+    },
+    data() {
+      return {
+				list:[],
+				optData:null,
+        tips: '',
+        currentIndex: undefined,
+        // 填写交接人工号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        currentCode: '', //当前拍照使用的科室二维码
+        currentData: {}, //当前小扫描的工单对象
+        orderId: undefined,
+        order: {},
+				digitalNum:null,
+				// 数字交接
+				digitalHandoverSwitch: false,
+        // 拍照动作开关
+        actionPhotoSwitch: false,
+        // 确认动作开关
+        actionConfirmSwitch: false,
+        // 确认动作模式开关
+        actionConfirmType: false,
+        // 参数
+        options: {},
+        //动作列表
+        actions: [],
+        //图片列表
+        imageValue: [],
+      };
+    },
+    methods: {
+      // 其他临床服务-运输过程-终点科室是否开通备注填写
+      isOpenTransportationProcessRemarks(data, accountObj, funName){
+        const tasktype = data.taskType;
+        console.log(tasktype, data);
+        if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[this.currentIndex].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{
+          commonFun[funName](this, data, accountObj);
+        }
+      },
+      // 填写交接人工号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: '提示',
+            content: "请填写交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        } else if (!accountName && account || accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: '提示',
+            content: "请填写正确的交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let postData = {
+					ids: this.optData.orderIds,
+					handoverTypeValue: this.optData.handoverType.value,
+					deptId: this.optData.deptId,
+					handoverUserId: accountId
+				}
+        this.hosModels.disjunctor = false;
+        post("/business/confirmHandover", postData).then((res) => {
+					uni.hideLoading();
+          if(res.status == 200){
+            uni.showToast({
+              icon: "none",
+              title: "操作成功",
+            });
+            setTimeout(_=>{
+            	uni.redirectTo({
+            		url:'/pages/receiptpage/receiptpage'
+            	})
+            },1000)
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: res.info || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      // 填写交接人工号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+      },
+      // 填写交接人工号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          disjunctor: true,
+        }
+      },
+			// 确定中转
+			submit(){
+				// 1:中转 2:终点
+				if(this.optData.handoverType.value==1){
+					this.$refs.alertDialog.open()
+				}else{
+					if(this.optData.taskType.carryingCourses[1].handoverSwitch){
+						this.showSelectAccount();
+					}else{
+						this.$refs.alertDialog.open()
+					}
+				}
+			},
+			// 确定中转
+			dialogConfirm(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let url = null
+				let postData = {
+					ids: this.optData.orderIds,
+					handoverTypeValue: this.optData.handoverType.value,
+					deptId: this.optData.deptId
+				}
+				if(this.optData.handoverType.value==1){
+					url = post("/business/confirmHandover", postData)
+				}else{
+					url = post("/business/confirmHandover", postData)
+				}
+				url.then((res) => {
+				  if(res.status == 200){
+						uni.hideLoading();
+						this.$refs.alertDialog.close()
+				    uni.showToast({
+				      icon: "none",
+				      title: "操作成功",
+				    });
+				    setTimeout(_=>{
+				    	uni.redirectTo({
+				    		url:'/pages/receiptpage/receiptpage'
+				    	})
+				    },1000)
+				  } else {
+            uni.showToast({
+              icon: "none",
+              title: res.info || "接口获取数据失败！",
+            });
+          }
+				});
+			},
+			// 取消
+			dialogClose(){
+				this.$refs.alertDialog.close()
+			},
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 选择动作
+      checkboxChange: function (e) {
+        let items = this.actions;
+        let values = [];
+        if(this.actionConfirmType == 1 || this.actionConfirmType == 2){
+          values = e.detail.value || [];
+        }else if(this.actionConfirmType == 3){
+          values = [e.detail.value];
+        }
+        for (let 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)
+          }
+        }
+      },
+      // 获取上传状态
+      selectFile(e) {
+        console.log('选择文件：', e)
+        this.imageValue = this.imageValue.concat(e.tempFiles);
+      },
+      
+      // 移除
+      deleteFile(e) {
+        console.log('移除：', e);
+      },
+    },
+    onLoad(options) {
+      this.options = options;
+      if(options.data){
+        this.optData = JSON.parse(options.data);
+				console.log(this.optData);
+      }
+    },
+  };
+</script>
+
+<style scoped>
+	/deep/ .uni-button-color{
+		color: #64BD7B;
+	}
+</style>
+<style lang="less" scoped>
+  .HomeItem {
+    .foot_btn_spe {
+      width: 100%;
+      position: fixed;
+      bottom: 30rpx;
+      left: 0;
+      line-height: 88rpx;
+      height: 88rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+    
+      &::after {
+        content: '';
+        flex: 1;
+      }
+    
+      view {
+        height: 88rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+
+    .login {
+      height: 420rpx;
+      padding: 0 32rpx;
+      padding-top: 164rpx;
+      position: relative;
+      z-index: 999;
+
+      .savePassword {
+        margin-top: 32rpx;
+      }
+
+      /deep/ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+        border-color: #42b983 !important;
+      }
+
+      .login_input {
+        margin-top: 32rpx;
+        background-color: #ffffff;
+        height: 72rpx;
+        box-sizing: border-box;
+        padding: 16rpx;
+      }
+
+      .title {
+        font-size: 36rpx;
+        color: #42b983;
+        text-align: center;
+      }
+
+      .tips {
+        font-size: 28rpx;
+        color: red;
+        margin-top: 16rpx;
+      }
+
+      .page_item_btn {
+        height: 88rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        border-radius: 8rpx;
+        line-height: 88rpx;
+        color: #fff;
+        font-size: 36rpx;
+        font-weight: 700;
+        margin-top: 64rpx;
+        text-align: center;
+      }
+    }
+
+    //上班页面
+    .goWorkAll {
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      /deep/ .uni-radio-input-checked {
+        background-color: #42b983 !important;
+        border-color: #42b983 !important;
+      }
+      /deep/ .uni-checkbox-input-checked {
+        color: #42b983 !important;
+      }
+			
+			.title{
+				text-align: center;
+				color: #64BD7B;
+				line-height: 80rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
+			}
+			
+      .goWorkSelect {
+        &.history {
+          height: 81vh;
+					overflow-y: auto;
+					margin-top: 80rpx;
+          padding-bottom: 16rpx;
+        }
+
+        &.combination {
+          .goWorkSelect-head {}
+
+          .goWorkSelect-list {}
+        }
+
+        .goWorkSelect-head {
+          font-size: 28rpx;
+          line-height: 80rpx;
+          border-bottom: 2rpx solid #E5E5E5;
+          text-align: center;
+        }
+
+        .goWorkSelect-list {
+          padding: 16rpx;
+					
+					.input-num {
+					  height: 60rpx;
+					  border: 2rpx solid #E5E5E5;
+					  border-radius: 5rpx;
+					  // width: 100%;
+					  padding-left: 10rpx;
+					  // padding-right: 10rpx;
+					}
+					
+          .goWorkSelect-item {
+            height: 52rpx;
+            display: flex;
+            align-items: center;
+            border-bottom: 2rpx solid #e5e9ed;
+            padding: 16rpx;
+
+            &.relative {
+              position: relative;
+
+              .picker {
+                position: absolute;
+                width: 100%;
+                padding-left: 64rpx;
+              }
+            }
+
+            button {
+              font-size: 32rpx;
+              height: 52rpx;
+              line-height: 52rpx;
+              margin: 0;
+              margin-left: 16rpx;
+              color: rgb(7, 134, 60);
+              font-weight: 700;
+            }
+          }
+        }
+      }
+    }
+
+    .goWork {
+      margin: 0 auto 48rpx;
+      width: 240rpx;
+      height: 240rpx;
+
+      .goWork_btn_E {
+        width: 100%;
+        height: 100%;
+        background: #bee1a7;
+        border-radius: 30%;
+
+        .goWork_btn_W {
+          width: 75%;
+          height: 75%;
+          background-image: linear-gradient(to right, #72c172, #3bb197);
+          border-radius: 30%;
+          margin: 0 auto;
+          position: relative;
+          top: 12.5%;
+          line-height: 180rpx;
+          color: #fff;
+          font-size: 36rpx;
+          text-align: center;
+        }
+      }
+    }
+
+    .goWork_text {
+      width: 100%;
+
+      view {
+        text-align: center;
+      }
+
+      .goWork_text-p {
+        font-size: 36rpx;
+        margin-bottom: 48rpx;
+      }
+    }
+
+    .botImg {
+      height: 600rpx;
+      width: 100%;
+      position: fixed;
+      bottom: 0;
+
+      .img {
+        height: 100%;
+        background: url("../../static/img/BG.png") no-repeat center center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+</style>

pages/transferDistribution/transferDistribution.vue

@@ -0,0 +1,328 @@
+<template>
+  <view class="HomeItem">
+    <view class="goWorkAll">
+			<view class="title">{{optData.quickOrderName}}-发起中转配送</view>
+			<view class="goWorkSelect history">
+			  <view class="goWorkSelect-head">总数量：{{optData.totalNum}}</view>
+			  <view class="goWorkSelect-list" v-for="(item, i) in optData.data">
+					{{item.deptName}}: {{item.num}}
+				</view>
+			</view>
+    </view>
+    <view class="foot_btn_spe" v-if="optData.totalNum>0">
+      <view class="btn1" @click="submit()">确认建单</view>
+      <view class="btn3" @click="goBack">取消</view>
+    </view>
+		<view class="foot_btn_spe" v-else>
+		  <view class="btn2" @click="goBack">返回</view>
+		</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 {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+				list:[],
+				optData:null
+      };
+    },
+    methods: {
+			// 确定中转
+			submit(){
+				this.$refs.alertDialog.open()
+			},
+			// 确定中转
+			dialogConfirm(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				let postData = {
+					businessIds: this.optData.businessIds,
+					quickOrderId: this.optData.quickOrderId
+				}
+				post("/business/createAndSign", postData).then((res) => {
+					uni.hideLoading();
+				  if(res.status == 200){
+						this.$refs.alertDialog.close()
+				    uni.showToast({
+				      icon: "none",
+				      title: "操作成功",
+				    });
+				    setTimeout(_=>{
+				    	uni.redirectTo({
+				    		url:'/pages/receiptpage/receiptpage'
+				    	})
+				    },1000)
+				  } else {
+            uni.showToast({
+              icon: "none",
+              title: res.info || "接口获取数据失败！",
+            });
+          }
+				});
+			},
+			// 取消
+			dialogClose(){
+				this.$refs.alertDialog.close()
+			},
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      }
+    },
+    onLoad(options) {
+      this.options = options;
+      if(options.data){
+        this.optData = JSON.parse(options.data);
+				console.log(this.optData);
+      }
+    },
+  };
+</script>
+
+<style scoped>
+	/deep/ .uni-button-color{
+		color: #64BD7B;
+	}
+</style>
+<style lang="less" scoped>
+  .HomeItem {
+    .foot_btn_spe {
+      width: 100%;
+      position: fixed;
+      bottom: 30rpx;
+      left: 0;
+      line-height: 88rpx;
+      height: 88rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+    
+      &::after {
+        content: '';
+        flex: 1;
+      }
+			
+			.btn2{
+				width: 100% !important;
+			}
+			
+      view {
+        height: 88rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+
+    .login {
+      height: 420rpx;
+      padding: 0 32rpx;
+      padding-top: 164rpx;
+      position: relative;
+      z-index: 999;
+
+      .savePassword {
+        margin-top: 32rpx;
+      }
+
+      /deep/ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+        border-color: #42b983 !important;
+      }
+
+      .login_input {
+        margin-top: 32rpx;
+        background-color: #ffffff;
+        height: 72rpx;
+        box-sizing: border-box;
+        padding: 16rpx;
+      }
+
+      .title {
+        font-size: 36rpx;
+        color: #42b983;
+        text-align: center;
+      }
+
+      .tips {
+        font-size: 28rpx;
+        color: red;
+        margin-top: 16rpx;
+      }
+
+      .page_item_btn {
+        height: 88rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        border-radius: 8rpx;
+        line-height: 88rpx;
+        color: #fff;
+        font-size: 36rpx;
+        font-weight: 700;
+        margin-top: 64rpx;
+        text-align: center;
+      }
+    }
+
+    //上班页面
+    .goWorkAll {
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      /deep/ .uni-radio-input-checked {
+        background-color: #42b983 !important;
+        border-color: #42b983 !important;
+      }
+      /deep/ .uni-checkbox-input-checked {
+        color: #42b983 !important;
+      }
+			
+			.title{
+				text-align: center;
+				color: #64BD7B;
+				line-height: 80rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
+			}
+			
+      .goWorkSelect {
+        &.history {
+          height: 81vh;
+					overflow-y: auto;
+					margin-top: 80rpx;
+          padding-bottom: 16rpx;
+        }
+
+        &.combination {
+          .goWorkSelect-head {}
+
+          .goWorkSelect-list {}
+        }
+
+        .goWorkSelect-head {
+          font-size: 28rpx;
+          line-height: 80rpx;
+          border-bottom: 2rpx solid #E5E5E5;
+          text-align: center;
+        }
+
+        .goWorkSelect-list {
+          padding: 16rpx;
+					
+					.input-num {
+					  height: 60rpx;
+					  border: 2rpx solid #E5E5E5;
+					  border-radius: 5rpx;
+					  // width: 100%;
+					  padding-left: 10rpx;
+					  // padding-right: 10rpx;
+					}
+					
+          .goWorkSelect-item {
+            height: 52rpx;
+            display: flex;
+            align-items: center;
+            border-bottom: 2rpx solid #e5e9ed;
+            padding: 16rpx;
+
+            &.relative {
+              position: relative;
+
+              .picker {
+                position: absolute;
+                width: 100%;
+                padding-left: 64rpx;
+              }
+            }
+
+            button {
+              font-size: 32rpx;
+              height: 52rpx;
+              line-height: 52rpx;
+              margin: 0;
+              margin-left: 16rpx;
+              color: rgb(7, 134, 60);
+              font-weight: 700;
+            }
+          }
+        }
+      }
+    }
+
+    .goWork {
+      margin: 0 auto 48rpx;
+      width: 240rpx;
+      height: 240rpx;
+
+      .goWork_btn_E {
+        width: 100%;
+        height: 100%;
+        background: #bee1a7;
+        border-radius: 30%;
+
+        .goWork_btn_W {
+          width: 75%;
+          height: 75%;
+          background-image: linear-gradient(to right, #72c172, #3bb197);
+          border-radius: 30%;
+          margin: 0 auto;
+          position: relative;
+          top: 12.5%;
+          line-height: 180rpx;
+          color: #fff;
+          font-size: 36rpx;
+          text-align: center;
+        }
+      }
+    }
+
+    .goWork_text {
+      width: 100%;
+
+      view {
+        text-align: center;
+      }
+
+      .goWork_text-p {
+        font-size: 36rpx;
+        margin-bottom: 48rpx;
+      }
+    }
+
+    .botImg {
+      height: 600rpx;
+      width: 100%;
+      position: fixed;
+      bottom: 0;
+
+      .img {
+        height: 100%;
+        background: url("../../static/img/BG.png") no-repeat center center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+</style>

tools/commonFun.js

@@ -9,20 +9,25 @@ export function nextDeptOrder_ss(_this, data, accountObj) {
     mask: true,
   });
   _this.actions = _this.actions || [];
+	let handoverNum = _this.digitalNum
   console.log(_this.currentCode);
-  if (_this.currentCode) {
+  if (_this.currentCode || handoverNum) {
     // 动作
     let actions = _this.actions.filter(v => v.checked);
     let actionRemarks = actions.map(v => v.name).toString();
-    if(actionRemarks){
+		// 数字交接
+    if(actionRemarks || handoverNum){
       let postData = {
         orderId: data.id,
       };
       if(data.gdState.value == 4){
-        postData.actionStartRemarks = actionRemarks;
+        postData.actionStartRemarks = actionRemarks || null;
       }else if(data.gdState.value == 5){
-        postData.actionRemarks = actionRemarks;
+        postData.actionRemarks = actionRemarks || null;
       }
+			if(handoverNum){
+				postData.handoverNum = handoverNum;
+			}
       post("/workerOrder/addOtherRemarks", postData).then((result1) => {
         if(result1.state == 200){
           postWorkerOrder(_this, data, accountObj);