Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/prescription.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container ">
-      
+
       <div class="dataTitle">透析模板</div>
 
       <div
@@ -788,7 +788,22 @@ export default {
           sodium: 1,
           calcium: 1,
           bicarbonate: 1
-       }
+       },
+        {
+          id: 25,
+          name: 'HD高通',
+          dialysis_duration: 1,
+          replacement_way: 1,
+          hemodialysis_machine: 2,
+          blood_filter: 1,
+          perfusion_apparatus: 2,
+          blood_flow_volume: 1,
+          dialysate_flow: 1,
+          kalium: 1,
+          sodium: 1,
+          calcium: 1,
+          bicarbonate: 1
+        }
       ],
       addPlan: {
         id: 0,
@@ -888,7 +903,7 @@ export default {
           this.InnerDialogProps.type = 'dialyzers'
           this.InnerDialogProps.selected = this.dialysis_dialyszers
           this.InnerDialogProps.isShowTextArea = false
-        
+
           break
         case '7':
           for(let i=0;i<this.irrigations.length;i++){
@@ -899,7 +914,7 @@ export default {
           this.InnerDialogProps.type = 'irrigations'
           this.InnerDialogProps.selected = this.dialysis_irrigation
           this.InnerDialogProps.isShowTextArea = false
-        
+
           break
       }
     },
@@ -1008,7 +1023,7 @@ export default {
             prescription.dialysis_duration = parseFloat(prescription.dialysis_duration_hour) + parseFloat((prescription.dialysis_duration_minute / 60).toFixed(2))
            if(prescription.dialysate_formulation == 0){
               prescription.dialysate_formulation = ""
-           } 
+           }
            if(prescription.body_fluid ==0 ){
              prescription.body_fluid = ""
            }
@@ -1058,7 +1073,7 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
-          
+
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
@@ -1178,7 +1193,7 @@ export default {
 
     this.blood_filters = this.$store.getters.blood_filters;
     this.dialysate_formulation = this.$store.getters.dialysate_formulation;
-   
+
     this.body_fluid_option = this.$store.getters.body_fluid;
     this.special_medicine_option = this.$store.getters.special_medicine;
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
@@ -1191,8 +1206,8 @@ export default {
     )
     this.getAllSystemPrescription();
     this.getSystemPrescription(this.addPlan.mode);
-    
-   
+
+
   },
   watch: {
     "addPlan.dialysis_duration": function() {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -5,6 +5,24 @@
         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
+
+
+                <el-date-picker
+                        v-model="record_date"
+                        prefix-icon="el-icon-date"
+                        @change="changeTimeTwo"
+                        :editable="false"
+                        style="width: 100%;"
+                        type="date"
+                        :picker-options="pickerOptions"
+                        placeholder="选择开始时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+
+
+
                 <div class="mainCell" style="justify-content: space-between;">
                     <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
                     <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
@@ -398,6 +416,9 @@
       }
     },
     methods: {
+      changeTimeTwo() {
+        this.getList()
+      },
       openPrint() {
         // this.centerDialogVisible = true
         this.getPrescriptionList(this.patientInfo.id)