csx 5 years ago
parent
commit
05824dc83e

+ 1 - 1
src/pages/main/dialog/OrdersDialog.vue View File

@@ -25,7 +25,7 @@
25 25
       </div>
26 26
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;" >
27 27
         <div class="content clearfix">
28
-          
28
+
29 29
           <table class="table">
30 30
             <tr @click="cancelAdviceSelect">
31 31
               <th width="8%">开嘱医生</th>

+ 5 - 1
src/pages/main/dialog/subMenu/checkBoxSubMenu.vue View File

@@ -11,8 +11,9 @@
11 11
     <div v-if="propsForm.isMultiple == 1" class="optionsBox">
12 12
       <div class="list">
13 13
         <ul>
14
+          <!--<li  @click="itemClick(-2)"  :key="-2" value="-2" >请选择</li>-->
14 15
           <li  @click="itemClick(item.id)"  v-for="item in propsForm.optionList" :key="item.id" value="item" :class="propsForm.selectId == item.id? 'tick':'' ">{{item.name}}</li>
15
-          <li v-if="propsForm.isHasOther == 1" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>
16
+          <li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>
16 17
 
17 18
         </ul>
18 19
       </div>
@@ -78,6 +79,9 @@ export default {
78 79
       return form;
79 80
     },
80 81
     itemClick: function(id) {
82
+      // if(id == -2){
83
+      //   this.visibility = false
84
+      // }
81 85
       this.propsForm.selectId = id;
82 86
       this.$emit("menu-comfirm", this.getValue());
83 87
     }

+ 2 - 1
src/pages/main/today/TodayTab.vue View File

@@ -120,7 +120,7 @@
120 120
     </van-popup>
121 121
 
122 122
     <van-popup title="临时医嘱" v-model="menuList[4].showPopup" :overlay="true" :close-on-click-overlay="false">
123
-      <orders-dialog :patient_prop="patient" :advice_groups="advice_groups" :advice_list_prop="doctor_advices" :admin_users_prop="admin_users" @orderDialog="closeStatOrder" ref="orders_dialog"></orders-dialog>
123
+      <orders-dialog :patient_prop="patient" :advice_groups="advice_groups" :advice_list_prop="doctor_advices" :admin_users_prop="admin_users" @orderDialog="closeStatOrder" ref="orders_dialog" > </orders-dialog>
124 124
     </van-popup>
125 125
 
126 126
     <van-popup title="双人查对" v-model="menuList[5].showPopup" :overlay="true" :close-on-click-overlay="false">
@@ -910,6 +910,7 @@ export default {
910 910
     },
911 911
     closeStatOrder: function() {
912 912
       this.closeDialog(4);
913
+      this.doctor_advices.push([])
913 914
       this.scrollToView("stat_order");
914 915
     },
915 916
     closeDialysisComputer: function() {