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

src/api/role/admin.js

@@ -318,4 +318,13 @@ export function toCheckPDFInformation(params){
     method:"Get",
     params:params,
   })
-}
+}
+
+// export function getdruginfoInformation(params){
+
+//    return request({
+//     url:"/api/device/getdruginfoinformation",
+//     method:"Get",
+//     params:params,
+//    })
+// }

src/xt_pages/device/airDisinfectTwo.vue

@@ -1575,7 +1575,37 @@
         })
         }, 
       AddCard(){
-        this.dialogFormVisible =  true
+        console.log("storeywowoowow",this.form.storey)
+        if(this.form.storey!=""){
+          console.log("进来2222")
+          getAirDisinfectWayLongTime(this.form.department).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+           
+           var first_total_time = 0
+         
+           var last_total_time = 0
+           if(list!=null && list.length>0){
+              for(let i=0;i<list.length;i++){
+                first_total_time += parseFloat(list[i].first_total_time)
+                last_total_time +=parseFloat(list[i].last_total_time)
+              }
+           
+            this.form.first_total_time = ""
+            this.form.first_total_time = first_total_time
+            this.first_total_time = first_total_time
+            this.form.last_total_time =""
+            this.form.last_total_time = last_total_time
+            this.last_total_time = last_total_time
+            }
+            this.dialogFormVisible = true
+          }  
+        })  
+        }else{
+          console.log("进来11111")
+          this.dialogFormVisible =  true
+        }
+       
       },
       AddCardOne(){
         getAirDisinfectWayLongTime(this.form.department).then(response=>{

src/xt_pages/dialysis/PatientBox.vue

@@ -269,7 +269,7 @@ import {
   getDialysisScheduleDetail,
   getLongAdviceOne,
 } from "@/api/dialysis_record";
-
+const moment = require('moment')
 export default {
   name: "PatientBox",
   components: {
@@ -714,8 +714,46 @@ export default {
           switch (status) {
             case 2:
               var totalAdvice = resp.data.advices;
+              console.log("totalAdvice",totalAdvice)
               var longAdvicesTwo = resp.data.advices_two;
               var waitUploadAdvices = [];
+
+              var total_day = ""
+              if(moment().weekday() == 1){
+                total_day ="周一"
+              }
+              if(moment().weekday() == 2){
+                total_day ="周二"
+              }
+              if(moment().weekday() == 3){
+                total_day ="周三"
+              }
+              if(moment().weekday() == 4){
+                total_day ="周四"
+              }
+              if(moment().weekday() == 5){
+                total_day ="周五"
+              }
+              if(moment().weekday() == 6){
+                total_day ="周六"
+              }
+              if(moment().weekday() == 0){
+                total_day ="周日"
+              }
+             
+              if(totalAdvice!=null && totalAdvice.length >0){
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  if(totalAdvice[i].week_day.indexOf(total_day)!=-1){
+                    totalAdvice[i].isCheck = 1
+                  }
+                  if(totalAdvice[i].frequency_type == 1){
+                    totalAdvice[i].isCheck = 1
+                  }
+                }
+              }
+
+              console.log("totalAdviceowoowowowow",totalAdvice)
+
               for (let i = 0; i < totalAdvice.length; i++) {
                 totalAdvice[i]["isCheck"] = 1;
               }

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -328,7 +328,7 @@
                         <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
-                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <!-- <td width="60" style="height:20px;line-height:20px">温度<br />°C</td> -->
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
@@ -352,7 +352,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
 
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
+                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td> -->
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1385,7 +1385,7 @@
                             {{
                               monitor_record.pulse_frequency
                                 ? monitor_record.pulse_frequency
-                                : ""
+                                : "拒测"
                             }}
                           </td>
                           <td v-if="org_id!=10489">

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -2721,7 +2721,20 @@
                         <table class="table-box" style="margin-bottom: 20px">
                           <tbody>
                             <tr>
-                              <!-- <td width="70">其他记录:</td> -->
+                             <td width="100">输液量(ml):</td>
+                              <td width="100">
+                                <div class="under-line">
+                                  &nbsp;{{record.assessment_after_dislysis.transfusion_volume? record.assessment_after_dislysis.transfusion_volume: ""}}
+                                </div>
+                              </td>
+                              <td width=""></td>
+                            </tr>
+                          </tbody>
+                        </table>
+
+                        <table class="table-box" style="margin-bottom: 20px">
+                          <tbody>
+                            <tr>
                               <td width="70">特殊记录:</td>
                               <td width="">
                                 <div

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -29,7 +29,7 @@
         <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
-            <span class="unit">L/h</span>
+            <span class="unit">ml/min</span>
         </li>
 
 

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -328,6 +328,11 @@
           <label>累计血容量: </label>
           <span class="content" >{{ this.record.accumulated_blood_volume}}</span>
         </li>
+
+        <li v-if="isShow('输液量')">
+          <label>输液量(ml): </label>
+          <span class="content" >{{ this.record.transfusion_volume}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -622,6 +622,12 @@
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
         </el-col>
+
+        <el-col :span="8" v-if="isShow('输液量')">
+            <el-form-item label="输液量(ml): " :prop="isName('输液量')" :rules="isCheckmust('输液量')">
+              <el-input v-model="form.transfusion_volume"></el-input>
+            </el-form-item>
+          </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：" :prop="isName('KT/V')" :rules="isCheckmust('KT/V')">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
@@ -858,7 +864,7 @@ export default {
         machine_run:0,
         after_urea:"",
         accumulated_blood_volume:"",
-
+        transfusion_volume:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1181,7 +1187,7 @@ export default {
           data["after_urea"] = this.form.after_urea
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
-
+          data["transfusion_volume"] = this.form.transfusion_volume
           console.log("Data",data)
           console.log("Paramsquery",data)
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2772,12 +2772,15 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-        console.log("---------",this.targetAdvices)
+       
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
                 this.targetAdvices[i].isCheck = 1
               }
+              if(this.targetAdvices[i].frequency_type == 1){
+                this.targetAdvices[i].isCheck = 1
+               }
             }
         }
         for (let i = 0; i < this.targetAdvices.length; i++) {
@@ -2786,11 +2789,14 @@ mu
             this.checkedCities.push(this.targetAdvices[i].id)
           }
         }
+
+
         if(admins.length > 0 ){
           for(let i=0;i<admins.length;i++){
             this.adminRoles.push(admins[i])
           }
         }
+        console.log("---------",this.targetAdvices)
         console.log("admin_user_+id2332323223332", this.adminRoles)
       },
       hide() {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -371,14 +371,11 @@
                 <div style="width: 75%">
                   血管通路: &nbsp;
                   <label-box
-                    :isChecked="
-                      predialysis.blood_access_part_opera_name == '内瘘'
-                        ? true
-                        : false
-                    "
+                    :isChecked="predialysis.blood_access_part_opera_name == '内瘘'? true: false"
                     showValue="内瘘"
                   ></label-box
                   >&nbsp; &nbsp;
+                  
                   <label-box
                     :isChecked="
                       predialysis.blood_access_part_opera_name.indexOf(

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1246,7 +1246,7 @@
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: "拒测"}}</td>
-                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: "拒测"}}</td>
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td v-if="org_id ==10478">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -1142,14 +1142,68 @@ export default {
           this.advices = tableAdvice;
         }
 
-        var arr = [] 
-        arr = this.unique(this.advices)
+        // var arr = [] 
+        // arr = this.unique(this.advices)
+        // console.log("arriooowo",arr)
+        // if(arr!=null && arr.length >0){
+  
+        //    for(let i=0;i<arr.length;i++){
+        //       if(arr[i].advice_name!="" && arr[i].advice_name!=undefined){
+        //         arr[i].prescription_id_no = 0
+        //         arr[i].prescription_id_no = parseInt(arr[i].prescription_id)  + parseInt(arr[i].groupno)
+        //       }else{
+        //         arr[i].prescription_id_no = 0
+        //       }
+             
+        //    }
+        //    let dataInfo = {}
+        //    arr.forEach((item, index) => {
+        //       let { prescription_id_no } = item
+        //       if (!dataInfo[prescription_id_no]) {
+        //         dataInfo[prescription_id_no] = {
+        //           prescription_id_no:item.prescription_id_no,
+        //           advice_name:item.advice_name,
+        //           start_time:item.start_time,
+        //           single_dose:item.single_dose,
+        //           single_dose_unit:item.unit,
+        //           execution_time:item.execution_time,
+        //           execution_staff:item.execution_staff, 
+        //           advice_doctor:item.advice_doctor,
+        //           checker:item.checker,
+        //           check_time:item.check_time,
+        //           delivery_way:item.delivery_way,
+        //           frequency_type:item.frequency_type,
+        //           prescribing_number:item.prescribing_number,
+        //           prescribing_number_unit:item.prescribing_number_unit,
+        //           single_dose:item.single_dose,
+        //           single_dose_unit:item.single_dose_unit,
+        //           child:[]
+                 
+        //         }
+        //       }
+        //     })
+        //     let newArr = Object.values(dataInfo)
+
+        //     if(newArr!=null && newArr.length>0){
+        //       for(let i=0;i<newArr.length;i++){
+        //         for(let i=0;i<arr[i].length;i++){
+        //            if(newArr[i].prescription_id_no == arr[i].prescription_id_no){
+        //                newArr[i].child.push(arr[i])
+        //            }
+        //         }
+        //       }
+        //     }
+        //     console.log("newARRWOOWOW",newArr)
+
+        // }
+
+
         this.advices = []
         this.advices= arr
-        console.log("wowoowowowo",arr)
+     
         console.log("advices-----------------",this.advices)
 
- 
+         
          
 
         // this.loading = false;

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1039,6 +1039,20 @@
                   </tbody>
                 </table>
 
+                <table class="table-box">
+                  <tbody>
+                    <tr>
+                        <td width="100">输液量(ml):</td>
+                        <td width="140">
+                          <div class="under-line">&nbsp;<span>{{ afterdialysis.transfusion_volume ? afterdialysis.transfusion_volume : '' }}</span></div>
+                        </td>
+                        
+                        <td></td>
+                    </tr>
+                  </tbody>
+                </table>
+
+
                 <table class="table-box" style="margin-bottom:20px;">
                   <tbody>
                     <tr>

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

@@ -9,49 +9,49 @@
     <div>
       <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:260px;">√</div>
+          <div  style="position: absolute;top:50px;left:270px;">√</div>
           <div  style="position: absolute;top:50px;left:220px;"></div>
           <div  style="position: absolute;top:50px;left:250px;"></div>
       </div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:570px;" v-if="list.gender == 1">√</div>
-          <div  style="position: absolute;top:50px;left:630px;" v-else-if="list.gender == 2">√</div>
+          <div  style="position: absolute;top:50px;left:580px;" v-if="list.gender == 1">√</div>
+          <div  style="position: absolute;top:50px;left:640px;" v-else-if="list.gender == 2">√</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:88px;left:120px;">医保</div>
-      <div  style="position: absolute;top:88px;left:340px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
-      <div  style="position: absolute;top:88px;left:570px;">现金</div>
+      <div  style="position: absolute;top:88px;left:350px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
+      <div  style="position: absolute;top:88px;left:580px;">现金</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:150px;left:0px;">西药费</div>
       <div  style="position: absolute;top:150px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:150px;left:120px;">化验费</div>
-      <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:190px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:150px;left:270px;">治疗费</div>
-      <div  style="position: absolute;top:150px;left:340px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:490px;">处置费</div>
-      <div  style="position: absolute;top:150px;left:570px;">0</div>
+      <div  style="position: absolute;top:150px;left:350px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:500px;">处置费</div>
+      <div  style="position: absolute;top:150px;left:580px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:188px;left:0px;">中成药</div>
       <div  style="position: absolute;top:188px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:120px;">诊疗费</div>
-      <div  style="position: absolute;top:188px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:190px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:270px;">材料费</div>
-      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:188px;left:490px;">护理费</div>
-      <div  style="position: absolute;top:188px;left:570px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
+      <div  style="position: absolute;top:188px;left:350px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:500px;">护理费</div>
+      <div  style="position: absolute;top:188px;left:580px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:225px;left:0px;">注射费</div>
       <div  style="position: absolute;top:225px;left:60px;">0</div>
       <div  style="position: absolute;top:225px;left:120px;">检查费</div>
-      <div  style="position: absolute;top:225px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:190px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:225px;left:270px;">输氧费</div>
-      <div  style="position: absolute;top:225px;left:340px;">0</div>
-      <div  style="position: absolute;top:225px;left:490px;">其他</div>
-      <div  style="position: absolute;top:225px;left:570px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:350px;">0</div>
+      <div  style="position: absolute;top:225px;left:500px;">其他</div>
+      <div  style="position: absolute;top:225px;left:580px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:202px;left:60px;"></div>
@@ -61,62 +61,62 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:280px;left:100px">
+        <span  style="position: absolute;top:290px;left:100px">
           <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:140px">
+        <span  style="position: absolute;top:290px;left:140px">
             <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:190px">
+        <span  style="position: absolute;top:290px;left:190px">
             <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:260px">
+        <span  style="position: absolute;top:290px;left:260px">
             <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span style="position: absolute;top:280px;left:310px">
+        <span style="position: absolute;top:290px;left:310px">
             <span v-if="zhongwen.indexOf('拾') > -1">
                     {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:380px">
+        <span  style="position: absolute;top:290px;left:380px">
            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:450px">
+        <span  style="position: absolute;top:290px;left:450px">
              <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:510px">
+        <span  style="position: absolute;top:290px;left:510px">
              <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
         </span>
       </span>
-      <span style="position: absolute;top:280px;left:600px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:290px;left:600px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:370px;left:100px;">{{ org_name}}</div>
-      <div style="position: absolute;top:370px;left:240px;"></div>
-      <div style="position: absolute;top:370px;left:460px;">{{list.admin_user_name}}</div>
+      <div style="position: absolute;top:390px;left:100px;">{{ org_name}}</div>
+      <div style="position: absolute;top:390px;left:240px;"></div>
+      <div style="position: absolute;top:390px;left:460px;">{{list.admin_user_name}}</div>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,11 +1,11 @@
 <template>
   <div id='invoice-print' >
     <div v-for='(i,index) in pageArr.length' :key="index" >
-      <div :style="{position: 'absolute',top:(0 + (index * 420))  + 'px',left:152+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+      <div :style="{position: 'absolute',top:(0 + (index * 420))  + 'px',left:152+ 'px',}">大丰燕舞血液透析中心</div>
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
-          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
-          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">{{ doctor_info.user_name }}  {{ doctor_info.doctor_number }} </div>
+        <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
+        <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">{{ doctor_info.user_name }}  {{ doctor_info.doctor_number }} </div>
       </div>
       <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:76+ 'px',}">
           <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
@@ -45,19 +45,19 @@
       <div :style="{position: 'absolute',top:(305 + (index * 420))  + 'px',left:121+ 'px'}">{{ zhongwen }}</div>
       <div :style="{position: 'absolute',top:(305 + (index * 420))  + 'px',left:490+ 'px'}">{{ list.medfee_sumamt }}</div>
       <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(320 + (index * 420))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
-          <div style="display:flex;">
-            <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-            <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-            <div style="width:140px">统筹支出：{{ list.order.hifp_pay }}</div>
-            <div style="width:140px">大病支出：{{list.order.hifmi_pay}}</div>
+        <div style="display:flex;">
+          <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+          <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+          <div style="width:140px">统筹支出：{{ list.order.hifp_pay }}</div>
+          <div style="width:140px">大病支出：{{list.order.hifmi_pay}}</div>
 
-          </div>
-          <div style="display:flex;">
-            <div style="width:140px">个人账户支付：{{ list.order.acct_pay }}</div>
-            <div style="width:140px">现金支出：{{ list.order.psn_cash_pay }}</div>
-            <div style="width:140px">本次账户：0</div>
-            <div style="width:140px">上次账户：0</div>
-          </div>
+        </div>
+        <div style="display:flex;">
+          <div style="width:140px">个人账户支付：{{ list.order.acct_pay }}</div>
+          <div style="width:140px">现金支出：{{ list.order.psn_cash_pay }}</div>
+          <div style="width:140px">本次账户：0</div>
+          <div style="width:140px">上次账户：0</div>
+        </div>
         <div style="display:flex;">
           <div style="width:140px">账户余额：{{ list.order.balc }}</div>
           <div style="width:140px">其他支出：{{ list.order.oth_pay }}</div>
@@ -71,7 +71,7 @@
 
       </div>
       <div v-if="index != pageArr.length - 1">
-          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">大丰燕舞血液透析中心</div>
           <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
           <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:435+ 'px'}">
               <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
@@ -84,7 +84,7 @@
           </div>
       </div>
       <div v-if="index == pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">大丰燕舞血液透析中心</div>
         <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
         <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:435+ 'px'}">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -73,87 +73,87 @@
     </div> -->
     <!-- 附件 -->
     <div v-for="(item,index) in Arr" :key="index">
