|
@@ -555,7 +555,7 @@
|
555
|
555
|
@mouseup="ends"
|
556
|
556
|
@touchend="ends"
|
557
|
557
|
@touchcancel="ends" alt />
|
558
|
|
- <span class="redpoints">
|
|
558
|
+ <span class="redpoints" v-if="total>0">
|
559
|
559
|
{{ total }}
|
560
|
560
|
</span>
|
561
|
561
|
</div>
|
|
@@ -1092,7 +1092,7 @@ export default {
|
1092
|
1092
|
}
|
1093
|
1093
|
this.timerDia = window.setInterval(() => {
|
1094
|
1094
|
setTimeout(this.getAdviceListNoExecution(admin_user_id), 0)
|
1095
|
|
- }, 1000*60)
|
|
1095
|
+ }, 1000*300)
|
1096
|
1096
|
// document.body.addEventListener('focusin', () => {
|
1097
|
1097
|
// //软键盘弹出的事件处理
|
1098
|
1098
|
// if(this.barActive != 3 && this.barActive != 4 && this.barActive != 6){
|
|
@@ -3733,6 +3733,7 @@ export default {
|
3733
|
3733
|
if( this.drugStockConfig.is_open == 2 || this.drugStockConfig.is_open == 0){
|
3734
|
3734
|
this.adviceList = response.data.data.adviceList
|
3735
|
3735
|
console.log("未执行的医嘱",this.adviceList)
|
|
3736
|
+ this.total= 0
|
3736
|
3737
|
if(this.adviceList!=null && this.adviceList.length>0){
|
3737
|
3738
|
for(let i=0;i<this.adviceList.length;i++){
|
3738
|
3739
|
this.total += this.adviceList[i].count
|
|
@@ -3759,6 +3760,7 @@ export default {
|
3759
|
3760
|
}
|
3760
|
3761
|
|
3761
|
3762
|
}
|
|
3763
|
+ this.total= 0
|
3762
|
3764
|
this.total = total_one + total_two
|
3763
|
3765
|
}
|
3764
|
3766
|
|