Browse Source

BUG修改

seimin 3 years ago
parent
commit
e5d7d89ae2
2 changed files with 8 additions and 7 deletions
  1. 6 6
      pages/index/index.vue
  2. 2 1
      pages/login/login.vue

+ 6 - 6
pages/index/index.vue

@@ -419,23 +419,23 @@
419 419
           });
420 420
           throw new Error('无法获取到标本任务类型id');
421 421
         }
422
-        uni.navigateTo({
423
-          url: "/pages/quickCreateOrder/quickCreateOrder",
424
-        });
425 422
         this.changeQucikCreateOrderType({
426 423
           type: "specimen",
427 424
           taskTypeId: this.specimenTaskTypeId,
428 425
         });
429
-      },
430
-      //其他临床服务快捷建单
431
-      quickOrderOther(quickOther) {
432 426
         uni.navigateTo({
433 427
           url: "/pages/quickCreateOrder/quickCreateOrder",
434 428
         });
429
+      },
430
+      //其他临床服务快捷建单
431
+      quickOrderOther(quickOther) {
435 432
         this.changeQucikCreateOrderType({
436 433
           type: "other",
437 434
           taskTypeId: quickOther.id,
438 435
         });
436
+        uni.navigateTo({
437
+          url: "/pages/quickCreateOrder/quickCreateOrder",
438
+        });
439 439
       },
440 440
       // 切换科室弹窗
441 441
       showDeptModel() {

+ 2 - 1
pages/login/login.vue

@@ -24,6 +24,7 @@
24 24
 		<view class="tips red">
25 25
 			(此系统为护士人员使用,其他科室人员请勿进行操作)
26 26
 		</view>
27
+    <seiminModel ref="seiminModel"></seiminModel>
27 28
 	</view>
28 29
 </template>
29 30
 
@@ -119,10 +120,10 @@
119 120
 							uni.removeStorageSync("savePasswordObj");
120 121
 						}
121 122
 						// 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
123
+            this.changeSeiminModel(true);
122 124
 						uni.redirectTo({
123 125
 							url: "/pages/index/index",
124 126
 						});
125
-						this.changeSeiminModel(true);
126 127
 					} else {
127 128
 						this.$refs.seiminModel.show({
128 129
 							skin: "toast",