-      <div :style="{position: 'absolute',top:(90 + (index * 370))  + 'px',left:'81px'}">
+      <div :style="{position: 'absolute',top:(60 + (index * 450))  + 'px',left:'30px'}">
         阜阳经沃血液透析中心
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(120 + (index * 370))  + 'px',left:'81px'}">
+        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'30px'}">
           {{paramsObj.name}}
         </div>
-        <div :style="{position: 'absolute',top:(120 + (index * 370))  + 'px',left:'200px'}">
+        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
 
         </div>
       </div>
 
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(150 + (index * 370))  + 'px',left:'81px'}">
+        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'81px'}">
 
         </div>
-        <div :style="{position: 'absolute',top:(150 + (index * 370))  + 'px',left:'190px'}">
+        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'190px'}">
 
         </div>
-        <div :style="{position: 'absolute',top:(150 + (index * 370))  + 'px',left:'252px'}">
+        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'300px'}">
         {{printDate}}
         </div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(170+(index * 370))+'px',left:'106px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 370))+'px',left:'146px'}"></div>
-        <div :style="{position: 'absolute',top:(170+(index * 370))+'px',left:'232px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 370))+'px',left:'272px'}"></div>
+        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(190+(index * 370))+'px',left:'106px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(190+(index * 370))+'px',left:'146px'}"></div>
-        <div :style="{position: 'absolute',top:(190+(index * 370))+'px',left:'232px'}">{{list.laboratoryCostTotal?list.laboratoryCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(190+(index * 370))+'px',left:'272px'}"></div>
+        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'75px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'270px'}">{{list.laboratoryCostTotal?list.laboratoryCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(210+(index * 370))+'px',left:'106px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 370))+'px',left:'146px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 370))+'px',left:'232px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 370))+'px',left:'272px'}"></div>
+        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'75px'}"></div>
+        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(230+(index * 370))+'px',left:'106px'}"></div>
-        <div :style="{position: 'absolute',top:(230+(index * 370))+'px',left:'146px'}"></div>
-        <div :style="{position: 'absolute',top:(230+(index * 370))+'px',left:'232px'}"></div>
-        <div :style="{position: 'absolute',top:(230+(index * 370))+'px',left:'272px'}"></div>
+        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'75px'}">{{list.checkCostTotal?list.checkCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(250+(index * 370))+'px',left:'106px'}">{{list.checkCostTotal?list.checkCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(250+(index * 370))+'px',left:'146px'}"></div>
-        <div :style="{position: 'absolute',top:(250+(index * 370))+'px',left:'232px'}"></div>
-        <div :style="{position: 'absolute',top:(250+(index * 370))+'px',left:'272px'}"></div>
-    </div>
-    <div style="display: flex;">
-      <div :style="{position: 'absolute',top:(270+(index * 370))+'px',left:'106px'}">{{list.treatCostTotal?list.treatCostTotal:""}}</div>
-      <div :style="{position: 'absolute',top:(270+(index * 370))+'px',left:'146px'}"></div>
-      <div :style="{position: 'absolute',top:(270+(index * 370))+'px',left:'232px'}">{{list.materialCostTotal?list.materialCostTotal:""}}</div>
-      <div :style="{position: 'absolute',top:(270+(index * 370))+'px',left:'272px'}"></div>
-    </div>
+        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'75px'}">{{list.treatCostTotal?list.treatCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'270px'}">{{list.materialCostTotal?list.materialCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'310px'}"></div>
+      </div>
+      <div style="display: flex;">
+        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'75px'}"></div>
+        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'310px'}"></div>
+      </div>
     <!--金额 -->
     <div style="display: flex;">
