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

src/router/modules/patient.js

@@ -324,17 +324,17 @@ export default {
       noCache: true
     }
   },
-  // {//评估工具/跌倒评估
-  //   path: '/patients/patient/:id/Fallassessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Fallassessment',
-  //   meta: {
-  //     title: 'firstDiseasePrint',
-  //     noCache: true
-  //   }
-  // },
+  {//评估工具/跌倒评估
+    path: '/patients/patient/:id/Fallassessment',
+    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'Fallassessment',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
+  },
   // {//小儿跌倒风险评估
   //   path: '/patients/patient/:id/pediatricFallAssessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -724,7 +724,7 @@
                                 <tr v-for="(monitor, monindex) in record.monitor_records" :key="monindex">
                                 <td style="padding:1px 5px;" height="30px">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                                 <td style="padding:1px 5px;">{{ monitor.temperature ? monitor.temperature : '' }}</td>
-                                <td style="padding:1px 5px;">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
+                                <td style="padding:1px 5px;">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
                                 <td style="padding:1px 5px;"><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}/{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</span></td>
                                 <td style="padding:1px 5px;"><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}/{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span></td>
                                 <td style="padding:1px 5px;"><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}/{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</span></td>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

@@ -51,11 +51,21 @@
                 <td>姓名： {{ record.patient.name }}</td>
                 <td>性别：{{ record.patient.gender == 1 ? "男" : "女" }}</td>
                 <td>年龄：{{ getAge(record.patient) }}</td>
-                <td>门诊号： </td>
+                <td>门诊号：{{ record.receive_assessment.admission_number }} </td>
               </tr>
               <tr>
                 <td>病床床号：</td>
-                <td>治疗时间：</td>
+                <td>治疗时间：
+                  {{
+                    record&&record.assessment_after_dislysis.actual_treatment_hour
+                      ? record&&record.assessment_after_dislysis.actual_treatment_hour
+                      : "0"
+                  }}&nbsp;小时&nbsp;{{
+                    record&&record.assessment_after_dislysis.actual_treatment_minute
+                      ? record&&record.assessment_after_dislysis.actual_treatment_minute
+                      : 0
+                  }}&nbsp;分
+                </td>
                 <td>干体重：
                   {{ record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "" }}
                 </td>
@@ -78,10 +88,12 @@
                   <span style="width: 14%;">震颤：</span>
                   <span style="width: 14%;">外观：</span>
                   <span style="width: 14%;">置换方式：
-                    
+                    {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    
+                    {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "/" }}
                   </span>
                 </td>
               </tr>
@@ -90,16 +102,16 @@
                   <div>
                     透前生命体征：
                     T <span>
-                      
+
                       </span>&nbsp;
                     P <span>
-                       
+
                       </span>&nbsp;
                     R <span>
-                        
+
                       </span>&nbsp;
                     BP <span>
-                        
+
                       </span>&nbsp;
                   </div>
                 </td>
@@ -119,7 +131,7 @@
                   {{ record.prescription.dialysis_duration_hour ? record.prescription.dialysis_duration_hour : "0" }}h &nbsp;/&nbsp;
                   {{ record.prescription.dialysis_duration_minute ? record.prescription.dialysis_duration_minute : "0" }}min
                 </td>
-                <td>预超：</td>
+                <td>预超：{{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }}L</td>
                 <td>血流量：
                   {{
                     record.prescription &&
@@ -133,12 +145,27 @@
                 <td colspan="4">抗凝剂：</td>
               </tr>
               <tr>
-                <td colspan="2">透析机：</td>
-                <td colspan="2">透析器：&nbsp;&nbsp;
-                  
-                  <span>
-                    灌流器：
-                  </span>
+                <td colspan="2">透析机：
+                  {{
+                    record.dialysis_order &&
+                    record.dialysis_order.device_number &&
+                    record.dialysis_order.device_number.number.length >
+                      0
+                      ? record.dialysis_order.device_number.number
+                      : record.device_number.number
+                  }}
+                </td>
+                <td colspan="2"> 透析器/灌流器：&nbsp;&nbsp;
+                  {{
+                    record.dialysis_order.dialysis_dialyszers
+                      ? record.dialysis_order.dialysis_dialyszers
+                      : ""
+                  }}&nbsp;&nbsp;
+                  {{
+                    record.dialysis_order.dialysis_irrigation
+                      ? record.dialysis_order.dialysis_irrigation
+                      : ""
+                  }}
                 </td>
               </tr>
               <tr>
@@ -150,6 +177,12 @@
                 <td colspan="2"></td>
                 <td colspan="2">
                   处方医生：
+                  <span style="width:200px;display: inline-block;">&nbsp;
+                    <span v-if="setAdminUserES(record.prescription, 'creater') == ''">
+                        {{ getAdminUser(record.prescription, 'creater') }}
+                    </span>
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else />
+                  </span>
                 </td>
               </tr>
             </table>
@@ -211,7 +244,9 @@
                   }}
                 </td>
                 <!-- 心率 无-->
-                <td></td>
+                <td>
+                  <!-- {{monitor.pulse_frequency}} -->
+                </td>
                 <!-- 血流量 -->
                 <td>
                   {{
@@ -236,7 +271,6 @@
                       : ""
                   }}
                 </td>
-                
                 <td width="50"><br />
                   {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                 </td>
@@ -250,7 +284,9 @@
                   </span>
                 </td>
                 <!-- 超滤率 无 -->
-                <td></td>
+                <td>
+                  <!-- {{ monitor.ultrafiltration_rate }} -->
+                </td>
                 <!-- 电导度 -->
                 <td>
                   {{
@@ -260,9 +296,12 @@
                   }}
                 </td>
                 <!-- 备注 无 -->
-                <td></td>
+                <td>{{ record.assessment_before_dislysis.remark ? record.assessment_before_dislysis.remark : "/" }}</td>
                 <!-- 签名 无 -->
-                <td></td>
+                <td>
+                  <span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span>
+                  <img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else  style="height: 60px ">
+                </td>
               </tr>
               <tr>
                 <td></td>
@@ -292,7 +331,7 @@
                 <th width="10%">执行时间</th>
                 <th width="10%">护士签名</th>
               </tr>
-              
+
               <tr
                 v-for="(advice, advice_index) in record.advices"
                 :key="advice_index"
@@ -363,7 +402,7 @@
                     alt=""
                     srcset=""
                     v-else
-                    style="height: 40px"
+                    style="height: 60px;width:84%"
                   />
                 </td>
                 <td height="35px">
@@ -391,7 +430,7 @@
                     alt=""
                     srcset=""
                     v-else
-                    style="height: 40px"
+                    style="height: 60px;width: 84%;"
                   />
                 </td>
               </tr>
@@ -405,7 +444,17 @@
             ">
               <tr>
                 <td>透后体重：
-                 
+                  {{
+                    record.assessment_after_dislysis &&
+                    record.assessment_after_dislysis.weight_after
+                      ? parseFloat(
+                          record.assessment_after_dislysis
+                            .weight_after -
+                            record.assessment_before_dislysis
+                              .additional_weight
+                        ).toFixed(1)
+                      : "/"
+                  }}
                 </td>
                 <td>实超：</td>
                 <td>实际治疗时长：
@@ -416,7 +465,7 @@
                       ? record.assessment_after_dislysis
                           .actual_treatment_hour
                       : "/"
-                  }} h 
+                  }} h
                   {{
                     record.assessment_after_dislysis &&
                     record.assessment_after_dislysis
@@ -427,7 +476,9 @@
                   }} min
                 </td>
                 <td>下机时间：
