新分支

src/xt_pages/dialysis/bloodPresssWatch.vue

         </div>
       </div>
       
-      <!-- <div style="margin-left: 1150px; margin-bottom: 10px;">
-        <el-button type="primary" size="small" @toClicK="toExport">导出</el-button>
+      <!-- <div style="margin-left: 1050px; margin-bottom: 10px;">
+        <el-button type="primary" size="small" @click="toExport">导出</el-button>
       </div> -->
 
       <el-table
 </template>
 
 <script>
+import UploadExcel from '@/xt_pages/components/UploadExcel'
 import { getDataConfig } from "@/utils/data";
 import store from "@/store";
 import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { getPrintTemplate } from "@/api/data";
 import { uParseTime } from '@/utils/tools'
 const moment = require('moment')
+
 export default {
   name: "Patient",
+  components: {
+   UploadExcel,
+ },
   data() {
     return {
       crumbs: [
     },
     toExport(){
       import('@/vendor/Export2Excel').then(excel => { 
-         
-         console.log("监测统计",this.SchedualPatientsTableData)
         
-         const tHeader = ['序号','机号','规格','数量']
-         const filterVal = ['index','advice_name','specification_name','total_count']
-
-         const data = this.formatJson(filterVal, this.tableList)
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '药品统计'
-         })
-           this.downloadLoading = false
-         })  
+         if(this.SchedualPatientsTableData!=null){
+          for(let i=0;i<this.SchedualPatientsTableData.length;i++){
+             this.SchedualPatientsTableData[i].index = i + 1
+             this.SchedualPatientsTableData[i].start_time_one = ""
+             this.SchedualPatientsTableData[i].start_time_two = ""
+             this.SchedualPatientsTableData[i].start_time_three = ""
+             this.SchedualPatientsTableData[i].start_time_four = ""
+             this.SchedualPatientsTableData[i].start_time_five = ""
+             this.SchedualPatientsTableData[i].start_time_six = ""
+             this.SchedualPatientsTableData[i].start_time_seven = ""
+             if(this.SchedualPatientsTableData[i].monitoring_record!=null&&this.SchedualPatientsTableData[i].monitoring_record.length>0){
+             
+              if(this.SchedualPatientsTableData[i].monitoring_record.length ==1){
+                if(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time!=undefined){
+                this.SchedualPatientsTableData[i].start_time_one =this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time) 
+               }
+              }
+              if(this.SchedualPatientsTableData[i].monitoring_record.length ==2){
+                if(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time!=undefined){
+                this.SchedualPatientsTableData[i].start_time_two = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time)
+               }
+              }
+
+              if(this.SchedualPatientsTableData[i].monitoring_record.length==3){
+                if(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time!=undefined){
+                 this.SchedualPatientsTableData[i].start_time_three = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time) 
+               }   
+              }
+              
+              if(this.SchedualPatientsTableData[i].monitoring_record.length ==4){
+                if(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time!=undefined){
+                  this.SchedualPatientsTableData[i].start_time_four = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time)
+                }
+              }
+            
+              if(this.SchedualPatientsTableData[i].monitoring_record.length ==5){
+                if(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time!=undefined){
+                  this.SchedualPatientsTableData[i].start_time_five = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time) 
+                }
+              }
+              
+              if(this.SchedualPatientsTableData[i].monitoring_record.length ==6){
+                if(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time!=undefined){
+                this.SchedualPatientsTableData[i].start_time_six = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time) 
+               }
+              }
+              if(this.SchedualPatientsTableData[i].monitoring_record.length == 7){
+                if(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time!=undefined){
+                 this.SchedualPatientsTableData[i].start_time_seven = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time) 
+               }
+              }
+           
+            
+             
+            
+             }
+          }
+          
+         }
+         console.log("监测统计",this.SchedualPatientsTableData)
+         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间']]
+         const header = ['','','','','','','','','','','','1','2','3','4','5','6','7']
+         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1']
+          const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one']
+     
+         const data = this.formatJson(filterVal, this.SchedualPatientsTableData) 
+         const filename = '监测数据'
+
+         console.log("datawoowowow",data)
+        excel.export_json_to_excel({
+          multiHeader,
+          header,
+          merges,
+          data,
+          filename
+        })
+       })
     },
     formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
-    }
+       return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   },
   components: {
     BreadCrumb

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

                     srcset=""
                     v-else
                   />
-                 
+
                 </td>
               </tr>
             </table>
                             afterdialysis.additional_weight
                         ).toFixed(1)
                       : "/"
-                  }}
+                  }}kg
                 </td>
                 <td>实超：{{ afterdialysis.actual_ultrafiltration }}ml</td>
                 <td>实际治疗时长：
                 </td>
               </tr>
             </table>
-          
+
           </div>
         </div>
       </div>
   .table tr td{
     padding: 5px;
   }
-  
+
 
 }
 </style>

src/xt_pages/user/components/PatientForm.vue

             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
-              this.form.patient_source = 4
+              this.form.patient_source = 1
             }
 
             if(this.form.patient_source == "NaN"){
-              this.form.patient_source = 4
+              this.form.patient_source = 1
             }
             
           
             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
-              this.form.patient_source = 4
+              this.form.patient_source = 1
             }
 
             if(this.form.patient_source == "NaN"){
-              this.form.patient_source = 4
+              this.form.patient_source = 1
             }
             console.log("form233322332w",this.form)
 

src/xt_pages/workforce/appointment.vue

           '机号'
         ]
         if (this.export_type == 0) {
-
           const multiHeader = [['区号', '机号', '周一' + "(" + this.days[0] + ")", '', '', '周二' + "(" + this.days[1] + ")", '', '', '周三' + "(" + this.days[2] + ")", '', '', '周四' + "(" + this.days[3] + ")", '', '', '周五' + "(" + this.days[4] + ")", '', '', '周六' + "(" + this.days[5] + ")", '', '', '周日' + "(" + this.days[6] + ")", '', '', '周一' + "(" + this.days[7] + ")", '', '', '周二' + "(" + this.days[8] + ")", '', '', '周三' + "(" + this.days[9] + ")", '', '', '周四' + "(" + this.days[10] + ")", '', '', '周五' + "(" + this.days[11] + ")", '', '', '周六' + "(" + this.days[12] + ")", '', '', '周日' + "(" + this.days[13] + ")", '', '', '周一' + "(" + this.days[14] + ")", '', '', '周二' + "(" + this.days[15] + ")", '', '', '周三' + "(" + this.days[16] + ")", '', '', '周四' + "(" + this.days[17] + ")", '', '', '周五' + "(" + this.days[18] + ")", '', '', '周六' + "(" + this.days[19] + ")", '', '', '周日' + "(" + this.days[20] + ")", '', '']]
           const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
           })
 
           const filename = '排班模版'
-
+         
+          
           excel.export_json_to_excel({
             multiHeader,
             header,