-      <div :style="{position: 'absolute',top:(290+(index * 370))+'px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
-      <div :style="{position: 'absolute',top:(290+(index * 370))+'px',left:'242px'}">个人支付：{{list.order.psn_cash_pay}}</div>
+      <div :style="{position: 'absolute',top:(310+(index * 450))+'px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
+      <div :style="{position: 'absolute',top:(310+(index * 450))+'px',left:'270px'}">个人支付：{{list.order.psn_cash_pay}}</div>
     </div>
-    <div :style="{position: 'absolute',top:(310+(index * 370))+'px',left:'146px'}">{{zhongwen}}</div>
-    <div :style="{position: 'absolute',top:(330+(index * 370))+'px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
-    <div :style="{position: 'absolute',top:(350+(index * 370))+'px',left:'252px'}">{{list.order.acct_pay}}</div>
+    <div :style="{position: 'absolute',top:(330+(index * 450))+'px',left:'190px'}">{{zhongwen}}</div>
+    <div :style="{position: 'absolute',top:(350+(index * 450))+'px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
+    <div :style="{position: 'absolute',top:(370+(index * 450))+'px',left:'300px'}">{{list.order.acct_pay}}</div>
     <div style="display: flex;">
-      <div :style="{position: 'absolute',top:(370+(index * 370))+'px',left:'106px'}">{{list.admin_user_name}}</div>
-      <div :style="{position: 'absolute',top:(370+(index * 370))+'px',left:'252px'}">{{list.order_number}}</div>
+      <div :style="{position: 'absolute',top:(390+(index * 450))+'px',left:'106px'}">{{list.admin_user_name}}</div>
+      <div :style="{position: 'absolute',top:(390+(index * 450))+'px',left:'300px'}">{{list.order_number}}</div>
     </div>
 
       <div v-for="(ite,index2) in item" :key="index2" style="">
 