-                 
+                  {{
+                    getTime(record.dialysis_order.end_time, '{y}-{m}-{d} {h}:{i}') ? getTime(record.dialysis_order.end_time, '{y}-{m}-{d} {h}:{i}') :"/"
+                  }}
                 </td>
               </tr>
               <tr>
@@ -496,7 +547,7 @@
           <div style="text-align: left;width: 100%;">
             <table>
               <tr>
-                <td width="10%">上机护士：</td>
+                <td width="8%">上机护士：</td>
                 <td width="10%">
                   <span>
                 <span
@@ -517,7 +568,7 @@
                   }}</span
                 >
                 <img
-                  style="height: 30px"
+                  style="height: 65px;width: 100%; "
                   :src="
                     setAdminUserES(
                       dialysisOrder == null
@@ -531,21 +582,36 @@
                 />
                   </span>
                 </td>
-                <td width="10%">核对护士：</td>
-                <td width="10%"></td>
-                <td width="10%">下机护士：</td>
-                <td width="10%"></td>
-                <td width="10%">医生：</td>
-                <td width="10%"></td>
+                <td width="8%">核对护士：</td>
+                <td width="10%">
+                  <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')?getAdminUser(record.check, 'modifier'):"/"}}</span>
+                  <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" style="height:40px">
+                </td>
+                <td width="8%">下机护士：</td>
+                <td width="10%">
+                  <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
+                  <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" />
+                  </span>
+                </td>
+                <td width="5%">医生：</td>
+                <td width="10%">
+                  <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
+                      {{getAdminUser(advice, 'advice_doctor')}}
+                  </span>
+                  <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                      <img style="height:30px;" :src="setAdminUserES(advice, 'advice_doctor')" alt srcset />
+                  </span>
+                </td>
               </tr>
             </table>
-          
+
           </div>
         </div>
           <template v-if="record.totallength > 14">
-            
+
           </template>
-         
+
         </div>
       </div>
     </div>
@@ -618,6 +684,7 @@ export default {
         "腹痛",
       ],
       org_id: "",
+      displaceLiquiPartOptions: [],
     };
   },
   created() {
@@ -664,7 +731,7 @@ export default {
       this.dialysateFormulationOptions[dialysateFormulationOptions[key].id] =
         dialysateFormulationOptions[key];
     }
-
+    this.displaceLiquiPartOptions = this.$store.getters.displace_liqui
     // const xtdate = this.$route.query && this.$route.query.xtdate;
     // const xtno = this.$route.query && this.$route.query.xtno;
     //   if (typeof (xtdate) == "string" && xtdate.length > 0 && typeof (xtno) == "string" && xtno.length > 0) {
@@ -1043,7 +1110,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
      if (val.id_card_no) {
        var thisLen = val.id_card_no.length
 
@@ -1076,6 +1143,16 @@ export default {
     getNumber: function (record) {
       console.log(record);
     },
+    getDisplaceLiquiPart: function (val) {
+      let displace_liqui_part_name = "/";
+      const displace_liqui_part = this.displaceLiquiPartOptions;
+      for (let i = 0; i < displace_liqui_part.length; i++) {
+        if (displace_liqui_part[i].id == val) {
+          displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+    },
   },
 };
 </script>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -524,6 +524,10 @@
           </ul>
         </div>
       </div>
+      
+      <!-- <div style="margin-left: 1050px; margin-bottom: 10px;">
+        <el-button type="primary" size="small" @click="toExport">导出</el-button>
+      </div> -->
 
       <el-table
         :row-style="{ color: '#303133' }"
@@ -1308,6 +1312,7 @@
 </template>
 
 <script>
+import UploadExcel from '@/xt_pages/components/UploadExcel'
 import { getDataConfig } from "@/utils/data";
 import store from "@/store";
 import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
@@ -1316,8 +1321,12 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
 import { uParseTime } from '@/utils/tools'
 const moment = require('moment')
+
 export default {
   name: "Patient",
+  components: {
+   UploadExcel,
+ },
   data() {
     return {
       crumbs: [
@@ -2205,7 +2214,91 @@ export default {
       } else if (this.template_id == 33) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree_two" });
       }
-    }
+    },
+    toExport(){
+      import('@/vendor/Export2Excel').then(excel => { 
+        
+         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 => v[j]));
+     },
   },
   components: {
     BreadCrumb

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -37,10 +37,12 @@
               <tr>
                 <td>姓名：{{ patientInfo.name }}</td>
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
-                <td>年龄：{{ getAge(patientInfo) }}</td>
-                <td>门诊号：
-                  {{patientInfo.dialysis_no}}
-                </td>
+                <td>年龄：{{ getAge(patientInfo) }}岁</td>
+                <td>门诊号： {{
+                    patientInfo.admission_number
+                      ? patientInfo.admission_number
+                      : "/"
+                  }}</td>
               </tr>
               <tr>
                 <td>病床床号：
@@ -54,12 +56,10 @@
                     }}
                   </span>
                 </td>
-                <td>治疗时间：
-                  {{getTime(prescription.record_date,"{y}-{m}-{d}") }}
-                </td>
+                <td>治疗时间：{{getTime(prescription.record_date,"{y}-{m}-{d}") }}</td>
                 <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
-                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
+                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}kg
                 </td>
               </tr>
               <tr>
@@ -68,7 +68,7 @@
                     predialysis.weight_before ? predialysis.weight_before : "/"
                   }}kg
                 </td>
