协和病历开发

components/bigScreen/bigScreen.vue

@@ -524,7 +524,7 @@
 				// this.ScanningCommon('', '7868686868688');
 				
 				// 发起中转配送
-				this.ScanningCommon('', '1de40295-c7cc-4394-a2cd-18e0e7112d99');
+				// this.ScanningCommon('', '05ae81fc-3f07-4b8a-bbcb-53c40ede7d3d');
 				
 				// 快捷建单-轮巡工单码
 				// this.ScanningCommon('', '3330ec8e-76eb-413e-b000-995f08d2ff96');
@@ -535,15 +535,15 @@
 				// 终点科室核对码--本部住院检验科
 				// this.ScanningCommon('', '95c5de27-c05f-11ea-8cfe-000c29097622');
 				
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
-        // SM().then((content) => {
-        //   this.ScanningCommon(qrcodePrefix, content);
-        // }).catch(err => {
-        //   this.SMFlag = true;
-        // });
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          this.ScanningCommon(qrcodePrefix, content);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
       },
       //底部扫描-无须扫码
       ScanningCommon(qrcodePrefix = '', content){

manifest.json

@@ -123,9 +123,9 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/service" : {
-                    // "target" : "http://192.168.3.108", //请求的目标域名
+                    "target" : "http://192.168.3.108", //请求的目标域名
 
-                    "target" : "http://192.168.4.163", //宋程玉本地
+                    // "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages.json

@@ -825,7 +825,7 @@
 		    "h5": {
 		      "titleNView": false
 		    },
-		    "enablePullDownRefresh": true
+		    "enablePullDownRefresh": false
 		  }
 		},
 		{
@@ -834,16 +834,7 @@
 		    "h5": {
 		      "titleNView": false
 		    },
-		    "enablePullDownRefresh": true
-		  }
-		},
-		{
-		  "path": "pages/sponsorTask/sponsorTask",
-		  "style": {
-		    "h5": {
-		      "titleNView": false
-		    },
-		    "enablePullDownRefresh": true
+		    "enablePullDownRefresh": false
 		  }
 		},
 		{
@@ -852,7 +843,7 @@
 		    "h5": {
 		      "titleNView": false
 		    },
-		    "enablePullDownRefresh": true
+		    "enablePullDownRefresh": false
 		  }
 		},
 		{
@@ -861,7 +852,7 @@
 		    "h5": {
 		      "titleNView": false
 		    },
-		    "enablePullDownRefresh": true
+		    "enablePullDownRefresh": false
 		  }
 		},
 		{
@@ -870,7 +861,7 @@
 		    "h5": {
 		      "titleNView": false
 		    },
-		    "enablePullDownRefresh": true
+		    "enablePullDownRefresh": false
 		  }
 		}
   ],

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -27,7 +27,7 @@
 			<view class="goWorkSelect history" v-if="digitalHandoverSwitch">
 			  <view class="goWorkSelect-head">请填写交接数量</view>
 			  <view class="goWorkSelect-list">
-					<input class="input-num" type="text" v-model="digitalNum">
+					<input class="input-num" type="number" v-model="digitalNum">
 			  </view>
 			</view>
       <view class="goWorkSelect history" v-if="actionPhotoSwitch">