-        <div :style="{position: 'absolute',top:(120 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{list.order_number}}</div>
-        <div :style="{position: 'absolute',top:(150 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.name}}</div>
-        <div :style="{position: 'absolute',top:(170 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.item}}</div>
-        <div :style="{position: 'absolute',top:(290 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.doctor_name}}</div>
-        <div :style="{position: 'absolute',top:(310 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.total}}</div>
-        <div :style="{position: 'absolute',top:(330 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.operator}}</div>
-        <div :style="{position: 'absolute',top:(350 + (index * 370))  + 'px',left:(380 + (index2 * 110)) + 'px'}">{{ite.printDate}}</div>
+        <div :style="{position: 'absolute',top:(90 + (index * 450))  + 'px',left:(400 + (index2 * 200)) + 'px'}">{{list.order_number}}</div>
+        <div :style="{position: 'absolute',top:(110 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.name}}</div>
+        <div :style="{position: 'absolute',top:(130 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.item}}</div>
+        <div :style="{position: 'absolute',top:(300 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.doctor_name}}</div>
+        <div :style="{position: 'absolute',top:(320 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.total}}</div>
+        <div :style="{position: 'absolute',top:(340 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.operator}}</div>
+        <div :style="{position: 'absolute',top:(360 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.printDate}}</div>
         <!-- 附件 -->
         <!-- <div :style="{position: 'absolute',top:(120 + (index * 350))  + 'px',left:'490px'}">号码</div>
         <div :style="{position: 'absolute',top:(150 + (index * 350))  + 'px',left:'490px'}">{{ite}}</div>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -69,7 +69,9 @@
         <div class="tableTitle">统计表</div>
         <div>
           <el-button type="primary" @click="exportList">按透析记录导出</el-button>