-                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
+                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}次</td>
                 <td colspan="2">患者评估：
                   入科方式:
                   <span v-if="receiverTreatmentAccess.way == 1">步行</span>
@@ -85,28 +85,25 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <span>血管通路：
-                    {{ predialysis.blood_access_part_opera_name }}
-                  </span>
-                  <span>部位：
-                    {{ predialysis.blood_access_part_id }}
-                 </span>
-                  <span>通路评估：
-                     内瘘：
+                  <span style="width: 14%;">血管通路： {{ predialysis.blood_access_part_opera_name }}</span>
+                  <span style="width: 14%;">部位：{{ predialysis.blood_access_part_id }}</span>
+                  <span style="width: 14%;">通路评估：
+                    内瘘：
                      <span v-if="predialysis.internal_fistula.indexOf('自体内瘘') >-1">自体内瘘</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-存在') >-1">震颤-存在</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-减弱') >-1">震颤-减弱</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-无') >-1">震颤-无</span>
 
                   </span>
-                
+                  <!-- <span style="width: 14%;">震颤：</span>
+                  <span style="width: 14%;">外观：</span> -->
                   <span style="width: 14%;">置换方式：
                     {{
                       getDisplaceLiquiPart(prescription.displace_liqui_part)
                     }}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
+                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
                   </span>
                 </td>
               </tr>
@@ -114,31 +111,28 @@
                 <td colspan="4">
                   <div>
                     透前生命体征：
-                    T： <span>
+                    T <span>
                         {{predialysis.temperature
                         ? predialysis.temperature : "/"
                           }} ℃
                       </span>&nbsp;
-                    P： <span>
+                    P <span>
                         {{
                           predialysis.pulse_frequency
                             ? predialysis.pulse_frequency
                             : "/"
-
-                        }}
-                         次/分
+                        }}次/分
                       </span>&nbsp;
-                    R： <span>
+                    R <span>
                         {{
                           predialysis.breathing_rate
                             ? predialysis.breathing_rate
                             : "/"
-                        }}
-                         次/分
+                        }}次/分
                       </span>&nbsp;
-                    BP： <span>
+                    BP <span>
                         {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} mmHg/
-                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }} mmHg
+                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}mmHg
                       </span>&nbsp;
                   </div>
                 </td>
@@ -185,7 +179,7 @@
                   {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }} min
                 </td>
                 <td>预超：{{prescription.target_ultrafiltration }}L</td>
-                <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}</td>
+                <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}ml/min</td>
               </tr>
               <tr>
                 <td colspan="4">抗凝剂：
@@ -231,9 +225,7 @@
                 </td>
               </tr>
               <tr>
-                <td colspan="2">透析机：
-                  {{predialysis.machine_type ? predialysis.machine_type : ""}}
-                </td>
+                <td colspan="2">透析机：{{predialysis.machine_type ? predialysis.machine_type : ""}}</td>
                 <td colspan="2">透析器/灌流器：
                   {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
 
@@ -259,18 +251,16 @@
                 <td colspan="2">
                   处方医生：
                   <span
-                    style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
-                      >
+                    style="height: 30px; display: inline-block">
                      {{ getAdminUser(doctor_advices[0].advice_doctor) }}
                   </span>
-                  <img
-                    style="height: 40px"
+                  <!-- <img
+                    style="height: 60px; width:30%"
                     :src="setAdminUserES(doctor_advices[0].advice_doctor)"
                     alt=""
                     srcset=""
                     v-else
-                  />
+                  /> -->
                 </td>
               </tr>
             </table>
@@ -279,7 +269,7 @@
           <div class="infoTitle">透析记录</div>
           <div style="margin: 10px 0px;">
             <table class="table" border="1"
-            style="border-collapse: collapse;text-align: center;width: 100%;"
+            style="border-collapse: collapse;width: 100%;"
             >
               <tr>
                 <th rowspan="2" width="50">时间</th>
@@ -289,9 +279,9 @@
                 <th rowspan="2" width="80">签名</th>
               </tr>
               <tr>
-                <th width="50">血压<br>mmHg</th>
-                <th width="50">呼吸<br>次/分</th>
-                <th width="50">心率<br>次/分</th>
+                <th width="70">血压<br>mmHg</th>
+                <th width="40">呼吸<br>次/分</th>
+                <th width="40">心率<br>次/分</th>
                 <th width="50">血流量<br>ml/min</th>
                 <th width="50">静脉压<br>mmHg</th>
                 <th width="50">透析液<br>温度℃</th>
@@ -300,7 +290,7 @@
                 <th width="50">超滤率<br>ml/h</th>
                 <th width="50">电导率<br>ms/cm</th>
               </tr>
-              <tr v-for="(monitor, monindex) in monitors" :key="monindex">
+               <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                 <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>
@@ -313,27 +303,26 @@
                 <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
                 <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
                 <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
-                <td>
+               <td>
                   {{monitor.symptom?monitor.symptom:"" }}&nbsp;
                   {{monitor.dispose? monitor.dispose: ""}}&nbsp;
                   {{monitor.result? monitor.result: ""}}
                 </td>
                 <td>
                   <span
-                    style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(monitor.monitoring_nurse) == ''"
-                      >
+                    style="height: 30px; display: inline-block">
                      {{ getAdminUser(monitor.monitoring_nurse) }}
                   </span>
-                  <img
-                    style="height: 40px"
+                  <!-- <img  v-if="setAdminUserES(monitor.monitoring_nurse) != ''"
+                    style="height: 60px"
                     :src="setAdminUserES(monitor.monitoring_nurse)"
                     alt=""
                     srcset=""
                     v-else
-                  />
+                  /> -->
+
                 </td>
-              </tr>
+                </tr>
             </table>
           </div>
           <div style="margin-bottom: 10px;">
@@ -355,7 +344,6 @@
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
-                  <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                 </td>
                 <td
                   height="32px"
@@ -391,17 +379,9 @@
                 </td>
 
                 <td height="32px">
-                  <span
-                    v-if="setAdminUserES(advice.advice_doctor) == ''"
-                    >{{ getAdminUser(advice.advice_doctor) }}</span
-                  >
-                  <img
-                    style="height: 30px"
-                    :src="setAdminUserES(advice.advice_doctor)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span>
+                    {{ getAdminUser(advice.advice_doctor) }}
+                  </span>
                 </td>
                 <td height="32px">
                   <span v-if="advice.execution_time">{{
@@ -409,17 +389,9 @@
                   }}</span>
                 </td>
                 <td height="32px">
-                  <span
-                    v-if="setAdminUserES(advice.execution_staff) == ''"
-                    >{{ getAdminUser(advice.execution_staff) }}</span
-                  >
-                  <img
-                    style="height: 30px"
-                    :src="setAdminUserES(advice.execution_staff)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span>
+                    {{ getAdminUser(advice.execution_staff) }}
+                  </span>
                 </td>
               </tr>
             </table>
@@ -439,11 +411,9 @@
                             afterdialysis.additional_weight
                         ).toFixed(1)
                       : "/"
