瀏覽代碼

no message

张保健 5 年之前
父節點
當前提交
fc3098820d

+ 1 - 1
src/pages/main/WaitingArea.vue 查看文件

129
       menuList: [
129
       menuList: [
130
         { value: "1", label: "全部", count: 0 },
130
         { value: "1", label: "全部", count: 0 },
131
         { value: "3", label: "待开处方", count: 0 },
131
         { value: "3", label: "待开处方", count: 0 },
132
-        { value: "2", label: "透前称量", count: 0 }
132
+        { value: "2", label: "透前称量", count: 0 }
133
       ],
133
       ],
134
 
134
 
135
       select_index: 0,
135
       select_index: 0,

文件差異過大導致無法顯示
+ 1204 - 953
src/pages/main/dialog/PrescriptionDialog.vue


+ 3 - 6
src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue 查看文件

23
              <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
23
              <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
24
               <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
24
               <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
25
               <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
25
               <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
26
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每日必推</div>
27
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 2"> 推送频率&nbsp;{{advice.day_count}}天/次</div>
28
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 3"> 推送频率&nbsp;每周{{advice.week_day}}</div>
26
 
29
 
27
             </van-checkbox>
30
             </van-checkbox>
28
           </van-checkbox-group>
31
           </van-checkbox-group>
123
       },
126
       },
124
       getValue: function () {
127
       getValue: function () {
125
         let form = {}
128
         let form = {}
126
-
127
         let results = []
129
         let results = []
128
-
129
         for (let i = 0; i < this.propsForm.list.length; i++){
130
         for (let i = 0; i < this.propsForm.list.length; i++){
130
           for (let a = 0; a < this.propsForm.result.length; a++){
131
           for (let a = 0; a < this.propsForm.result.length; a++){
131
             if( this.propsForm.list[i].id == this.propsForm.result[a]){
132
             if( this.propsForm.list[i].id == this.propsForm.result[a]){
133
             }
134
             }
134
           }
135
           }
135
         }
136
         }
136
-
137
         var obj5={}
137
         var obj5={}
138
         results = results.reduce((cur, next) => {
138
         results = results.reduce((cur, next) => {
139
           obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
139
           obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
140
           return cur
140
           return cur
141
         }, [])
141
         }, [])
142
-
143
-        results
144
-
145
         return results
142
         return results
146
       },
143
       },
147
 
144
 

+ 8 - 24
src/pages/main/today/TodayTab.vue 查看文件

160
 
160
 
161
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
161
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
162
       <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
162
       <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
163
-                    :special_premission="special_premission" 
163
+                    :special_premission="special_premission"
164
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
164
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
165
     </van-popup>
165
     </van-popup>
166
 
166
 
347
         ) {
347
         ) {
348
           steps[2].value = 1
348
           steps[2].value = 1
349
         }
349
         }
350
-        if (this.doctor_advices.length > 0) {
350
+        if (this.advice_groups.length > 0) {
351
           steps[3].value = 1
351
           steps[3].value = 1
352
         }
352
         }
353
 
353
 
753
           patient_id: this.patient_id,
753
           patient_id: this.patient_id,
754
           date: dateStr
754
           date: dateStr
755
         }
755
         }
756
+        this.advice_groups = []
757
+
756
         getDialysisRecord(params).then(rs => {
758
         getDialysisRecord(params).then(rs => {
757
           var resp = rs.data
759
           var resp = rs.data
758
           console.log(resp)
760
           console.log(resp)
1021
 
1023
 
1022
       },
1024
       },
1023
       prescriptionFunc: function (val) {
1025
       prescriptionFunc: function (val) {
1024
-        if (this.status == 2) {
1025
-          if (val.creater > 0 && val.modifier == 0) {
1026
-            this.requestDialysisRecord()
1027
-          }
1028
-
1029
-        } else if (this.status == 3) {
1030
-          if (val.creater > 0 && val.modifier == 0) {
1031
-            this.requestDialysisRecord()
1032
-          }
1033
-        }
1026
+        this.requestDialysisRecord()
1034
 
1027
 
1035
         this.prescription = val
1028
         this.prescription = val
1036
 
1029
 
1038
       ,
1031
       ,
1039
       longSolutionFunc: function (val) {
1032
       longSolutionFunc: function (val) {
1040
         this.solution = val
1033
         this.solution = val
1041
-        if (this.status == 2) {
1042
-          if (val.creater > 0 && val.modifier == 0) {
1043
-            this.requestDialysisRecord()
1044
-          }
1045
-
1046
-        } else if (this.status == 3) {
1047
-          if (val.creater > 0 && val.modifier == 0) {
1048
-            this.requestDialysisRecord()
1049
-          }
1050
-        }
1034
+        this.requestDialysisRecord()
1051
 
1035
 
1052
       }
1036
       }
1053
       ,
1037
       ,
1072
       }
1056
       }
1073
       ,
1057
       ,
1074
       closeStatOrder: function () {
1058
       closeStatOrder: function () {
1059
+
1075
         this.closeDialog(4)
1060
         this.closeDialog(4)
1076
-        this.doctor_advices.push([])
1077
-        // this.scrollToView('stat_order')
1061
+        this.scrollToView('stat_order')
1078
       }
1062
       }
1079
       ,
1063
       ,
1080
       closeDialysisComputer: function (dialysis_order) {
1064
       closeDialysisComputer: function (dialysis_order) {

+ 1 - 1
src/pages/main/today/statOrder.vue 查看文件

23
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
23
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
24
               <span>{{advice.advice_name }}</span>
24
               <span>{{advice.advice_name }}</span>
25
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
25
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
26
-              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
26
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
27
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
27
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
28
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
28
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
29
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
29
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>