-          <el-button type="primary" @click="exportListOne">按排班导出</el-button>
+          <el-button type="primary" @click="exportListOne" v-if="org_id!=10558">按排班导出</el-button>
+
+          <el-button type="primary" @click="exportListTwo" v-if="org_id == 10558">按排班导出</el-button>
         </div>
        
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
@@ -147,6 +149,8 @@ export default {
       patient_id:0,
       modeIdCount:[],
       scheduleCount:[],
+      scheduleList:[],
+      org_id:0,
     };
   },
   methods: {
@@ -209,7 +213,40 @@ export default {
           console.log("modeidcount=====",modeIdCount)
 
         
-         
+          var scheduleList = response.data.data.scheduleList
+          console.log("scheduleList",scheduleList)
+
+
+          if(scheduleList.length!=null && scheduleList.length>0){
+              let dataInfo = {}
+              scheduleList.forEach((item, index) => {
+                let { patient_id } = item
+                if (!dataInfo[patient_id]) {
+                  dataInfo[patient_id] = {
+                    patient_id,
+                    name:item.name,
+                    id_card_no:item.id_card_no,
+                    dialysis_no:item.dialysis_no,
+                    total_dialysis:item.total_dialysis,
+                    user_sys_before_count:item.user_sys_before_count,
+                    mode_id: []
+                  }
+                }
+              })
+              let list = Object.values(dataInfo)
+              list.map(item => {
+              for (let i = 0; i < list.length; i++) {
+                if (item.patient_id === list[i].patient_id) {
+                  item.mode_id.push(list[i].mode_id)
+                }
+              }
+             })
+             
+             console.log("listowowowoowowowow",list)
+
+             this.scheduleList = []
+             this.scheduleList = list
+          }
 
           for(let i=0;i<modeIdCount.length;i++){
             if(modeIdCount[i].mode_id == 1){
@@ -438,7 +475,7 @@ export default {
               }
             }
           })
-        //  console.log("list---",list)
+        
           this.DialysisData = list
          }
       })