-                  }}
-                </td>
-                <td>实超：
-                  {{ afterdialysis.actual_ultrafiltration }}ml
+                  }} kg
                 </td>
+                <td>实超：{{ afterdialysis.actual_ultrafiltration }}ml</td>
                 <td>实际治疗时长：
                   {{
                     afterdialysis.actual_treatment_hour
@@ -491,7 +461,6 @@
                         afterdialysis.catheter ? afterdialysis.catheter : ""
                     }}
                   </span>
-
                 </td>
               </tr>
             </table>
@@ -499,25 +468,15 @@
 
           <div class="infoTitle">治疗小结</div>
           <div style="height: 80px;margin: 10px 0px;text-align: left;">
-            <span>治疗小结：
-            {{summary.dialysis_summary?summary.dialysis_summary:'/'}}
-            </span>
+            <span>治疗小结：{{summary.dialysis_summary?summary.dialysis_summary:'/'}}</span>
           </div>
           <div style="text-align: left;width: 100%;">
             <table>
               <tr>
-                <td width="10%">上机护士：</td>
+                <td width="8%">上机护士：</td>
                 <td width="10%">
-                  <span>
-                    <span
-                      v-if="
-                        setAdminUserES(
-                          dialysisOrder == null
-                            ? 0
-                            : dialysisOrder.start_nurse
-                        ) == ''
-                      "
-                    >
+                  <div>
+                    <span>
                       {{
                         getAdminUser(
                           dialysisOrder == null
@@ -525,38 +484,23 @@
                             : dialysisOrder.start_nurse
                         )
                       }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="
-                        setAdminUserES(
-                          dialysisOrder == null
-                            ? 0
-                            : dialysisOrder.start_nurse
-                        )
-                      "
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-
-                  </span>
+                  </div>
                 </td>
-                <td width="18%">核对护士：
-
-                 <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
-                <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                <td width="8%">核对护士：</td>
+                <td width="10%">
+                  <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else> -->
                 </td>
-                <td width="10%"></td>
-                <td width="15%">下机护士：
-                 <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
-                                      <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                <td width="8%">下机护士：</td>
+                <td width="10%">
+                  <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else> -->
                 </td>
-                <td width="10%"></td>
-                <td width="10%">医生：
-                 <span v-if="setAdminUserES(prescription.creater) == ''">{{getAdminUser(prescription.creater)}}</span>
-                                      <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else>
+                <td width="5%">医生：</td>
+                <td width="10%">
+                  <span>{{getAdminUser(prescription.creater)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
-                <td width="10%"></td>
               </tr>
             </table>
 

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -9,8 +9,8 @@
           <div >
             <span>姓名：{{paramsObj.name}}</span>
             <span style="margin-left: 60px;">性别：</span>
-            <span style="" v-if="list.gender == 1">女</span>
-            <span style="" v-else-if="list.gender == 2">男</span>
+            <span style="" v-if="list.gender == 2">女</span>
+            <span style="" v-else-if="list.gender == 1">男</span>
           </div>
           <div>
             <span style="margin-right: 60px;">NO：</span>
@@ -65,58 +65,45 @@
           
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
-            <span  style="">
+            <span>
               <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
-                          {{ zhongwen.substring(0,1) }}
-                      </span>
-                      <span v-else>零</span>
-
+                {{ zhongwen.substring(0,1) }} 拾
+              </span>
             </span>
-            <span  style="">
-                <span v-if="zhongwen.indexOf('万') > -1">
-                          {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
-                      </span>
-                      <span v-else>零</span>
-
+            <span>
+              <span v-if="zhongwen.indexOf('万') > -1">
+                {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }} 万
+              </span>
             </span>
-            <span  style="">
+            <span>
               <span v-if="zhongwen.indexOf('仟') > -1">
-                          {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
-                      </span>
-                      <span v-else>零</span>
-
+                {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }} 仟
+              </span>
             </span>
-            <span  style="">
-                <span v-if="zhongwen.indexOf('佰') > -1">
-                          {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
-                      </span>
-                      <span v-else>零</span>
-
+            <span>
+              <span v-if="zhongwen.indexOf('佰') > -1">
+                {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }} 百
+              </span>
             </span>
-            <span style="">
-                <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 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>
-            <span  style="">
-                <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 v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
+                {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }} 元
+              </span>
             </span>
-            <span  style="">
-                <span v-if="zhongwen.indexOf('角') > -1">
-                          {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
-                      </span>
-                      <span v-else>零</span>
+            <span>
+              <span v-if="zhongwen.indexOf('角') > -1">
+                {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }} 角
+              </span>
             </span>
-            <span  style="">
+            <span>
               <span v-if="zhongwen.indexOf('分') > -1">
-                          {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
-                      </span>
-                      <span v-else>零</span>
+                {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }} 分
+              </span>
             </span>
           </div>
           <span style="position: relative;top:0px;left:0px">￥：{{totalPrice.toFixed(2)}}</span>
@@ -177,11 +164,6 @@ export default {
       number: this.paramsObj.number,
     }
     this.getInvoice(params)
-    // var data = new Date();
-    // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
-    // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-    // this.printDate = data.getFullYear() + "-" + month + "-" + date;
-    // this.smalltoBIG(982732.21)
     this.org_id = this.$store.getters.xt_user.org_id
     this.org_name = this.$store.getters.xt_user.org.org_name
   },

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -108,8 +108,8 @@
                 {{ item.project.project_name }}
               </div>
             </div>
-            <span style="position: absolute;top: 65px;right: -77px;">血透前抽血</span>
-            <span style="position: absolute;bottom: 96px;right: -77px;">血透后抽血</span>
+            <span style="position: absolute;top: 65px;right: -77px;" v-if=" singleProjectPrint.length>0">血透前抽血</span>
+            <span style="position: absolute;bottom: 96px;right: -77px;" v-if=" singleProjectPrint.length>0">血透后抽血</span>
           </div>
         </div>
         <div

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -69,8 +69,8 @@
           <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :page-sizes="[12, 20, 30, 100]"
-              :page-size="12"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
               background
               style="margin-top:20px;float: right"
               layout="total, sizes, prev, pager, next, jumper"
@@ -485,7 +485,7 @@ export default {
           this.configuraData = configurationlist
           var total = response.data.data.total
           // console.log("total",total)
-          this.total = total+2
+          this.total = total
         }
       })
     },

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -257,7 +257,9 @@ export default {
       tableDataList:[],
       table:[],
       houseList:[],
-      storehouse_id:0
+      storehouse_id:0,
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -399,9 +401,11 @@ export default {
           }
           console.log("list232323232322332232323ow",this.cancelStockDate)
           this.tableDataList = response.data.data.list
-
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
           var listgroup = response.data.data.listgroup
-
+          
+          this.
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -425,6 +429,25 @@ export default {
         }
       });
     },
