|
@@ -212,11 +212,18 @@
|
212
|
212
|
</view>
|
213
|
213
|
<view class="line"></view>
|
214
|
214
|
</view>
|
|
215
|
+ <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')">
|
|
216
|
+ <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
|
|
217
|
+ <view style="word-break: break-all;" v-if="item.workOrderRemark">
|
|
218
|
+ 备注信息 :
|
|
219
|
+ <text>{{ item.workOrderRemark || "暂无" }}</text>
|
|
220
|
+ </view>
|
|
221
|
+ <view class="line"></view>
|
|
222
|
+ </view>
|
215
|
223
|
<view class="page_item_conts" v-else>
|
216
|
224
|
<view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
|
217
|
225
|
<view>
|
218
|
|
- 预约时间 : {{ item.yyjdTime | yyTimeFilter
|
219
|
|
- }}
|
|
226
|
+ 预约时间 : {{ item.yyjdTime | yyTimeFilter}}
|
220
|
227
|
</view>
|
221
|
228
|
<view style="word-break: break-all;" v-if="item.workOrderRemark">
|
222
|
229
|
备注信息 :
|
|
@@ -303,12 +310,12 @@
|
303
|
310
|
<!-- 领血证 -->
|
304
|
311
|
<view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
|
305
|
312
|
</view>
|
306
|
|
-
|
|
313
|
+
|
307
|
314
|
<!-- 如果是万能交接-被服洗涤送回 -->
|
308
|
315
|
<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">
|
309
|
316
|
<view class="page_item_btn" @click="goToWashingEnd(item)" hover-class="seimin-btn-hover">核对被服</view>
|
310
|
317
|
</view>
|
311
|
|
-
|
|
318
|
+
|
312
|
319
|
<view class="page_item_btn" v-if="selectedLabelSlots == '待接单'" @click="showAlerts(item)" hover-class="seimin-btn-hover">接单</view>
|
313
|
320
|
</view>
|
314
|
321
|
<view class="L-l"></view>
|
|
@@ -377,7 +384,7 @@
|
377
|
384
|
</view>
|
378
|
385
|
</view>
|
379
|
386
|
</view>
|
380
|
|
-
|
|
387
|
+
|
381
|
388
|
<view class="execFilterItem">
|
382
|
389
|
<view class="execFilterItemHeader">
|
383
|
390
|
申请科室
|
|
@@ -386,7 +393,7 @@
|
386
|
393
|
<input class="deptName" @click="searchAdm" v-model.trim="deptName" placeholder="请选择科室名称" placeholder-style="color:#cecece" />
|
387
|
394
|
</view>
|
388
|
395
|
</view>
|
389
|
|
-
|
|
396
|
+
|
390
|
397
|
<view class="execFilterItem">
|
391
|
398
|
<view class="execFilterItemHeader">
|
392
|
399
|
任务类型
|
|
@@ -398,7 +405,7 @@
|
398
|
405
|
</view>
|
399
|
406
|
</view>
|
400
|
407
|
</view>
|
401
|
|
-
|
|
408
|
+
|
402
|
409
|
<view class="execFilterFooter">
|
403
|
410
|
<view class="btn" @click="execFilterReset()">重置</view>
|
404
|
411
|
<view class="btn" @click="execFilterOk()">完成</view>
|
|
@@ -410,13 +417,13 @@
|
410
|
417
|
<!-- 被服洗涤弹窗 -->
|
411
|
418
|
<showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
|
412
|
419
|
@ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
|
413
|
|
-
|
|
420
|
+
|
414
|
421
|
<!-- 父级科室弹窗 -->
|
415
|
422
|
<showModel :title="models2.title" icon="" :disjunctor="models2.disjunctor" :content="models2.content" @ok="ok2" @cancel="cancel2" :operate="models2.operate" :childrenDeptList="models2.list"></showModel>
|
416
|
|
-
|
|
423
|
+
|
417
|
424
|
<!-- 父级科室弹窗 -->
|
418
|
425
|
<showModel :title="models3.title" icon="" :disjunctor="models3.disjunctor" :content="models3.content" @know="know3" @ok="ok3" @cancel="cancel3" :operate="models3.operate" :busyContentList="models3.list"></showModel>
|
419
|
|
-
|
|
426
|
+
|
420
|
427
|
<!-- 示闲弹窗 -->
|
421
|
428
|
<showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
|
422
|
429
|
<scanner></scanner>
|
|
@@ -436,7 +443,7 @@
|
436
|
443
|
import uniDrawer from "@/components/uni-drawer/uni-drawer.vue";
|
437
|
444
|
import ldSelect from "@/components/ld-select/ld-select.vue";
|
438
|
445
|
import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
|
439
|
|
-
|
|
446
|
+
|
440
|
447
|
import {
|
441
|
448
|
get,
|
442
|
449
|
post,
|
|
@@ -672,7 +679,7 @@
|
672
|
679
|
this.isNumberKey = false
|
673
|
680
|
}
|
674
|
681
|
}else if(i.key=='numberDigitalSecretKey'){
|
675
|
|
- this.keyNum = Number(i.value)
|
|
682
|
+ this.keyNum = Number(i.value)
|
676
|
683
|
}
|
677
|
684
|
}
|
678
|
685
|
for(let i = 0; i < this.keyNum; i++){
|
|
@@ -737,7 +744,7 @@
|
737
|
744
|
if (accountObj) {
|
738
|
745
|
list.handover = [accountObj.accountId];
|
739
|
746
|
}
|
740
|
|
-
|
|
747
|
+
|
741
|
748
|
post("/workerOrder/" + type, list).then((res) => {
|
742
|
749
|
console.log(this.tabType)
|
743
|
750
|
uni.hideLoading();
|
|
@@ -1110,7 +1117,7 @@
|
1110
|
1117
|
title: '未设置其他临床服务业务类型!'
|
1111
|
1118
|
})
|
1112
|
1119
|
}
|
1113
|
|
-
|
|
1120
|
+
|
1114
|
1121
|
this.getBloodPageConfig()
|
1115
|
1122
|
this.waitingOrdersGetNum();
|
1116
|
1123
|
this.executingOrders(0);
|
|
@@ -1754,7 +1761,7 @@
|
1754
|
1761
|
if (this.currentCode) {
|
1755
|
1762
|
let gdStateValue = data.gdState.value; //工单状态value
|
1756
|
1763
|
let associationTypeValue = data.taskType.associationType.value; //关联类型value
|
1757
|
|
-
|
|
1764
|
+
|
1758
|
1765
|
// 其他临床服务,并且工单状态是待到达||工单状态待送达
|
1759
|
1766
|
if (
|
1760
|
1767
|
(associationTypeValue == "other" &&
|
|
@@ -2493,7 +2500,7 @@
|
2493
|
2500
|
});
|
2494
|
2501
|
}
|
2495
|
2502
|
});
|
2496
|
|
-
|
|
2503
|
+
|
2497
|
2504
|
} else {
|
2498
|
2505
|
uni.hideLoading();
|
2499
|
2506
|
uni.showToast({
|
|
@@ -2653,25 +2660,25 @@
|
2653
|
2660
|
idx,
|
2654
|
2661
|
sum: 20,
|
2655
|
2662
|
};
|
2656
|
|
-
|
|
2663
|
+
|
2657
|
2664
|
if (this.currentId) {
|
2658
|
2665
|
data.keyWord = this.currentId;
|
2659
|
2666
|
} else {
|
2660
|
2667
|
delete data.keyWord;
|
2661
|
2668
|
}
|
2662
|
|
-
|
|
2669
|
+
|
2663
|
2670
|
if (this.deptId) {
|
2664
|
2671
|
data.deptId = this.deptId;
|
2665
|
2672
|
} else {
|
2666
|
2673
|
delete data.deptId;
|
2667
|
2674
|
}
|
2668
|
|
-
|
|
2675
|
+
|
2669
|
2676
|
if (this.taskTypeId) {
|
2670
|
2677
|
data.taskTypeId = this.taskTypeId;
|
2671
|
2678
|
} else {
|
2672
|
2679
|
delete data.taskTypeId;
|
2673
|
2680
|
}
|
2674
|
|
-
|
|
2681
|
+
|
2675
|
2682
|
uni.showLoading({
|
2676
|
2683
|
title: "加载中",
|
2677
|
2684
|
mask: true,
|
|
@@ -2719,13 +2726,13 @@
|
2719
|
2726
|
} else {
|
2720
|
2727
|
delete data.deptId;
|
2721
|
2728
|
}
|
2722
|
|
-
|
|
2729
|
+
|
2723
|
2730
|
if (this.taskTypeId) {
|
2724
|
2731
|
data.taskTypeId = this.taskTypeId;
|
2725
|
2732
|
} else {
|
2726
|
2733
|
delete data.taskTypeId;
|
2727
|
2734
|
}
|
2728
|
|
-
|
|
2735
|
+
|
2729
|
2736
|
uni.showLoading({
|
2730
|
2737
|
title: "加载中",
|
2731
|
2738
|
mask: true,
|
|
@@ -2988,12 +2995,12 @@
|
2988
|
2995
|
/deep/ .selected-item-active{
|
2989
|
2996
|
border-bottom: 4rpx solid #49b856;
|
2990
|
2997
|
}
|
2991
|
|
-
|
|
2998
|
+
|
2992
|
2999
|
.Receiptpage {
|
2993
|
3000
|
width: 100%;
|
2994
|
3001
|
height: 100%;
|
2995
|
3002
|
position: relative;
|
2996
|
|
-
|
|
3003
|
+
|
2997
|
3004
|
.execFilterMask{
|
2998
|
3005
|
// position: fixed;
|
2999
|
3006
|
// top: 0;
|
|
@@ -3004,14 +3011,14 @@
|
3004
|
3011
|
// background-color: rgba(0, 0, 0, 0.5);
|
3005
|
3012
|
// display: flex;
|
3006
|
3013
|
// flex-direction: column;
|
3007
|
|
- // justify-content: flex-end;
|
3008
|
|
-
|
|
3014
|
+ // justify-content: flex-end;
|
|
3015
|
+
|
3009
|
3016
|
.execFilter{
|
3010
|
3017
|
position: relative;
|
3011
|
3018
|
background-color: #fff;
|
3012
|
3019
|
height: 100vh;
|
3013
|
3020
|
border-radius: 100rpx 100rpx 0 0;
|
3014
|
|
-
|
|
3021
|
+
|
3015
|
3022
|
.execFilterHeader{
|
3016
|
3023
|
height: 70rpx;
|
3017
|
3024
|
display: flex;
|
|
@@ -3019,7 +3026,7 @@
|
3019
|
3026
|
align-items: center;
|
3020
|
3027
|
border-bottom: 2rpx solid #ccc;
|
3021
|
3028
|
}
|
3022
|
|
-
|
|
3029
|
+
|
3023
|
3030
|
.execFilterBody{
|
3024
|
3031
|
.execFilterItem{
|
3025
|
3032
|
padding: 32rpx;
|
|
@@ -3034,7 +3041,7 @@
|
3034
|
3041
|
padding: 32rpx 0 0;
|
3035
|
3042
|
justify-content: space-between;
|
3036
|
3043
|
text-align: left;
|
3037
|
|
-
|
|
3044
|
+
|
3038
|
3045
|
.execFilterItemBox{
|
3039
|
3046
|
width: 200rpx;
|
3040
|
3047
|
height: 80rpx;
|
|
@@ -3048,7 +3055,7 @@
|
3048
|
3055
|
background-color: #49b856;
|
3049
|
3056
|
}
|
3050
|
3057
|
}
|
3051
|
|
-
|
|
3058
|
+
|
3052
|
3059
|
.deptName {
|
3053
|
3060
|
height: 80rpx;
|
3054
|
3061
|
background-color: #f6f6f6;
|
|
@@ -3059,7 +3066,7 @@
|
3059
|
3066
|
}
|
3060
|
3067
|
}
|
3061
|
3068
|
}
|
3062
|
|
-
|
|
3069
|
+
|
3063
|
3070
|
.execFilterFooter {
|
3064
|
3071
|
position: absolute;
|
3065
|
3072
|
bottom: 0;
|
|
@@ -3069,7 +3076,7 @@
|
3069
|
3076
|
height: 100rpx;
|
3070
|
3077
|
display: flex;
|
3071
|
3078
|
justify-content: space-between;
|
3072
|
|
-
|
|
3079
|
+
|
3073
|
3080
|
.btn {
|
3074
|
3081
|
height: 66rpx;
|
3075
|
3082
|
flex: 1;
|
|
@@ -3084,7 +3091,7 @@
|
3084
|
3091
|
}
|
3085
|
3092
|
}
|
3086
|
3093
|
}
|
3087
|
|
-
|
|
3094
|
+
|
3088
|
3095
|
.more {
|
3089
|
3096
|
position: absolute;
|
3090
|
3097
|
right: 20rpx;
|
|
@@ -3099,7 +3106,7 @@
|
3099
|
3106
|
top: 50%;
|
3100
|
3107
|
transform: translateY(-50%);
|
3101
|
3108
|
}
|
3102
|
|
-
|
|
3109
|
+
|
3103
|
3110
|
.more_picker {
|
3104
|
3111
|
position: absolute;
|
3105
|
3112
|
right: 0;
|
|
@@ -3108,7 +3115,7 @@
|
3108
|
3115
|
opacity: 0;
|
3109
|
3116
|
z-index: 9999;
|
3110
|
3117
|
}
|
3111
|
|
-
|
|
3118
|
+
|
3112
|
3119
|
.bigScreenWrap{
|
3113
|
3120
|
position: fixed;
|
3114
|
3121
|
left: 0;
|
|
@@ -3287,20 +3294,20 @@
|
3287
|
3294
|
line-height: 88rpx;
|
3288
|
3295
|
display: flex;
|
3289
|
3296
|
align-items: center;
|
3290
|
|
-
|
|
3297
|
+
|
3291
|
3298
|
.emergencys {
|
3292
|
3299
|
background: #ff3b53 !important;
|
3293
|
3300
|
width: 124rpx !important;
|
3294
|
3301
|
}
|
3295
|
|
-
|
|
3302
|
+
|
3296
|
3303
|
.emergency {
|
3297
|
3304
|
background: #ff3b53 !important;
|
3298
|
3305
|
}
|
3299
|
|
-
|
|
3306
|
+
|
3300
|
3307
|
.emergency1 {
|
3301
|
3308
|
background: #49b856 !important;
|
3302
|
3309
|
}
|
3303
|
|
-
|
|
3310
|
+
|
3304
|
3311
|
.page_item_cont_start {
|
3305
|
3312
|
text-align: center;
|
3306
|
3313
|
height: 44rpx;
|
|
@@ -3309,7 +3316,7 @@
|
3309
|
3316
|
border-radius: 8rpx;
|
3310
|
3317
|
background: #49b856;
|
3311
|
3318
|
color: #fff;
|
3312
|
|
-
|
|
3319
|
+
|
3313
|
3320
|
.page_item_cont_start-img {
|
3314
|
3321
|
width: 22rpx;
|
3315
|
3322
|
position: relative;
|