@@ -97,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)) : ''}`
@@ -147,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){

pages/scanning_all/scanning_all.vue

@@ -444,11 +444,12 @@
               icon: "none",
               title: res.info,
             });
-						setTimeout(_=>{
-							uni.redirectTo({
-								url:'/pages/receiptpage/receiptpage'
-							})
-						},1000)
+						this.flag = true;
+						// setTimeout(_=>{
+						// 	uni.redirectTo({
+						// 		url:'/pages/receiptpage/receiptpage'
+						// 	})
+						// },1000)
           }else {
             this.flag = true;
             uni.navigateTo({

pages/sponsorTask/sponsorTask.vue

@@ -30,7 +30,9 @@
     methods: {
       // 返回
       goBack() {
-        uni.navigateBack();
+				uni.navigateTo({
+					url:'/pages/receiptpage/receiptpage'
+				})
       },
 			itemClick(item){
 				uni.navigateTo({
@@ -46,7 +48,8 @@
 					idx: 0,
 					sum: 9999,
 					taskType:{
-						hosIds: this.hosId
+						hosIds: this.hosId,
+						simpleQuery: true
 					}
 				}
 				post("/configuration/fetchDataList/taskType", postData).then((res) => {
@@ -195,11 +198,18 @@
 				color: #64BD7B;
 				line-height: 80rpx;
 				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
 			}
 			
       .goWorkSelect {
         &.history {
-          height: 356rpx;
+          height: 81vh;
+          overflow-y: auto;
+          margin-top: 80rpx;
           padding-bottom: 16rpx;
         }
 

pages/sponsorTaskBuild/sponsorTaskBuild.vue

@@ -4,23 +4,29 @@
 			<view class="title">{{taskName}}</view>
 			<view class="goWorkSelect history">
 			  <view class="goWorkSelect-list">
-					申请科室：
-					<input type="text" v-model="applyDept" placeholder="请选择申请科室">
+					<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">
-					起点科室：
-					<input type="text" :disabled="startTarget==201 || startTarget==203" v-model="startDept" placeholder="请选择起点科室">
+					<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">
-					终点科室：
-					<input type="text" :disabled="endTarget==201 || endTarget==203" v-model="endDept" placeholder="请选择终点科室">
+					<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>
@@ -31,7 +37,7 @@
     </view>
 		
 		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
-			<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title="提示" :content="content" @confirm="dialogConfirm"
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" :content="content" @confirm="dialogConfirm"
 				@close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
   </view>
@@ -51,11 +57,11 @@
 				list:[],
 				hosId: uni.getStorageSync('userData').user.currentHospital.id,
 				SMFlag:true,
-				applyDept:null,
+				applyDept:"请选择申请科室",
 				applyDeptId:null,
-				startDept:null,
+				startDept:"请选择起点科室",
 				startDeptId:null,
-				endDept:null,
+				endDept:"请选择终点科室",
 				endDeptId:null,
 				remark:null,
 				itemTaskType:null,
@@ -79,10 +85,40 @@
 			},
       // 返回
       goBack() {
-        uni.navigateBack();
+				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,
@@ -129,7 +165,10 @@
 				  } else if(res2.status == 1000033){
 						this.tipsCreateOder = 1
 						this.content = res2.msg
-				    this.$refs.alertDialog.open()
+						this.$refs.alertDialog.close()
+						setTimeout(_=>{
+							this.$refs.alertDialog.open()
+						},500)
 				  } else {
 						uni.showToast({
 						  icon: 'none',
@@ -138,16 +177,23 @@
 					}
 				});
 			},
-			// 确定中转
-			dialogConfirm(){
-				this.submit()
-			},
 			// 取消
 			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,
@@ -168,14 +214,18 @@
 				  return;
 				}
 				this.SMFlag = false;
+				// let content = '87bdf1c7-1514-4fa8-8fa4-07f37c06bec7'
 				SM().then((content) => {
 					uni.showLoading({
 					  title: "加载中",
 					  mask: true,
 					});
-					post("/repair/scanCode", {
-						code: content
-					}).then((res2) => {
+					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
@@ -225,6 +275,9 @@
 				});
 			}
     },
+		onUnload(){
+			this.setSess();
+		},
 		onShow(options){
 			
 		},
@@ -327,8 +380,25 @@
 /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%;
@@ -453,17 +523,33 @@
 				
         .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-right: 20rpx;
+						margin: 0 40rpx 0 10rpx;
 						position: relative;
 						top: -2rpx;
 					}
 					
+					.toolbar-icon{
+						position: absolute;
+						right: 20rpx;
+					}
+					
 					.newicon{
 						font-size: 32rpx;
 						color: #b8b8b8;

pages/taskTypeSearch/taskTypeSearch.vue

@@ -60,8 +60,8 @@
 			this.taskName = options.taskName
 			this.type = options.type
 			// 科室类型：201：默认发起科室
-			// 科室类型：202：固定科室
-			// 科室类型：203：固定科室范围
+			// 科室类型：202：固定科室范围
+			// 科室类型：203：固定科室
 			// 科室类型：204：自主填写
 			// 科室类型：205：固定科室类型
 			this.startTarget = this.taskTypeData.startStatus
@@ -77,17 +77,22 @@
 		},
 		methods: {
 			searchKey(e){
-				if(this.type=='startDept'){
+				if(this.type=='applyDept'){
 					this.handleSearch1()
-				}else if (this.type=='checkoutDept'){
+				}else if (this.type=='startDept'){
 					this.handleSearch2()
+				}else if (this.type=='endDept'){
+					this.handleSearch3()
 				}
 			},
 			handleSearch1: debounce(function() {
-			  this.getStartDept();
+			  this.getapplyDept();
 			}, 500),
 			handleSearch2: debounce(function() {
-			  this.getCheckoutDept();
+			  this.getStartDept();
+			}, 500),
+			handleSearch3: debounce(function() {
+			  this.getEndDept();
 			}, 500),
 			//获取申请科室
 			getapplyDept() {
@@ -134,6 +139,12 @@
 					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
 				}
@@ -166,6 +177,12 @@
 					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
 				}

pages/transferConnect/transferConnect.vue

@@ -5,7 +5,7 @@
 			<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.deptName}}: {{item.num}}
 				</view>
 			</view>
     </view>
@@ -20,7 +20,7 @@
 		
 		<!-- 中转 -->
 		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
-			<uni-popup-dialog type="warn" message="提示" cancelText="取消" confirmText="确定" title="通知" content="您确认中转吗？" @confirm="dialogConfirm"
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" content="您确认中转吗？" @confirm="dialogConfirm"
 				@close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
   </view>
@@ -263,6 +263,11 @@
   };
 </script>
 
+<style scoped>
+	/deep/ .uni-button-color{
+		color: #64BD7B;
+	}
+</style>
 <style lang="less" scoped>
   .HomeItem {
     .foot_btn_spe {
@@ -362,11 +367,18 @@
 				color: #64BD7B;
 				line-height: 80rpx;
 				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
 			}
 			
       .goWorkSelect {
         &.history {
-          height: 356rpx;
+          height: 81vh;
+					overflow-y: auto;
+					margin-top: 80rpx;
           padding-bottom: 16rpx;
         }
 

pages/transferDistribution/transferDistribution.vue

@@ -5,7 +5,7 @@
 			<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.deptName}}: {{item.num}}
 				</view>
 			</view>
     </view>
@@ -19,7 +19,7 @@
 		
 		<!-- 确认建单 -->
 		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
-			<uni-popup-dialog type="warn" message="提示" cancelText="取消" confirmText="确定" title="通知" content="您确认建单吗？" @confirm="dialogConfirm"
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" content="您确认建单吗？" @confirm="dialogConfirm"
 				@close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
   </view>
@@ -93,6 +93,11 @@
   };
 </script>
 
+<style scoped>
+	/deep/ .uni-button-color{
+		color: #64BD7B;
+	}
+</style>
 <style lang="less" scoped>
   .HomeItem {
     .foot_btn_spe {
@@ -196,11 +201,18 @@
 				color: #64BD7B;
 				line-height: 80rpx;
 				border-bottom: 1rpx solid #E5E5E5;
+				position: absolute;
+				top: 0;
+				width: 100%;
+				height: 80rpx;
+				background: #fff;
 			}
 			
       .goWorkSelect {
         &.history {
-          height: 356rpx;
+          height: 81vh;
+					overflow-y: auto;
+					margin-top: 80rpx;
           padding-bottom: 16rpx;
         }
 

tools/commonFun.js

@@ -9,21 +9,21 @@ 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();
 		// 数字交接
-		let handoverNum = _this.digitalNum
-    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;