+    getManufacturerNameOne(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerNameOne(id){
+       var dealer_name = ""
+     
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getXuserName(id) {
       if (id <= 0) {
         return "";
@@ -625,7 +648,6 @@ export default {
         .catch(() => {});
     },
       exportList(){
-        console.log("hhhhhh",this.tableList)
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
@@ -633,6 +655,8 @@ export default {
           this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
           this.tableList[i].total = this.getTotalCount(this.tableList[i].child)
           this.tableList[i].total_price = (this.tableList[i].total * this.tableList[i].price).toFixed(2)
+          this.tableList[i].manufacturer_name = this.getManufacturerNameOne(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDealerNameOne(this.tableList[i].dealer)
 
         }
        var obj = {"index":"合计","total_price":0}
@@ -640,7 +664,7 @@ export default {
            obj.total_price +=this.tableList[i].total * this.tableList[i].price
        }
        obj.total_price = obj.total_price.toFixed(2)
-       console.log("obj23233",obj)
+      
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','退库价','总价','备注']
@@ -669,7 +693,10 @@ export default {
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].CancelStock.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
           this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+          this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].dealer)
           total += this.tableDataList[i].count * this.tableDataList[i].price
+
         }
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)

src/xt_pages/stock/detail/stockInDetail.vue

@@ -265,6 +265,8 @@ export default {
       tableDataList:[],
       houseList:[],
       storehouse_id:0,
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -345,6 +347,8 @@ export default {
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
 
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -405,7 +409,9 @@ export default {
             this.cancelStockDate.push(obj);
           }
           this.tableDataList = response.data.data.list
-          console.log("表格发3223332322332332323232332233",this.cancelStockDate)
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
+        
 
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -772,11 +778,13 @@ export default {
         for(let i=0;i<this.tableInfo.length;i++){
           this.tableInfo[i].index = i+1
           this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2)
+          this.tableInfo[i].manufacturer_name = this.getManufactuerName(this.tableInfo[i].manufacturer)
+          this.tableInfo[i].dealer_name = this.getDealerName(this.tableInfo[i].dealer)
         }
 
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
-        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
+        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','进货价','总价','备注']
+        const filterVal = ['index','good_name', 'specification_name','manufacturer_name','dealer_name', 'packing_unit','warehousing_count','price','total_price','remark']
 
 
         const data = this.formatJson(filterVal, this.tableInfo)
@@ -790,10 +798,29 @@ export default {
             this.downloadLoading = false
         })
       },
+        getManufacturerName(id){
+          var manufacturer_name = ""
+          for(let i=0;i<this.manufacturerList.length;i++){
+            if(id == this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+          }
+          return manufacturer_name
+      },
+      getDealerName(id){
+        var dealer_name = ""
+        for(let i=0;i<this.dealerList.length;i++){
+            if(id == this.dealerList[i].id){
+                dealer_name = this.dealerList[i].dealer_name
+            }
+        }
+        return dealer_name
+      }, 
       exportListDetal(){
 
         var obj = {index:"合计",total_price:0}
         var total = 0
+        console.log("wowowows",this.tableDataList)
         for(let i=0;i<this.tableDataList.length;i++){
           this.tableDataList[i].index = i + 1
           this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
@@ -802,18 +829,21 @@ export default {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].Warehousing.warehousing_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].Warehousing.creater)
           this.tableDataList[i].total_price = (this.tableDataList[i].warehousing_count * this.tableDataList[i].price).toFixed(2)
+          this.tableDataList[i].manufacturer_name = this.getManufactuerName(this.tableDataList[i].manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerName(this.tableDataList[i].dealer)
           total += this.tableDataList[i].warehousing_count * this.tableDataList[i].price
+          
         }
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)
+      
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
+        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total_price']
 
 
         const data = this.formatJson(filterVal, this.tableDataList)
 
-
           excel.export_json_to_excel({
             header: tHeader,
             data,

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -117,6 +117,13 @@
           </template>
         </el-table-column>
 
+
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}
@@ -271,6 +278,8 @@ export default {
       storehouse_id:0,
       houseList:[],
       wareOutList:[],
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -431,6 +440,8 @@ export default {
           }
 
           this.tableDataList = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
 
           this.cancelStockDate.push(objOne);
 
@@ -531,6 +542,25 @@ export default {
         }
       });
     },
+    getManufacturerNameOne(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerNameOne(id){
+       var dealer_name = ""
+     
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
@@ -851,11 +881,16 @@ export default {
         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)
+       
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','出库时间','备注']
+       const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
 
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','ctime','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'manufacturer_name','dealer_name','packing_unit','out_count','packing_price','total_price','ctime','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
 
@@ -880,6 +915,8 @@ export default {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
+          this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].GoodInfo.dealer)
           if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
@@ -891,11 +928,12 @@ export default {
 
         }
         obj.total_price = total.toFixed(2)
-
+        console.log("WOHHAHHAHAH",this.tableDataList)
+      
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -235,6 +235,8 @@ export default {
       tableList:[],
       tableDataList:[],
       drugTypeList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -348,6 +350,8 @@ export default {
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
+           this.dealerList =  response.data.data.dealerList
+           this.manufacturerList =  response.data.data.manufacturerList
            //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
@@ -356,15 +360,21 @@ export default {
                   list[i].child.push(order[j])
                }
             }
+            list[i].manufacturer_name = this.getManufacturerName(list[i].manufacturer)
+            list[i].dealer_name = this.getDealerName(list[i].dealer)
            }
            this.tableDataList = list
+           console.log("数据我我我",this.tableDataList)
            var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
              order[i].is_total = 0
              order[i].total_price = order[i].count * order[i].price
              total_price += order[i].count * order[i].price
+             order[i].manufacturer_name = this.getManufacturerName(order[i].manufacturer)
+             order[i].dealer_name = this.getDealerName(order[i].dealer)
           }
+
            order.push({
             order_number: "合计",
             is_total: 1,
@@ -380,7 +390,24 @@ export default {
          }
       })
     },