@@ -746,6 +783,55 @@ export default {
         })
       },
 
+
+      exportListTwo(){
+       for(let i=0;i<this.scheduleList.length;i++){
+         this.scheduleList[i].index = i+1
+         this.scheduleList[i].HD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD")
+         this.scheduleList[i].HDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF")
+         this.scheduleList[i].HDHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD+HP")
+         this.scheduleList[i].HP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HP")
+         this.scheduleList[i].HF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HF")
+         this.scheduleList[i].SCUF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"SCUF")
+         this.scheduleList[i].IUF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"IUF")
+         this.scheduleList[i].HFHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HFHD")
+         this.scheduleList[i].HFHDHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HFHD+HP")
+         this.scheduleList[i].HDFHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF+HP")
+         this.scheduleList[i].CRRT = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CRRT")
+         this.scheduleList[i].OTR = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"腹水回输")
+
+         this.scheduleList[i].IUFHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"IUF+HD")
+         this.scheduleList[i].UF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"UF")
+         this.scheduleList[i].HDPlus = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD+")
+         this.scheduleList[i].IHDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"I-HDF")
+         this.scheduleList[i].HDGT = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD高通")
+         this.scheduleList[i].CVVH = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVH")
+         this.scheduleList[i].CVVHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVHD")
+         this.scheduleList[i].CVVHDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVHDF")
+         this.scheduleList[i].PE = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"PE")
+         this.scheduleList[i].XUEHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"血浆胆红素吸附+HP")
+         this.scheduleList[i].HPD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HPD")
+         this.scheduleList[i].HDP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDP")
+
+         this.scheduleList[i].age = this.getAge(this.scheduleList[i].id_card_no)
+         this.scheduleList[i].total_count = this.getScheduleDialysisCount(this.scheduleList[i].patient_id)
+       }
+       console.log("hhh2323323232",this.scheduleList)
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+
+        const data = this.formatJson(filterVal, this.scheduleList)
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
@@ -793,6 +879,7 @@ export default {
 
   },
   created(){
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -803,7 +890,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 3);
+    nowDate.setMonth(nowDate.getMonth() - 1);
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();

