seimin 1 year ago
parent
commit
3d35d6641e

+ 1 - 1
pages/outpatient/outpatientEndComplete/outpatientEndComplete.vue

@@ -19,7 +19,7 @@
19 19
               {{item.taskType ? item.taskType.taskName : ''}}
20 20
             </view>
21 21
             <view class="value">
22
-              {{item.completeTime | formatDate('yyyy-MM-dd hh:mm')}}
22
+              {{item.completeDateTime | formatDate('yyyy-MM-dd hh:mm')}}
23 23
             </view>
24 24
           </view>
25 25
         </scroll-view>

+ 21 - 14
pages/receipt_infopage/receipt_infopage.vue

@@ -194,7 +194,7 @@
194 194
           <text class="text1">陪检方式</text>
195 195
           <text class="text2">{{ infoDATA.inspectScore.inspectMode }}</text>
196 196
         </view>
197
-        
197
+
198 198
         <view class="page_item_foot_text"
199 199
           v-if="(infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport') && infoDATA.inspectUsers">
200 200
           <text class="text1">陪检人员</text>
@@ -205,7 +205,7 @@
205 205
           <text class="text1">陪检人数</text>
206 206
           <text class="text2">{{ infoDATA.inspectUsersNum }}</text>
207 207
         </view>
208
-        
208
+
209 209
         <view class="page_item_foot_text"
210 210
           v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.inspectUsers">
211 211
           <text class="text1">执行人员</text>
@@ -360,7 +360,7 @@
360 360
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">完成工单</view>
361 361
         <!-- 其他临床服务-拍照 -->
362 362
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].photoSwitch" class="btn2 page_item_btn" @click="photographToOther(infoDATA, 'start')" hover-class="seimin-btn-hover">拍照</view>
363
-        
363
+
364 364
         <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
365 365
           infoDATA.taskType.associationType.value != 'jPBag' &&
366 366
           infoDATA.taskType.associationType.value != 'drugsBag' &&
@@ -587,16 +587,23 @@
587 587
               // 200检测通过,201没有有效期也通过。
588 588
               if (result.state == 200 || result.state == 201) {
589 589
                 uni.hideLoading();
590
-                this.models2 = {
591
-                  disjunctor: true,
592
-                  title: "提示",
593
-                  content: `您确认要与<span class="red">${this.patientHandoverCode.name}</span>交接吗?`,
594
-                  icon: "warn",
595
-                  operate: {
596
-                    ok: "确定",
597
-                    cancel: "取消",
598
-                  },
599
-                };
590
+                if(this.patientHandoverCode){
591
+                  this.models2 = {
592
+                    disjunctor: true,
593
+                    title: "提示",
594
+                    content: `您确认要与<span class="red">${this.patientHandoverCode.name}</span>交接吗?`,
595
+                    icon: "warn",
596
+                    operate: {
597
+                      ok: "确定",
598
+                      cancel: "取消",
599
+                    },
600
+                  };
601
+                }else{
602
+                  uni.showToast({
603
+                    icon: "none",
604
+                    title: "请扫描正确的二维码!",
605
+                  });
606
+                }
600 607
               } else {
601 608
                 uni.hideLoading();
602 609
                 uni.showToast({
@@ -717,7 +724,7 @@
717 724
         if (this.currentCode) {
718 725
           let gdStateValue = data.gdState.value; //工单状态value
719 726
           let associationTypeValue = data.taskType.associationType.value; //关联类型value
720
-          
727
+
721 728
           // 其他临床服务,并且工单状态是待到达||工单状态待送达
722 729
           if (
723 730
             (associationTypeValue == "other" &&