-
+    getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
      getAdminUser(id){
       var name = ""
       for(let i=0;i<this.adminUserOptions.length;i++){
@@ -418,8 +445,8 @@ export default {
           this.tableDataList[i].ctime = this.getTime(this.tableDataList[i].ctime)
         }
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量','退库价','总价']
-        const filterVal = ['index','order_number','drug_name', 'specification_name', 'drug_type','ctime','user_name','total_count','price','total_price']
+        const tHeader = ['序号','单据编号', '药品名称', '规格型号','生产厂商','进销商','单据类型','操作时间','制单人','数量','退库价','总价']
+        const filterVal = ['index','order_number','drug_name', 'specification_name','manufacturer_name','dealer_name', 'drug_type','ctime','user_name','total_count','price','total_price']
 
         const data = this.formatJson(filterVal, this.tableDataList)
 
@@ -436,8 +463,8 @@ export default {
      },
     exportListOne(){
       // let obj = {'index':'合计','total_price':0}
-      console.log("@332322323232332",this.tableList)
-
+    
+ 
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
@@ -453,17 +480,13 @@ export default {
           this.tableList[i].time = this.getTime(this.tableList[i].ctime)
           this.tableList[i].user_name = this.getAdminUser(this.tableList[i].creater)
 
-          //this.tableList[i].total_price = this.tableList[i].count * this.tableList[i].price
-          //  obj.total_price += this.tableList[i].count * this.tableList[i].price
         }
-      //   obj.total_price = obj.total_price.toFixed(2)
-      //  this.tableList.push(obj)
-      //  for(let i=0;i<this.tableData.length;i++){
-      //    this.tableData[i].total_price = (this.tableData[i].total_price).toFixed(2)
-      //  }
+    
+      console.log("@332322323232332",this.tableList)
+      
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name', 'time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','total_price']
 
        const data = this.formatJson(filterVal, this.tableList)
 

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -449,6 +449,8 @@ export default {
             var list = response.data.data.list
           
             this.tabelePrintList = list
+            this.manufacturerList = response.data.data.manufacturerList
+            this.dealerList = response.data.data.dealerList
           }   
       })
     },
