优化

components/bigScreen/bigScreen.vue

@@ -226,7 +226,7 @@
           title: "加载中",
           mask: true,
         });
-        
+
         post(`/transflow/scanInfo`, {type: responeseData.drugsBagType, id: responeseData.drugsBagId, orderStateValue: responeseData.orderStateValue}).then(res => {
           uni.hideLoading();
           if(res.state == 200){
@@ -235,13 +235,13 @@
               let orderId = responeseData.orderId;
               let config = res.data.taskTypeConfig || {};
               console.log(res);
-              if(responeseData.orderStateValue == 2 || responeseData.orderStateValue == 3 || responeseData.orderStateValue == 4){
-                // 待抢单、待接单、待到达,进入起点科室流程
+              if(responeseData.orderStateValue == 2 || responeseData.orderStateValue == 3 || (responeseData.orderStateValue == 4 && responeseData.workerId == uni.getStorageSync('userData').user.id)){
+                // 待抢单、待接单、待到达(本人),进入起点科室流程
                 uni.navigateTo({
                   url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}&type=receive`,
                 });
-              }else if(responeseData.orderStateValue == 5){
-                // 待送达,进入起点科室流程
+              }else if(responeseData.orderStateValue == 5 && responeseData.workerId == uni.getStorageSync('userData').user.id){
+                // 待送达(本人),进入终点科室流程
                 this.pageNavigateByConfig(config, responeseData, responeseData, code)
               }else{
                 // 查看药包信息

pages/newDrug/checkPage/checkPage.vue

@@ -131,7 +131,7 @@
           title: "加载中",
           mask: true,
         });
-        
+
         let postData = {
           extraType: 'inputAccountValid',
           type: this.queryObj.drugsBagType,
@@ -139,7 +139,7 @@
           userId: accountId,
           orderId: this.workOrder.id,
         }
-        
+
         post("/transflow/extra", postData)
           .then((res) => {
             uni.hideLoading();
@@ -231,7 +231,7 @@
           if(config.drugsEndPhoto === 1){
             // 起点科室支持拍照留存
             uni.navigateTo({
-              url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}&accountId=${accountObj.id || ''}&accountName=${accountObj.name || ''}&accountDeptName=${departmentDTO ? departmentDTO.dept : ''}`,
+              url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}&accountId=${accountObj ? accountObj.id : ''}&accountName=${accountObj ? accountObj.name : ''}&accountDeptName=${departmentDTO ? departmentDTO.dept : ''}`,
             });
           }else{
             // 起点科室不支持拍照留存
@@ -250,14 +250,14 @@
             title: "加载中",
             mask: true,
           });
-          
+
           let postData = {
             type: this.queryObj.drugsBagType,
             orderStateValue: this.workOrder.gdState.value,
             code: content,
             orderId: this.workOrder.id,
           }
-          
+
           post("/transflow/bigScan", postData)
             .then((res) => {
               this.SMFlag = true;
@@ -294,7 +294,7 @@
           title: "加载中",
           mask: true,
         });
-        
+
         let info$ = post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId});
         let config$ = post(`/simple/data/fetchDataList/taskTypeConfig`, {
             "idx": 0,
@@ -311,11 +311,11 @@
                 }
             }
         });
-        
+
         Promise.all([info$, config$]).then(result => {
           uni.hideLoading();
           let [info, config] = result || [];
-          
+
           if(info.state == 200){
             if(info.data){
               this.drugsBagList = info.data.drugsBagList || [];
@@ -330,7 +330,7 @@
               title: info.msg || "接口获取数据失败！",
             });
           }
-          
+
           if(config.status == 200){
             let list  = config.list || [];
             this.config = list.length ? list[0] : {};
@@ -422,7 +422,7 @@
       align-items: center;
       gap: 24rpx;
       font-weight: bold;
-      
+
       .column{
         width: 100%;
         height: 78rpx;
@@ -430,7 +430,7 @@
         align-items: center;
         justify-content: space-between;
         gap: 24rpx;
-        
+
         .btn {
           height: 100%;
           flex: 1;

pages/newDrug/continueScanning/continueScanning.vue

@@ -178,8 +178,8 @@
           title: "加载中",
           mask: true,
         });
-        
-        post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: this.queryObj.orderStateValue}).then(res => {
+
+        post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: this.queryObj.orderStateValue, orderId: +this.queryObj.orderId}).then(res => {
           uni.hideLoading();
           if(res.state == 200){
             if(res.data){
@@ -258,7 +258,7 @@
       align-items: center;
       gap: 24rpx;
       font-weight: bold;
-      
+
       .column{
         width: 100%;
         height: 78rpx;
@@ -266,7 +266,7 @@
         align-items: center;
         justify-content: space-between;
         gap: 24rpx;
-        
+
         .btn {
           height: 100%;
           flex: 1;

pages/newDrug/photoRetention/photoRetention.vue

@@ -90,6 +90,13 @@
       },
       // 工单完成
       completeOrder(){
+        if(!this.imgList.length){
+          uni.showToast({
+            icon: 'none',
+            title: '请上传留存照片！'
+          });
+          return;
+        }
         uni.showLoading({
           title: "加载中",
           mask: true,

pages/receipt_infopage/receipt_infopage.vue

@@ -127,7 +127,7 @@
           <text class="text1">创建时间</text>
           <text class="text2">{{ infoDATA.startTime || '无' }}</text>
         </view>
-        <view class="page_item_foot_text">
+        <view class="page_item_foot_text" v-if="!(infoDATA.taskType.associationType.value == 'ordinary' && (infoDATA.taskType.ordinaryField.value == 'drugsJpbag' || infoDATA.taskType.ordinaryField.value == 'drugsWestern' || infoDATA.taskType.ordinaryField.value == 'drugsReturn' || infoDATA.taskType.ordinaryField.value == 'drugsPoison' || infoDATA.taskType.ordinaryField.value == 'drugsHerbal'))">
           <text class="text1">预约时间</text>
           <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyTime }}</text>
           <text class="text2"

pages/receiptpage/receiptpage.vue

@@ -212,11 +212,18 @@
                 </view>
                 <view class="line"></view>
               </view>
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'ordinary' && (item.taskType.ordinaryField.value == 'drugsJpbag' || item.taskType.ordinaryField.value == 'drugsWestern' || item.taskType.ordinaryField.value == 'drugsReturn' || item.taskType.ordinaryField.value == 'drugsPoison' || item.taskType.ordinaryField.value == 'drugsHerbal')">
+                <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
+                <view style="word-break: break-all;" v-if="item.workOrderRemark">
+                  备注信息 :
+                  <text>{{ item.workOrderRemark || "暂无" }}</text>
+                </view>
+                <view class="line"></view>
+              </view>
               <view class="page_item_conts" v-else>
                 <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
 								<view>
-								  预约时间 : {{ item.yyjdTime | yyTimeFilter
-								  }}
+								  预约时间 : {{ item.yyjdTime | yyTimeFilter}}
 								</view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
                   备注信息 :
@@ -303,12 +310,12 @@
               <!-- 领血证 -->
               <view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
             </view>
-            
+
             <!-- 如果是万能交接-被服洗涤送回 -->
             <view class="page_item_btn" v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingSend' && item.gdState.value == 5" hover-class="seimin-btn-hover">
               <view class="page_item_btn" @click="goToWashingEnd(item)" hover-class="seimin-btn-hover">核对被服</view>
             </view>
-            
+
             <view class="page_item_btn" v-if="selectedLabelSlots == '待接单'" @click="showAlerts(item)" hover-class="seimin-btn-hover">接单</view>
           </view>
           <view class="L-l"></view>
@@ -377,7 +384,7 @@
 								</view>
 							</view>
 						</view>
-						
+
 						<view class="execFilterItem">
 							<view class="execFilterItemHeader">
 								申请科室
@@ -386,7 +393,7 @@
 								<input class="deptName" @click="searchAdm" v-model.trim="deptName" placeholder="请选择科室名称" placeholder-style="color:#cecece" />
 							</view>
 						</view>
-						
+
 						<view class="execFilterItem">
 							<view class="execFilterItemHeader">
 								任务类型
@@ -398,7 +405,7 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="execFilterFooter">
 						<view class="btn" @click="execFilterReset()">重置</view>
 						<view class="btn" @click="execFilterOk()">完成</view>
@@ -410,13 +417,13 @@
     <!-- 被服洗涤弹窗 -->
     <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
       @ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
-      
+
     <!-- 父级科室弹窗 -->
     <showModel :title="models2.title" icon="" :disjunctor="models2.disjunctor" :content="models2.content" @ok="ok2" @cancel="cancel2" :operate="models2.operate" :childrenDeptList="models2.list"></showModel>
-    
+
     <!-- 父级科室弹窗 -->
     <showModel :title="models3.title" icon="" :disjunctor="models3.disjunctor" :content="models3.content" @know="know3" @ok="ok3" @cancel="cancel3" :operate="models3.operate" :busyContentList="models3.list"></showModel>
-    
+
     <!-- 示闲弹窗 -->
     <showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
 		<scanner></scanner>
@@ -436,7 +443,7 @@
 	import uniDrawer from "@/components/uni-drawer/uni-drawer.vue";
 	import ldSelect from "@/components/ld-select/ld-select.vue";
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
-	
+
   import {
     get,
     post,
@@ -672,7 +679,7 @@
 										this.isNumberKey = false
 									}
 								}else if(i.key=='numberDigitalSecretKey'){
-									this.keyNum = Number(i.value) 
+									this.keyNum = Number(i.value)
 								}
 							}
 							for(let i = 0; i < this.keyNum; i++){
@@ -737,7 +744,7 @@
 			  if (accountObj) {
 			    list.handover = [accountObj.accountId];
 			  }
-			
+
 			  post("/workerOrder/" + type, list).then((res) => {
 			    console.log(this.tabType)
 			    uni.hideLoading();
@@ -1110,7 +1117,7 @@
             title: '未设置其他临床服务业务类型！'
           })
         }
-        
+
         this.getBloodPageConfig()
         this.waitingOrdersGetNum();
         this.executingOrders(0);
@@ -1754,7 +1761,7 @@
         if (this.currentCode) {
           let gdStateValue = data.gdState.value; //工单状态value
           let associationTypeValue = data.taskType.associationType.value; //关联类型value
-          
+
           // 其他临床服务，并且工单状态是待到达||工单状态待送达
           if (
             (associationTypeValue == "other" &&
@@ -2493,7 +2500,7 @@
                     });
                   }
                 });
-                
+
               } else {
                 uni.hideLoading();
                 uni.showToast({
@@ -2653,25 +2660,25 @@
           idx,
           sum: 20,
         };
-        
+
         if (this.currentId) {
           data.keyWord = this.currentId;
         } else {
           delete data.keyWord;
         }
-        
+
         if (this.deptId) {
           data.deptId = this.deptId;
         } else {
           delete data.deptId;
         }
-        
+
 				if (this.taskTypeId) {
 				  data.taskTypeId = this.taskTypeId;
 				} else {
 				  delete data.taskTypeId;
 				}
-				
+
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -2719,13 +2726,13 @@
 				} else {
 				  delete data.deptId;
 				}
-				
+
 				if (this.taskTypeId) {
 				  data.taskTypeId = this.taskTypeId;
 				} else {
 				  delete data.taskTypeId;
 				}
-				
+
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -2988,12 +2995,12 @@
 	/deep/ .selected-item-active{
 		border-bottom: 4rpx solid #49b856;
 	}
-	
+
   .Receiptpage {
     width: 100%;
     height: 100%;
     position: relative;
-    
+
     .execFilterMask{
       // position: fixed;
       // top: 0;
@@ -3004,14 +3011,14 @@
       // background-color: rgba(0, 0, 0, 0.5);
       // display: flex;
       // flex-direction: column;
-      // justify-content: flex-end;      
-      
+      // justify-content: flex-end;
+
       .execFilter{
         position: relative;
         background-color: #fff;
         height: 100vh;
         border-radius: 100rpx 100rpx 0 0;
-        
+
         .execFilterHeader{
           height: 70rpx;
           display: flex;
@@ -3019,7 +3026,7 @@
           align-items: center;
           border-bottom: 2rpx solid #ccc;
         }
-        
+
         .execFilterBody{
           .execFilterItem{
             padding: 32rpx;
@@ -3034,7 +3041,7 @@
               padding: 32rpx 0 0;
               justify-content: space-between;
               text-align: left;
-              
+
               .execFilterItemBox{
                 width: 200rpx;
                 height: 80rpx;
@@ -3048,7 +3055,7 @@
                   background-color: #49b856;
                 }
               }
-              
+
               .deptName {
                 height: 80rpx;
                 background-color: #f6f6f6;
@@ -3059,7 +3066,7 @@
             }
           }
         }
-        
+
         .execFilterFooter {
           position: absolute;
           bottom: 0;
@@ -3069,7 +3076,7 @@
           height: 100rpx;
           display: flex;
           justify-content: space-between;
-        
+
           .btn {
             height: 66rpx;
             flex: 1;
@@ -3084,7 +3091,7 @@
         }
       }
     }
-    
+
     .more {
       position: absolute;
       right: 20rpx;
@@ -3099,7 +3106,7 @@
       top: 50%;
       transform: translateY(-50%);
     }
-    
+
     .more_picker {
       position: absolute;
       right: 0;
@@ -3108,7 +3115,7 @@
       opacity: 0;
       z-index: 9999;
     }
-    
+
     .bigScreenWrap{
       position: fixed;
       left: 0;
@@ -3287,20 +3294,20 @@
                 line-height: 88rpx;
                 display: flex;
                 align-items: center;
-                
+
                 .emergencys {
                   background: #ff3b53 !important;
                   width: 124rpx !important;
                 }
-                
+
                 .emergency {
                   background: #ff3b53 !important;
                 }
-                
+
                 .emergency1 {
                   background: #49b856 !important;
                 }
-                
+
                 .page_item_cont_start {
                   text-align: center;
                   height: 44rpx;
@@ -3309,7 +3316,7 @@
                   border-radius: 8rpx;
                   background: #49b856;
                   color: #fff;
-                
+
                   .page_item_cont_start-img {
                     width: 22rpx;
                     position: relative;