src/xt_pages/role/admin.vue

@@ -192,15 +192,17 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSavePDFInformation">生成PDF</el-button>
+          @click="toSavePDFInformation">生成PDF</el-button> -->
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toCheckPDFInformation">PDF验证</el-button> -->
+
+        
      </div>
     
       
@@ -499,7 +501,7 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
-  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation} from "@/api/role/admin";
+  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -1064,20 +1066,92 @@ export default {
     },
     toSavePDFInformation(){
       toSavePDFInformation().then(response=>{
-         if(response.data.data == 1){
+         if(response.data.state == 1){
           var information =  response.data.data.information
-
+           
            var orderId = response.data.data.orderId
+           
+           var base64Img = 'data:image/png;base64'+","+orderId
+           console.log("base64Img",base64Img)
+           var imgFile = this.base64ImgtoFile(base64Img)
+           this.downloadBlob(imgFile, 'test.png')
+           console.log("imgFilewoowow",imgFile)
+
+           const blob = this.base64ToBlob(orderId, 'application/pdf');
+           this.openPdf(blob);
+
          }
       })
     },
+    openPdf(blob) {
+      const objectUrl = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = objectUrl;
+      a.target = '_blank';
+      a.click();
+      URL.revokeObjectURL(objectUrl);
+    },
+     base64ToBlob(base64Data, contentType) {
+      contentType = contentType || '';
+      const sliceSize = 1024;
+      const byteCharacters = window.atob(base64Data);
+      const bytesLength = byteCharacters.length;
+      const slicesCount = Math.ceil(bytesLength / sliceSize);
+      const byteArrays = new Array(slicesCount);
+
+      for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+        const begin = sliceIndex * sliceSize;
+        const end = Math.min(begin + sliceSize, bytesLength);
+
+        const bytes = new Array(end - begin);
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+          bytes[i] = byteCharacters[offset].charCodeAt(0);
+        }
+        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      }
+
+      return new Blob(byteArrays, {
+        type: contentType
+      });
+    },
+    downloadBlob(blob, filename) {
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = filename;
+      a.click();
+      URL.revokeObjectURL(url);
+    },
     toCheckPDFInformation(){
       toCheckPDFInformation().then(response=>{
         if(response.data.data == 1){
           var information =  response.data.data.information
         }
       })
-    }
+    },
+
+    base64ImgtoFile(dataurl, filename = 'file') {
+      let arr = dataurl.split(',')
+      let mime = arr[0].match(/:(.*?);/)[1]
+      let suffix = mime.split('/')[1]
+      let bstr = atob(arr[1])
+      let n = bstr.length
+      let u8arr = new Uint8Array(n)
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+      }
+      return new File([u8arr], `${filename}.${suffix}`, {
+        type: mime
+      })
+    },
+    // toDrugInfo(){
+    //   getdruginfoInformation().then(response=>{
+    //      if(response.data.state==1){
+           
+    //      }
+    //   })
+    // }
+
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -831,8 +831,7 @@ export default {
       },
 
     exportList(){
-      console.log("shij232333",this.tableOut)
-     
+    
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -876,13 +875,13 @@ export default {
         }
         if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
-          console.log("out_count232233232332",this.tableOut[i].out_count)
+         
         }
         if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
-        console.log("继续桑",this.tableOut[i].dealer)
+       
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
        }
        console.log("retusoossoso",this.tableOut)