@@ -470,17 +472,19 @@ export default {
       return name
     },
      exportList(){
-       
+        
+       console.log("tablePrintlist",this.tabelePrintList)
+      
         for(let i=0;i<this.tabelePrintList.length;i++){
           this.tabelePrintList[i].index = i+1
           this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
-
+          this.tabelePrintList[i].manufacturer_name = this.getManufacturerName(this.tabelePrintList[i].manufacturer)
+          this.tabelePrintList[i].dealer_name = this.getDealerName(this.tabelePrintList[i].dealer)
           this.tabelePrintList[i].unit = this.tabelePrintList[i].XtBaseDrug.dose + this.tabelePrintList[i].XtBaseDrug.dose_unit + "*" + this.tabelePrintList[i].XtBaseDrug.min_number +this.tabelePrintList[i].XtBaseDrug.min_unit +"/"+this.tabelePrintList[i].XtBaseDrug.max_unit
         }
-        
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'max_unit','warehousing_count','price','total_price','remark']
+       const tHeader = ['序号','药品名称', '规格型号','生产厂商','经销商', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'unit','manufacturer_name','dealer_name', 'max_unit','warehousing_count','price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tabelePrintList.length;i++){
          obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count
@@ -503,21 +507,42 @@ export default {
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+     getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
      exportListDetail(){
        
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','进货价','数量','总价']
-       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','time','user_name','price','warehousing_count','total']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
+       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total']
 
        var newArr = []
        newArr = this.cancelStockDate
+       console.log("newArrwowowowoow",newArr)
+     
        let obj = {'index':'合计','total':0}
        for(let i=0;i<newArr.length;i++){
           newArr.specification_name = ""
           newArr.index = i+1
          newArr[i].drugtype = this.getTypeList(newArr[i].drug_type)
          newArr[i].specification_name = newArr[i].dose + newArr[i].dose_unit +"*" + newArr[i].min_number + newArr[i].min_unit +  "/" + newArr[i].max_unit
-
+         newArr[i].manufacturer_name = this.getManufacturerName(newArr[i].manufacturer)
+         newArr[i].dealer_name = this.getDealerName(newArr[i].dealer)
          newArr[i].time = this.getTime(newArr[i].ctime)
          newArr[i].user_name = this.getAdminUser(newArr[i].creater)
          newArr[i].total = (newArr[i].price * newArr[i].warehousing_count).toFixed(2)

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -122,6 +122,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -274,6 +280,8 @@ export default {
       drugTypeList:[],
       storehouse_id:0,
       houseList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -576,6 +584,8 @@ export default {
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
           this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
+          this.tablePrint[i].manufacturer_name = this.getManufacturerName(this.tablePrint[i].manufacturer)
+          this.tablePrint[i].dealer_name = this.getDealerName(this.tablePrint[i].dealer)
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919 || this.org_id == 9671){
@@ -594,8 +604,8 @@ export default {
 
 
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','出库时间','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','ctime','remark']
+       const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
+       const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','min_unit','count','min_price','total_price','ctime','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total
@@ -619,8 +629,8 @@ export default {
      },
     exportListDetai(){
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
@@ -633,10 +643,11 @@ export default {
             if(this.tableData[i].drug_type == 3){
               this.tableData[i].drugtype = "成药"
             }
-            // this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
             this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
             this.tableData[i].time = this.getTime(this.tableData[i].ctime)
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
+            this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
             if(this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
               if(this.tableData[i].count >=this.tableData[i].min_number){
@@ -670,7 +681,24 @@ export default {
           this.downloadLoading = false
       })
     },
-
+    getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getBaseDrugLibList() {
         let params = {
           page: 1,
@@ -704,7 +732,8 @@ export default {
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-         
+            this.dealerList = response.data.data.dealerList
+            this.manufacturerList = response.data.data.manufacturerList
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -726,6 +755,8 @@ export default {
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
                   ctime:item.ctime,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
                 }
               }
              })
@@ -749,6 +780,8 @@ export default {
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
                   ctime:item.ctime,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
                 }
               }
             })

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -158,6 +158,10 @@ export default {
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         print_1(){
+           if(this.ids == ""){
+             this.$message.error("请勾选需要打印的内容")
+             return false
+           }
            this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids}) 
         },
         handleSizeChange(val){

src/xt_pages/stock/inventoryDetails.vue

@@ -145,6 +145,10 @@ export default {
     },
     methods:{
         toprint(){
+          if(this.ids == ""){
+             this.$message.error("请勾选需要打印的内容")
+             return false
+          }              
           this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
         },
 

src/xt_pages/user/components/PatientForm.vue

@@ -1668,11 +1668,11 @@ export default {
             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
             }
             
           
@@ -1719,11 +1719,11 @@ export default {
             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/user/evaluationtool/pediatricFallAssessment.vue

@@ -13,7 +13,7 @@
                 </div>
 
                 <div>
-                    <table class="table" border="1" style="width: 100%;">
+                    <table class="table" id="table" border="1" style="width: 100%;">
                         <thead>
                             <tr>
                             <th style="width:10%;">项目</th>
@@ -28,7 +28,7 @@
                                 <td class="start">年龄</td>
                                 <td>
                                     <div class="jiange">
-                                        <label><input name="ball" type="checkbox" value="football" />&nbsp;>1岁~≤3岁</label>
+                                        <label><input name="ball" type="checkbox" value="football" @change="checkboxChange"/>&nbsp;>1岁~≤3岁</label>
                                     </div>
                                 </td>
                                 <td><div class="jiange">
@@ -239,15 +239,11 @@ export default {
         }
     },
     methods:{
-    //     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-    //     if (rowIndex % 2 === 0) {
-    //       if (columnIndex === 0) {
-    //         return [1, 2];
-    //       } else if (columnIndex === 1) {
-    //         return [0, 0];
-    //       }
-    //     }
-    //   },
+      checkboxChange(){
+        var table = document.getElementById('table')
+        var row=table.rows
+        console.log('33333',row);
+      }
     }
 }
 </script>

src/xt_pages/user/evaluationtool/pruritusAssessment.vue

@@ -179,51 +179,38 @@ export default {
       radiochecked(e){
         const bal=e
         const jiequ =(bal.split('(')[1].split(')')[0]) * 1
-        if(e == this.radio1 && this.ball == ''){
+        if(e == this.radio1 && this.ball == '' && this.radio2 =='' && this.radio3 ==''){
           this.radio1_points =jiequ
           this.pruritus_Totalpoints =jiequ
-        }else if(e == this.radio1 && this.ball != ''){
+        }else if(e == this.radio1 && this.ball != '' && this.radio3 !='' && this.radio2 !=''){
+          this.radio1_points =jiequ
+          this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
+        }else if(e == this.radio1 && (this.ball != '' || this.radio3 !='' || this.radio2 !='')){
           this.radio1_points =jiequ
           this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
         }
-      //   if(e==this.radio1 && this.radio2 =='' && this.radio3 ==''){
-      //   var duct_touguan = jiequ
-      //    console.log('111111',duct_touguan);
-      //    this.pruritus_Totalpoints = duct_touguan
-      //    return duct_touguan
-      //  } else if(e==this.radio1 && this.radio2 !='' && this.radio3 !=''){
-      //    console.log('2222222222');
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }else if(e==this.radio1 && (this.radio2 !='' || this.radio3 !='')){
-      //   //  console.log('5555555',duct_touguan,this.pruritus_Totalpoints);
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints - duct_touguan
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }
- 
-      //  if(e==this.radio2 && this.radio1 !='' && this.radio3 !=''){
-      //    console.log('333333');
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }else if(e==this.radio2 && (this.radio1 !='' || this.radio3 !='')){
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }
-      //  else if(e==this.radio2 && this.radio1 =='' && this.radio3 ==''){
-      //    console.log('444444444');
-      //    this.pruritus_Totalpoints= jiequ
-      //  }
- 
-      //  if(e==this.radio3 && this.radio2 !='' && this.radio1 !=''){
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }else if(e==this.radio3 && (this.radio2 !='' || this.radio1 !='')){
-      //    this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
-      //    return this.pruritus_Totalpoints
-      //  }else{
-      //    this.pruritus_Totalpoints= jiequ
-      //  }
+
+        if(e == this.radio2 && this.radio1 =='' && this.radio3 =='' && this.ball == '') {
+          this.radio2_points =jiequ
+          this.pruritus_Totalpoints =jiequ
+        }else if(e == this.radio2 && this.radio1 !='' && this.radio3 !='' && this.ball != ''){
+          this.radio2_points =jiequ
+          this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
+        }else if(e == this.radio2 && (this.radio1 !=''|| this.radio3 =='' || this.ball != '')){
+          this.radio2_points =jiequ
+          this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
+        }
+
+        if(e==this.radio3 && this.radio1 =='' && this.radio2 ==''&& this.ball == ''){
+          this.radio3_points =jiequ
+          this.pruritus_Totalpoints =jiequ
+       } else if(e==this.radio3 && this.radio1 !='' && this.radio2 !='' && this.ball != ''){
+          this.radio3_points =jiequ
+          this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
+       }else if(e==this.radio3 && (this.radio1 !='' || this.radio2 !='' || this.ball != '')){
+        this.radio2_points =jiequ
+          this.pruritus_Totalpoints = this.pruritus_Totalpoints + jiequ
+       }
       }
     }
 }

src/xt_pages/workforce/appointment.vue

@@ -735,7 +735,6 @@ export default {
           '机号'
         ]
         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']
@@ -770,7 +769,8 @@ export default {
           })
 
           const filename = '排班模版'
-
+         
+          
           excel.export_json_to_excel({
             multiHeader,
             header,

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -6,7 +6,7 @@
         <el-button  type="primary" @click="printAction">打印</el-button>
       </div>
       <div class="tab" style="margin-top: 10px;">
-        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" style='width: 100%;table-layout:fixed;text-align: center;'>
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;'>
             <tr>
                 <td rowspan="2">分区</td>
                 <td rowspan="2">机号</td>
@@ -45,35 +45,35 @@
             <tr v-for="(item,index) in scheduleZone" :key="index">
                 <td style="min-width:50px;">{{ item.area }}</td>
                 <td style="min-width:50px;">{{ item.cut }}</td>
-                <td style="width:50px;" v-if="first_day == 1">
-                    <span v-if="item.Mon_M.patient_id">
-                        <span>{{ item.Mon_M.patient }} </span><br/>
-                        <span >{{ item.Mon_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}</span>
-                    </span>
+                <td style="min-width:50px;" v-if="first_day == 1">
+                  <span v-if="item.Mon_M.patient_id">
+                    <span>{{ item.Mon_M.patient }} </span><br/>
+                    <span >{{ item.Mon_M.mode_name }}</span><br/>
+                    <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}</span>
+                  </span>
                 </td>
-                <td style="width:50px;" v-if="first_day == 1">
-                    <span v-if="item.Mon_A.patient_id">
-                        <span>{{ item.Mon_A.patient }} </span><br/>
-                        <span >{{ item.Mon_A.mode_name }}</span><br/>
-                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span>
-                    </span>
+                <td style="min-width:50px;" v-if="first_day == 1">
+                  <span v-if="item.Mon_A.patient_id">
+                    <span>{{ item.Mon_A.patient }} </span><br/>
+                    <span >{{ item.Mon_A.mode_name }}</span><br/>
+                    <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span>
+                  </span>
                 </td>
-                <td style="width:50px;" v-if="first_day == 1">
+                <td style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_N.patient_id">
                         <span>{{ item.Mon_N.patient }} </span><br/>
                         <span >{{ item.Mon_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;"  v-if="second_day == 2">
+                <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }} </span><br/>
                         <span >{{ item.Tue_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;"  v-if="second_day == 2">
+                <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_A.patient_id">
                       <span>{{ item.Tue_A.patient }} </span><br/>
                         <span >{{ item.Tue_A.mode_name }}</span><br/>
@@ -81,105 +81,105 @@
 
                     </span>
                 </td>
-                <td style="width:50px;"  v-if="second_day == 2">
+                <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_N.patient_id">
                       <span>{{ item.Tue_N.patient }} </span><br/>
                         <span >{{ item.Tue_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="three_day == 3">
+                <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_M.patient_id">
                       <span>{{ item.Wed_M.patient }} </span><br/>
                         <span >{{ item.Wed_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="three_day == 3">
+                <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_A.patient_id">
                       <span>{{ item.Wed_A.patient }} </span><br/>
                         <span >{{ item.Wed_A.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="three_day == 3">
+                <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_N.patient_id">
                       <span>{{ item.Wed_N.patient }} </span><br/>
                         <span >{{ item.Wed_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="four_day == 4">
+                <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_M.patient_id">
                       <span>{{ item.Thurs_M.patient }} </span><br/>
                         <span >{{ item.Thurs_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="four_day == 4">
+                <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_A.patient_id">
                       <span>{{ item.Thurs_A.patient }} </span><br/>
                         <span >{{ item.Thurs_A.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="four_day == 4">
+                <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_N.patient_id">
                       <span>{{ item.Thurs_N.patient }} </span><br/>
                         <span >{{ item.Thurs_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="five_day == 5">
+                <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_M.patient_id">
                       <span>{{ item.Fri_M.patient }} </span><br/>
                         <span >{{ item.Fri_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="five_day == 5">
+                <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_A.patient_id">
                       <span>{{ item.Fri_A.patient }} </span><br/>
                         <span >{{ item.Fri_A.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="five_day == 5">
+                <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_N.patient_id">
                       <span>{{ item.Fri_N.patient }} </span><br/>
                         <span >{{ item.Fri_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="six_day == 6">
+                <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_M.patient_id">
                       <span>{{ item.Sat_M.patient }} </span><br/>
                         <span >{{ item.Sat_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="six_day == 6">
+                <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_A.patient_id">
                       <span>{{ item.Sat_A.patient }} </span><br/>
                         <span >{{ item.Sat_A.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="six_day == 6">
+                <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_N.patient_id">
                       <span>{{ item.Sat_N.patient }} </span><br/>
                         <span >{{ item.Sat_N.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="seven_day == 7">
+                <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_M.patient_id">
                       <span>{{ item.Sun_M.patient }} </span><br/>
                         <span >{{ item.Sun_M.mode_name }}</span><br/>
                         <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="width:50px;" v-if="seven_day == 7">
+                <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_A.patient_id">
                       <span>{{ item.Sun_A.patient }} </span><br/>
                         <span >{{ item.Sun_A.mode_name }}</span><br/>
@@ -187,7 +187,7 @@
 
                     </span>
                 </td>
-                <td style="width:50px;" v-if="seven_day == 7">
+                <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_N.patient_id">
                       <span>{{ item.Sun_N.patient }} </span><br/>
                         <span >{{ item.Sun_N.mode_name }}</span><br/>
@@ -855,7 +855,6 @@ export default {
                   });
                   var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1",type:0},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"jihao_id":"","total":"","zone_id":"","zone_type":"",sort:""}]
 
-
                     for(let i=0;i<newArr.length;i++){
                       for(let j=0;j<this.scheduleCountList.length;j++){
                           newArr[i].cut = this.total
@@ -987,8 +986,6 @@ export default {
 
                             newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
                         }
-
-
                       }
                     }
                   console.log("newArr222222222",newArr)
@@ -1026,8 +1023,8 @@ export default {
           return [weekArr[week], typeArr[schedule_type]];
       },
       printAction: function() {
-          const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
-
+          // const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+          const style = '@media print {#scheduleTable{font-size:14px;} }'
           printJS({
           printable: 'scheduleTable',
           type: 'html',