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

src/api/schedule.js

@@ -306,11 +306,19 @@ export function CreateScheduleTwo(id, schedule,id_two) {
 
 
 export function ChangeScheduleTen(id,schedule){
-  
-  console.log('schedule', schedule)
+
   return request({
     url: '/api/schedule/changeschedule?id=' + id+"&bed_id="+schedule.bed_id+"&mode_id="+schedule.mode_id+"&schedule_type="+schedule.schedule_type,
     method: 'Put',
     data: schedule
   })
 }
+
+export function getNumberList(id,params){
+  
+  return request({
+    url:"/api/schedule/getordernumber?id="+id,
+    method:"Get",
+    params:params
+  })
+}

src/xt_pages/device/objectRegistration.vue

@@ -676,7 +676,7 @@
                    var objectDisinfect =  response.data.data.objectDisinfect
                    this.$message.success("保存成功!")
                    this.dialogFormVisible = false
-                   this.getObjectTableDisInfectList()
+                   this.getlist()
                  }
               })
             }
@@ -847,11 +847,11 @@
 
        handleSizeChange(val) {
         this.limit = val;
-        this.getObjectTableDisInfectList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val;
-        this.getObjectTableDisInfectList()
+        this.getlist()
       },
 
       saveObjectRegistration(formName){

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

@@ -476,32 +476,34 @@ export default {
             modify_other_url: "/api/dialysis/treatmentsummary?mode=3",
             module: 9,
           },
-        })
-        .then((res) => {
+        }).then((res) => {
           if (res.data.state == 0) {
             this.hasPermission = false;
           } else if (res.data.state == 1) {
-            if (this.record.id != "" && this.record.creater != 0) {
-              // 有数据
-              if (this.record.creater == this.$store.getters.user.admin.id) {
-                // 创建人是自己
-                if (res.data.data.is_has_modify == false) {
-                  this.hasPermission = false;
-                  this.showTxt = "你没有修改治疗小结权限";
+            if(this.org_id!=10340){
+                if (this.record.id != "" && this.record.creater != 0) {
+                // 有数据
+                if (this.record.creater == this.$store.getters.user.admin.id) {
+                  // 创建人是自己
+                  if (res.data.data.is_has_modify == false) {
+                    this.hasPermission = false;
+                    this.showTxt = "你没有修改治疗小结权限";
+                  }
+                } else {
+                  // 创建人不是自己
+                  if (res.data.data.is_has_modify_other == false) {
+                    this.hasPermission = false;
+                    this.showTxt = "你没有修改他人治疗小结权限";
+                  }
                 }
-              } else {
-                // 创建人不是自己
-                if (res.data.data.is_has_modify_other == false) {
+              } else if (this.record.id == "" || this.record.creater == 0) {
+                if (res.data.data.is_has_create == false) {
                   this.hasPermission = false;
-                  this.showTxt = "你没有修改他人治疗小结权限";
+                  this.showTxt = "你没有新增治疗小结权限";
                 }
               }
-            } else if (this.record.id == "" || this.record.creater == 0) {
-              if (res.data.data.is_has_create == false) {
-                this.hasPermission = false;
-                this.showTxt = "你没有新增治疗小结权限";
-              }
             }
+           
           }
         });
     },
@@ -587,9 +589,9 @@ export default {
 
        if(this.org_id ==10090){
           var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
-        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
-        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
-        ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
+        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus +
+        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
+        ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
         +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
 
         console.log("str000000000000000000222o2o2",str)

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -45,13 +45,24 @@
                   }}</td>
               </tr>
               <tr>
-                <td>病床床号：</td>
-                <td>治疗时间：</td>
-                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}</td>
+                <td>病床床号：
+                  <span>
+                  {{
+                    dialysisOrder &&
+                    dialysisOrder.DeviceNumber &&
+                    dialysisOrder.DeviceNumber.number.length > 0
+                      ? dialysisOrder.DeviceNumber.number
+                      : patientInfo.DialysisSchedule.device_number.number
+                    }}
+                  </span>
+                </td>
+                <td>治疗时间：
+                  {{afterdialysis.actual_treatment_hour }}<span v-if="afterdialysis.actual_treatment_hour>0">时</span>
+                  <span v-if="afterdialysis.actual_treatment_minute>0">{{afterdialysis.actual_treatment_minute>0}}</span> {{afterdialysis.actual_treatment_minute }}<span v-if="afterdialysis.actual_treatment_minute>0">分</span>
+                </td>
+                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
-                  {{predialysis.weight_after_last_transparency
-                      ? predialysis.weight_after_last_transparency
-                      : "未称重"}}
+                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
                 </td>
               </tr>
               <tr>
@@ -60,23 +71,34 @@
                     predialysis.weight_before ? predialysis.weight_before : "/"
                   }}kg
                 </td>
-                <td>透析总次数：</td>
-                <td colspan="2">患者评估：</td>
+                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
+                <td colspan="2">患者评估：
+                  {{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}
+                </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">血管通路：</span>
-                  <span style="width: 14%;">部位：</span>
-                  <span style="width: 14%;">通路评估：</span>
-                  <span style="width: 14%;">震颤：</span>
-                  <span style="width: 14%;">外观：</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>
+                  <!-- <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>
@@ -84,28 +106,31 @@
                 <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>
-                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} /
-                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}
+                    BP： <span>
+                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} mmHg/
+                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }} mmHg
                       </span>&nbsp;
                   </div>
                 </td>
@@ -119,33 +144,85 @@
               style="border-collapse: collapse;text-align: left;width: 100%;
             ">
               <tr>
-                <td>治疗模式：</td>
+                <td>治疗模式：
+                  <span v-if="prescription.mode_id == 1">HD</span>
+                  <span v-if="prescription.mode_id == 2">HDF</span>
+                  <span v-if="prescription.mode_id == 3">HD+HP</span>
+                  <span v-if="prescription.mode_id == 4">HP</span>
+                  <span v-if="prescription.mode_id == 5">HF</span>
+                  <span v-if="prescription.mode_id == 6">SCUF</span>
+                  <span v-if="prescription.mode_id == 7">IUF</span>
+                  <span v-if="prescription.mode_id == 8">HFHD</span>
+                  <span v-if="prescription.mode_id == 9"> HFHD+HP</span>
+                  <span v-if="prescription.mode_id == 10">PHF</span>
+                  <span v-if="prescription.mode_id == 11">HFR</span>
+                  <span v-if="prescription.mode_id == 12">HDF+HP</span>
+                  <span v-if="prescription.mode_id == 13">CRRT</span>
+                  <span v-if="prescription.mode_id == 14">腹水回输</span>
+                  <span v-if="prescription.mode_id == 15">HD前置换</span>
+                  <span v-if="prescription.mode_id == 16">HD后置换</span>
+                  <span v-if="prescription.mode_id == 17">HDF前置换</span>
+                  <span v-if="prescription.mode_id == 18">HDF后置换</span>
+                  <span v-if="prescription.mode_id == 19"> IUF+HD</span>
+                  <span v-if="prescription.mode_id == 22"> 血浆胆红素吸附+HDF</span>
+                  <span v-if="prescription.mode_id == 23"> 血浆胆红素吸附</span>
+                  <span v-if="prescription.mode_id == 24">I-HDF</span>
+                  <span v-if="prescription.mode_id == 25"> HD高通</span>
+                  <span v-if="prescription.mode_id == 29"> PE</span>
+                  <span v-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
+                </td>
                 <td>
                   透析时长：
                   {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }} h
                   {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }} min
                 </td>
-                <td>预超：</td>
+                <td>预超：{{prescription.target_ultrafiltration }}L</td>
                 <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}</td>
               </tr>
               <tr>
-                <td colspan="4">抗凝剂：</td>
+                <td colspan="4">抗凝剂：
+                  {{prescription.anticoagulant_name?prescription.anticoagulant_name : "/"}}
+                </td>
               </tr>
               <tr>
-                <td colspan="2">透析机：</td>
-                <td colspan="2">透析器：
+                <td colspan="2">透析机：
+                  {{predialysis.machine_type ? predialysis.machine_type : ""}}
+                </td>
+                <td colspan="2">透析器/灌流器：
                   {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
+
+                  {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">透析液：</span>
+                  <span style="width: 14%;">透析液：
+                   流量： {{prescription.dialysate_flow?prescription.dialysate_flow:"" }} ml/min
+                   温度: {{ prescription.dialysate_temperature }} ℃
+                   钾：{{ prescription.kalium }} mmol/L
+                   钠：{{ prescription.sodium }} mmol/L
+                   钙:{{ prescription.calcium }} mmol/L
+                   碳酸氢盐: {{ prescription.bicarbonate }} mmol/L
+                  </span>
                 </td>
               </tr>
               <tr>
                 <td colspan="2"></td>
                 <td colspan="2">
                   处方医生：
+                  <span
+                    style="height: 30px; display: inline-block"
+                      v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                      >
+                     {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                  </span>
+                  <img
+                    style="height: 40px"
+                    :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
                 </td>
               </tr>
             </table>
@@ -175,20 +252,37 @@
                 <th width="50">超滤率<br>ml/h</th>
                 <th width="50">电导率<br>ms/cm</th>
               </tr>
-              <tr>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
+              <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>
+                <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                <td>{{monitor.venous_pressure? monitor.venous_pressure: ""}}</td>
+                <td>{{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}</td>
+                <td>{{monitor.replacement_rate? monitor.replacement_rate: ""}}</td>
+                <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
+                <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
+                <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
+                <td>{{monitor.dispose? monitor.dispose: ""}}
+                  {{monitor.result? monitor.result: ""}}
+                </td>
+                <td>
+                  <span
+                    style="height: 30px; display: inline-block"
+                      v-if="setAdminUserES(monitor.creater) == ''"
+                      >
+                     {{ getAdminUser(monitor.creater) }}
+                  </span>
+                  <img
+                    style="height: 40px"
+                    :src="setAdminUserES(monitor.creater)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </td>
               </tr>
             </table>
           </div>
@@ -297,7 +391,9 @@
                       : "/"
                   }}
                 </td>
-                <td>实超：</td>
+                <td>实超：
+                  {{ afterdialysis.actual_ultrafiltration }}ml
+                </td>
                 <td>实际治疗时长：
                   {{
                     afterdialysis.actual_treatment_hour
@@ -310,25 +406,42 @@
                   }}分钟
                 </td>
                 <td>下机时间：
-                  <!-- {{ getTime(Order.end_time, "{y}-{m}-{d} {h}:{i}") ? getTime(Order.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }} -->
+                  {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ? getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }}
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
                   <div>
                     透后生命体征：
-                    T <span>36.5 ℃</span>&nbsp;
-                    P <span>36.5 ℃</span>&nbsp;
-                    R <span>36.5 ℃</span>&nbsp;
-                    BP <span>36.5 ℃</span>&nbsp;
+                    T: <span>
+                      {{ afterdialysis.temperature }}  ℃
+                    </span>&nbsp;
+                    P: <span>
+                     {{ afterdialysis.pulse_frequency }} 次/分
+                    </span>&nbsp;
+                    R: <span>
+                      {{ afterdialysis.breathing_rate }} 次/分
+                    </span>&nbsp;
+                    BP: <span>
+                      {{ afterdialysis.systolic_blood_pressure }} mmHg / {{ afterdialysis.diastolic_blood_pressure }}mmHg
+                    </span>&nbsp;
                   </div>
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">通路评估：</span>
-                  <span style="width: 14%;">震颤：</span>
-                  <span style="width: 14%;">外观：</span>
+                  <span style="width: 14%;">通路评估：
+                    {{
+                      afterdialysis.internal_fistula
+                        ? afterdialysis.internal_fistula
+                        : ""
+                     }}
+
+                     {{
+                        afterdialysis.catheter ? afterdialysis.catheter : ""
+                    }}
+                  </span>
+
                 </td>
               </tr>
             </table>
@@ -336,7 +449,9 @@
 
           <div class="infoTitle">治疗小结</div>
           <div style="height: 80px;margin: 10px 0px;text-align: left;">
-            <span>治疗小结：</span>
+            <span>治疗小结：
+            {{summary.dialysis_summary?summary.dialysis_summary:'/'}}
+            </span>
           </div>
           <div style="text-align: left;width: 100%;">
             <table>
@@ -373,18 +488,28 @@
                       srcset=""
                       v-else
                     />
-                    
+
                   </span>
                 </td>
-                <td width="10%">核对护士：</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>
                 <td width="10%"></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>
                 <td width="10%"></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>
                 <td width="10%"></td>
               </tr>
             </table>
-          
+
           </div>
         </div>
       </div>
@@ -1407,7 +1532,7 @@ export default {
   .table tr td{
     padding: 5px;
   }
-  
+
 
 }
 </style>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,7 +10,7 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485 && org_id != 10375"><!---->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
             <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
@@ -19,7 +19,7 @@
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
           <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
-          <printSix v-if="org_id == 10217  || org_id == 0" :paramsObj="invoiceParams"></printSix>
+          <!-- <printSix v-if="org_id == 10217  " :paramsObj="invoiceParams"></printSix> -->
 <!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
@@ -33,12 +33,12 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217">
+    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
       <div class='dialysisPage'>
-        <printSix v-if="org_id == 10217  " :paramsObj="invoiceParams"></printSix>
+        <printSix :paramsObj="invoiceParams"></printSix>
       </div>
     </div>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 ||org_id == 0">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 ">
       <div class='dialysisPage'>
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,255 +1,14 @@
-<template>
-  <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" >
-      <div :style="{position: 'absolute',top:(30 + (index * 415))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
-      <div :style="{position: 'absolute',top:(70 + (index * 415))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
-      <div style="display:flex;justify-content: space-between;">
-        <div :style="{position: 'absolute',top:(100 + (index * 415))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
-      </div>
-      <div :style="{position: 'absolute',top:(190 + (index * 415))  + 'px',left:120+ 'px',}">
-        <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
-        <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
-        <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
-        <div v-if="list.chineseTraditionalMedicineCostTotal">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
-        <div v-if="list.laboratoryCostTotal">化验费 {{ list.laboratoryCostTotal }}</div>
-        <div v-if="list.operationCostTotal">手术费 {{ list.operationCostTotal }}</div>
-        <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
-        <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
-      </div>
-      <div :style="{position: 'absolute',top:(190 + (index * 420))  + 'px',left:300+ 'px'}">
-        <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
-                    <span style="display:inline-block;width:300px;">
-                        <span v-if="item.advice.id == 0">
-                            <span v-if="item.project.type == 2"> {{ item.project.project.project_name }}</span>
-                            <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
-                        </span>
-                        <span v-else>{{ item.advice.advice_name }}</span>
-                    </span>
-          <span style="display:inline-block;width:50px;">
-                        <span v-if="item.advice.id == 0">
-                            <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
-                            <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
-                        </span>
-                        <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
-                    </span>
-          <span>
-                        <span v-if="item.advice.id == 0">
-                            <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
-                            <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
-                        </span>
-                        <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
-                    </span>
-        </div>
-      </div>
-      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
-      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
-      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(370 + (index * 415))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
-        <div style="display:flex;">
-          <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-          <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-          <div style="width:140px">统筹支出：{{ list.order.hifp_pay }}</div>
-          <div style="width:140px">大病支出：{{list.order.hifmi_pay}}</div>
-          <div style="width:140px">个人账户支付：{{ list.order.acct_pay }}</div>
-          <div style="width:140px">现金支出：{{ list.order.psn_cash_pay }}</div>
-          <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>
-
-        </div>
-        <div style="display:flex;">
-          <div style="width:140px">本次账户：0</div>
-          <div style="width:140px">上次账户：0</div>
-          <div style="width:140px">账户余额：{{ list.order.balc }}</div>
-          <div style="width:140px">其他支出：{{ list.order.oth_pay }}</div>
-          <div style="width:140px">大病补充保险支出：0</div>
-          <div style="width:140px">民政支出：0</div>
-          <div style="width:280px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
-        </div>
-
-      </div>
-      <div v-if="index != pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
-          <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
-        </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
-          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
-        </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
-          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
-        </div>
-      </div>
-
-      <div v-if="index == pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
-          <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
-        </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
-          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
-        </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
-          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-
 
-<script>
-import { getInvoice } from '@/api/project/project'
-import { uParseTime } from '@/utils/tools'
-export default {
-  props:{
-    paramsObj:Object
-  },
-  data(){
-    return{
-      list:{},
-      printDate:'',
-      zhongwen:'',
-      totalPrice:0.0,
-      org_id:'',
-      org_name:'',
-      page:1,
-      pageArr:[],
-    }
-  },
-  created(){
-    console.log('paramsObj',this.paramsObj)
-    let params = {
-      order_id: this.paramsObj.order_id,
-      patient_id: this.paramsObj.patient_id,
-    }
-    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
-  },
-  methods:{
-    getInvoice(params){
-      getInvoice(params).then((res) => {
-        // console.log('res',res)
-        this.list = res.data.data
-        // console.log(this.list,'表单内容打印记得注释')
-        this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
-        this.smalltoBIG(this.list.medfee_sumamt)
-        var data = new Date(res.data.data.date * 1000);
-        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.pageArr = []
-        this.getPage()
-        this.pageArr.push(9)
-        console.log('pageArr',this.pageArr.length)
-      })
-    },
-    smalltoBIG(n) {
-      // let fraction = ['角', '分'];
-      // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-      // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
-      // let head = price < 0 ? '欠' : '';
-      // price = Math.abs(price);
-      // let upper = '';
-      // for (let i = 0; i < fraction.length; i++) {
-      // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
-      // }
-      // upper = upper || '整';
-      // price = Math.floor(price);
-      // for (let i = 0; i < unit[0].length && price > 0; i++) {
-      // let p = '';
-      // for (let j = 0; j < unit[1].length && price > 0; j++) {
-      //     p = digit[price % 10] + unit[1][j] + p;
-      //     price = Math.floor(price / 10);
-      // }
-      // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
-      // }
-      // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
-      // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
-      if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
-        return "数据非法";  //判断数据是否大于0
-      }
-
-      var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-      n += "00";
-
-      var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
-
-      if (indexpoint >= 0){
-
-        n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
-      }
-
-      unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
-      for (var i=0; i < n.length; i++){
-        str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
-      }
-      console.log("str",str)
-      if(str == '零元零角零分'){
-        this.zhongwen = '零'
-      }else{
-        this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
-      }
-
-      console.log(this.zhongwen)
-    },
-    getTime(value, temp) {
-      if (value == 0) {
-        return ''
-      }
-      if (value != undefined) {
-        return uParseTime(value, temp)
-      }
-      return ''
-    },
-    getPage(){
-      if(this.list.order_info.length <= 9){
-        this.page = 1
-        this.pageArr.push(this.list.order_info.length)
-      }else if(this.list.order_info.length > 9){
-        this.page = parseInt(this.list.order_info.length / 9)
-        let num = this.list.order_info.length % 9
-        for (var i=0;i<this.page;i++){
-          this.pageArr.push(9)
-        }
-        if(num != 0){
-          this.pageArr.push(num)
-        }
-      }
-    }
-
-  },
-  watch:{
-    paramsObj:{//深度监听，可监听到对象、数组的变化
-      handler(val, oldVal){
-        let params = {
-          order_id: val.order_id,
-          patient_id: val.patient_id,
-        }
-        this.getInvoice(params)
-
-      },
-      deep:true
-    }
-  }
-}
-</script>
 <template>
+  
   <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" >
-      <div :style="{position: 'absolute',top:(30 + (index * 415))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
-      <div :style="{position: 'absolute',top:(70 + (index * 415))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
+    <div v-for='(i,index) in pageArr.length' :key="index" style="position: relative;">
+      <div :style="{position: 'absolute',top:(38 + (index * 380))  + 'px',left:152+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+      <div :style="{position: 'absolute',top:(76 + (index * 380))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div style="display:flex;justify-content: space-between;">
-        <div :style="{position: 'absolute',top:(100 + (index * 415))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
+        <div :style="{position: 'absolute',top:(95 + (index * 380))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
       </div>
-      <div :style="{position: 'absolute',top:(190 + (index * 415))  + 'px',left:120+ 'px',}">
+      <div :style="{position: 'absolute',top:(140 + (index * 380))  + 'px',left:76+ 'px',}">
         <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
         <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
         <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
@@ -259,7 +18,7 @@ export default {
         <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
         <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
       </div>
-      <div :style="{position: 'absolute',top:(190 + (index * 420))  + 'px',left:300+ 'px'}">
+      <div :style="{position: 'absolute',top:(140 + (index * 380))  + 'px',left:247+ 'px'}">
         <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
                     <span style="display:inline-block;width:300px;">
                         <span v-if="item.advice.id == 0">
@@ -269,24 +28,24 @@ export default {
                         <span v-else>{{ item.advice.advice_name }}</span>
                     </span>
           <span style="display:inline-block;width:50px;">
-                        <span v-if="item.advice.id == 0">
-                            <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
-                            <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
-                        </span>
-                        <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
-                    </span>
+              <span v-if="item.advice.id == 0">
+                  <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
+                  <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
+              </span>
+              <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
+          </span>
           <span>
-                        <span v-if="item.advice.id == 0">
-                            <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
-                            <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
-                        </span>
-                        <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
-                    </span>
+              <span v-if="item.advice.id == 0">
+                  <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+                  <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+              </span>
+              <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
+          </span>
         </div>
       </div>
-      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
-      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
-      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(370 + (index * 415))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+      <div :style="{position: 'absolute',top:(285 + (index * 380))  + 'px',left:121+ 'px'}">{{ zhongwen }}</div>
+      <div :style="{position: 'absolute',top:(285 + (index * 380))  + 'px',left:391+ 'px'}">{{ list.medfee_sumamt }}</div>
+      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(304 + (index * 380))  + 'px',left:125+ 'px',width:100 + '%',fontSize:12+'px'}">
         <div style="display:flex;">
           <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
           <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
@@ -309,35 +68,36 @@ export default {
 
       </div>
       <div v-if="index != pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:435+ 'px'}">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:479+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:500+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
         </div>
       </div>
 
       <div v-if="index == pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:435+ 'px'}">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:479+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
+        <div :style="{position: 'absolute',top:(361 + (index * 380))  + 'px',left:500+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
         </div>
       </div>
 
     </div>
   </div>
+  
 </template>
 
 

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -17,7 +17,6 @@
           org_id != 10217 && org_id != 10188 &&org_id != 10318&&
           org_id != 9675 &&
           org_id != 9671 &&
-          org_id != 0 &&
           org_id != 10164 && org_id != 10341 && 
           org_id != 10342 && org_id != 10138 &&
           org_id != 10278
@@ -48,7 +47,7 @@
       ></printTwo>
       
       <printThree
-        v-if="org_id == 10318 || org_id == 0 "
+        v-if="org_id == 10318"
         ref="printThree"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -59,7 +58,7 @@
       <!-- || org_id == 0-->
       </printThree>
       <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="otherInfo">
             <div>药物过敏史：</div>
-            <div style="flex:1;">{{patient.past_history?patient.past_history:''}}</div>
+            <div style="flex:1;">{{history.allergic_history?history.allergic_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div>病历编号：</div>

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -287,7 +287,7 @@
             <p>
               金额：{{
                 getTotalOne(item.id).toFixed(2)
-                  ? getTotalOne(item.id).toFixed(2)
+                  ? getTotalOne(item.id).toFixed(2) 
                   : 0
               }}元
             </p>
@@ -511,8 +511,10 @@ export default{
       return name;
     },
     getTotalOne(id) {
+      console.log('999999999',id);
       var total = 0;
       var addtotal = 0;
+      var zimuyao = 0;
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (id == this.prescriptions[i].id) {
           if (this.prescriptions[i].project != null) {
@@ -520,7 +522,7 @@ export default{
               total =
                 total +
                 this.prescriptions[i].project[a].price *
-                  this.prescriptions[i].project[a].count;
+                  this.prescriptions[i].project[a].count ;
             }
           }
 
@@ -533,7 +535,7 @@ export default{
               addtotal =
                 addtotal +
                 this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                  this.prescriptions[i].additionalcharge[a].count ;
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
@@ -546,11 +548,17 @@ export default{
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
               total =
                 total +
-                this.prescriptions[i].advices[a].price *
-                  this.prescriptions[i].advices[a].prescribing_number;
+                (this.prescriptions[i].advices[a].price *
+                  this.prescriptions[i].advices[a].prescribing_number) ;
+            }
+          }
+          if(this.prescriptions[i].arr[0] != null){
+            for(let b=0;b<this.prescriptions[i].arr[0].length;b++){
+              zimuyao = zimuyao +
+              this.prescriptions[i].arr[b][0].price *
+              this.prescriptions[i].arr[b][0].prescribing_number
             }
           }
-
           if (this.prescriptions[i].additionalcharge != null) {
             for (
               let a = 0;
@@ -559,15 +567,15 @@ export default{
             ) {
               addtotal =
                 addtotal +
-                this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                (this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count );
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
         }
       }
 
-      return total + addtotal;
+      return total + addtotal + zimuyao ;
     },
 
     getProjectName(id) {

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,9 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>
 </template>
@@ -34,13 +35,15 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./treatTemplate/printOne"
 import printTwo from "./treatTemplate/printTwo"
+import printThree from "./treatTemplate/printThree.vue"
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
     printOne,
-    printTwo
+    printTwo,
+    printThree
   },
   props:{
     paramsObj:Object,

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -2,7 +2,7 @@
     <div id='prescriptionPrint'>
         <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-            <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+            <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                     <span>费别</span>
                     <span>自费</span>
@@ -10,7 +10,8 @@
                     <span>保险</span>
                     <span>其他</span>
                 </div>
-                <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+                <div v-if="org_id == 10460">就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
+                <div v-else>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
             </div>
 
             <div class="printTitle">{{orgname}}</div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printThree.vue

@@ -0,0 +1,531 @@
+<template>
+  <div id='prescriptionPrint'>
+      <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
+
+          <div class="printTitle">{{orgname}}</div>
+          <div class="printTitle">处方、治疗单</div>
+          <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
+              <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                  <span>费别</span>
+                  <span>自费</span>
+                  <span>公费</span>
+                  <span>保险</span>
+                  <span>其他</span>
+              </div>
+              <div >就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+          </div>
+<!-- class="infoTitle" -->
+          <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
+              <div style="width: 300px;">门诊编号：</div>
+              <!-- <div style="width: 300px;">电脑号：</div> -->
+          </div>
+
+          <div class="infoMain">
+              <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+              <div style="margin-bottom: 10px;width:25%">性别：
+                  <span v-if="item.patient.gender == 1">男</span>
+                  <span v-if="item.patient.gender == 2">女</span>
+              </div>
+              <div style="margin-bottom: 10px;width:25%">年龄：
+                  <span>{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
+              </div>
+              <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
+              </div>
+              <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+              <div style="width:50%;">地址：{{ item.patient.home_address }}
+                <!-- {{item.patient.unit_address}} -->
+              </div>
+              <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+          </div>
+
+          <div class="prescriptionBox" style="min-height: 425px;">
+              <table style="width:100%;text-align:center;line-height:25px;">
+                  <tr>
+                      <td>序号</td>
+                      <td>项目名称</td>
+                      <td>数量</td>
+                      <td>单位</td>
+                      <td>单价</td>
+                      <td>部位</td>
+                      <td>备注</td>
+                      <td>天数</td>
+                  </tr>
+                  <tr v-for="(it,index) in item.project" :key="index">
+                      <td>{{index+1}}</td>
+                      <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
+                      <td>{{it.count}}</td>
+                      <td>{{getUnit(it.unit)}}</td>
+                      <td>{{it.price.toFixed(2)}}</td>
+                      <td></td>
+                      <td>{{it.remark}}</td>
+                      <td>{{it.day}}</td>
+
+                  </tr>
+
+                  <tr v-for="(it,index) in item.advices" :key="index">
+                      <td>{{index+1}}</td>
+                      <td>{{it.advice_name?it.advice_name:''}}</td>
+                      <td>{{it.single_dose?it.single_dose:''}}</td>
+                      <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
+                      <td>{{it.price.toFixed(2)}}</td>
+                      <td></td>
+                      <td>{{it.remark}}</td>
+                      <td>{{it.day}}</td>
+
+                  </tr>
+              </table>
+          </div>
+
+          <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
+              <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+              <div style="width: 300px;">签章：</div>
+              <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+          </div>
+
+          <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+              <tr>
+                  <td style="width:16%;">治疗时间</td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+              </tr>
+              <tr>
+                  <td style="width:16%;">医生签字</td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+                  <td style="width:16%;"></td>
+              </tr>
+              <!-- <tr>
+                  <td style="width:16px;">患者签字</td>
+                  <td style="width:16px;"></td>
+                  <td style="width:16px;"></td>
+                  <td style="width:16px;"></td>
+                  <td style="width:16px;"></td>
+                  <td style="width:16px;"></td>
+              </tr> -->
+          </table>
+      </div>
+
+
+      <!-- <div id='prescriptionPrint'>
+
+          <div v-for="(item,index) in advicePrint" :key="index">
+              <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+                  <div style="display:flex;justify-content: space-between;font-weight:bold;">
+                      <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                          <span>费别</span>
+                          <span>自费</span>
+                          <span>公费</span>
+                          <span>保险</span>
+                          <span>其他</span>
+                      </div>
+                      <div>就诊日期：{{getTime(item.ctime)}}</div>
+                  </div>
+
+                  <div class="printTitle">血液透析中心</div>
+
+                  <div class="printTitle">处方、治疗单</div>
+
+                  <div class="infoTitle">
+                      <div>门诊编号：</div>
+                      <div>电脑号：</div>
+                  </div>
+
+                  <div class="infoMain">
+                      <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                      <div style="margin-bottom: 10px;width:25%">性别：
+                          <span v-if="item.patient.gender == 1">男</span>
+                          <span v-if="item.patient.gender == 2">女</span>
+                      </div>
+                      <div style="margin-bottom: 10px;width:25%">年龄：
+                          <span>{{item.patient.age}}</span>
+                      </div>
+                      <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+                      <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                      <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                      <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
+                  </div>
+
+                  <div class="prescriptionBox">
+                      <table style="width:100%;text-align:center;line-height:25px;">
+                          <tr>
+                              <td>序号</td>
+                              <td>项目名称</td>
+                              <td>数量</td>
+                              <td>单位</td>
+                              <td>单价</td>
+                              <td>部位</td>
+                              <td>备注</td>
+                              <td>天数</td>
+                          </tr>
+                          <tr v-for="(it,index) in item.project" :key="index">
+                              <td>{{index+1}}</td>
+                              <td>{{getProjectName(it.project_id)}}</td>
+                              <td>{{it.single_dose}}</td>
+                              <td>{{getUnit(it.unit)}}</td>
+                              <td>{{it.price}}</td>
+                              <td></td>
+                              <td>{{it.remark}}</td>
+                              <td>{{it.day}}</td>
+
+                          </tr>
+                      </table>
+                  </div>
+                  <div class="infoTitle">
+                      <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                      <div>签章：</div>
+                  </div>
+                  <div class="actionBar">
+                      <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                      <div>费用：</div>
+                  </div>
+                  <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+                      <tr>
+                          <td style="width:16%;">治疗时间</td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                      </tr>
+                      <tr>
+                          <td style="width:16%;">医生签字</td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                          <td style="width:16%;"></td>
+                      </tr>
+                      <tr>
+                          <td style="width:16px;">患者签字</td>
+                          <td style="width:16px;"></td>
+                          <td style="width:16px;"></td>
+                          <td style="width:16px;"></td>
+                          <td style="width:16px;"></td>
+                          <td style="width:16px;"></td>
+                      </tr>
+                  </table>
+              </div>
+
+          </div>
+
+      </div> -->
+  </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import { getAllDoctorList, getPrescriptionPrint } from '@/api/project/project'
+import { getInitData } from '@/api/his/his'
+
+export default {
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      projectList: [],
+      prescriptions: [],
+      settlement:
+        [
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' },
+          { value: 3, label: '公费' },
+          { value: 4, label: '农保' },
+          { value: 5, label: '会员' },
+          { value: 6, label: '职工' },
+          { value: 7, label: '合同' },
+          { value: 8, label: '医保自费' }
+
+        ],
+      hisPatient: {},
+      diagnoses: []
+    }
+  },
+  methods: {
+    getAge(patient){
+      var thisLen = patient.id_card_no.length
+      var birth = ''
+      if (thisLen == 15) {
+        birth = '19' + patient.id_card_no.substr(6, 6)
+      } else {
+        birth = patient.id_card_no.substr(6, 8)
+      }
+      var births =
+        birth.substr(0, 4) +
+        '-' +
+        birth.substr(4, 2) +
+        '-' +
+        birth.substr(6, 2)
+      return jsGetAge(births, '-')
+
+    },
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000)
+      this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}'
+      printJS({
+        printable: 'prescription-print',
+        type: 'html',
+        style: style,
+        scanStyles: false
+      })
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then(response => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor
+
+          this.doctorList = doctor
+        }
+      })
+    },
+
+    getDoctor(id) {
+      var name = ''
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name
+        }
+      }
+      return name
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
+    getPrescriptionPrint() {
+      var params = {
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+        p_type:2,
+      }
+      console.log('999999', params)
+      getPrescriptionPrint(params).then(response => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint
+          console.log('adviceprint', advicePrint)
+          this.advicePrint = advicePrint
+          this.prescriptions = advicePrint
+          var projectlist = response.data.data.projectlist
+          console.log('所有项目列表', projectlist)
+          this.projectList = projectlist
+          this.hisPatient = response.data.data.hisPatient
+          this.advicePrint.map((item) => {
+            console.log(item.project.length);
+            if (item.project.length > 0) {
+              for (var i = item.project.length - 1; i >= 0; i--) {
+                if (item.project[i].type == 2) {
+                  if (item.project[i].project.cost_classify == 3) {
+                    console.log("!1111111")
+                    item.project.splice(i, 1);
+                  }
+                }
+              }
+            }
+          });
+
+        }
+      })
+    },
+    getProjectName(id) {
+      var project_name = ''
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name
+        }
+      }
+      return project_name
+    },
+    getUnit(id) {
+      var unit = ''
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          unit = this.projectList[i].unit
+        }
+      }
+      return unit
+    },
+
+    getTotalOne(id) {
+
+      var total = 0
+      var addtotal = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100
+        }
+
+      }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100
+        }
+      }
+
+      return total + addtotal
+    },
+    getInitData() {
+      getInitData().then(response => {
+        if (response.data.state == 1) {
+          this.diagnoses = response.data.data.diagnose
+          console.log('争端', this.diagnoses)
+        }
+      })
+    },
+    getDiagnosis(id) {
+      let arr = id.split(",");
+      var name = "";
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+          name += this.diagnoses[i].class_name + " ";
+        }
+      }
+      return name
+    }
+  },
+  created() {
+    this.getInitData()
+    this.getAllDoctorList()
+    this.getPrescriptionPrint()
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
+
+  },
+  watch: {
+    patient_id: function(val) {
+      console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
+      //    this.getPrescriptionPrint()
+    },
+    ids: function(val) {
+      this.ids = val
+      console.log('this.idsids', this.ids)
+      this.getPrescriptionPrint()
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+  .prescription-print {
+      -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+      -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      margin-bottom: 20px;
+      padding: 20px 10px;
+  }
+
+  .prescription-print {
+      font-size: 14px;
+  }
+
+  .printTitle {
+      font-size: 18px;
+      text-align: center;
+      font-weight: bold;
+      margin-top: 10px;
+  }
+
+  .infoTitle {
+      display: flex;
+      // border-bottom: 2px solid #000;
+      margin-top: 10px;
+      line-height: 24px;
+      padding: 0 10px;
+  }
+
+  .infoTitle div {
+      width: 300px;
+  }
+
+  .infoMain {
+      display: flex;
+      flex-wrap: wrap;
+      border-bottom: 2px solid #000;
+      padding: 0 10px;
+  }
+
+  .infoMain div {
+      width: 50%;
+      line-height: 24px;
+  }
+
+  .prescriptionBox {
+      padding: 0 10px;
+      
+  }
+
+  .Rp {
+      font-size: 22px;
+      font-weight: bold;
+  }
+
+  .drugsBox {
+      padding-left: 40px;
+      margin-bottom: 10px;
+  }
+
+  .drugsBox p {
+      line-height: 30px;
+  }
+
+  .drugsOne {
+      line-height: 24px;
+  }
+
+  .drugsOne span {
+      margin-right: 20px;
+  }
+
+  .actionBar {
+      display: flex;
+      justify-content: space-between;
+      line-height: 24px;
+      padding: 0 10px;
+  }
+
+  .actionBar div {
+      width: 150px;
+  }
+</style>

src/xt_pages/user/components/PatientForm.vue

@@ -393,7 +393,8 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-
+           
+              <el-row>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
@@ -409,10 +410,29 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+            </el-row>
 
+            <!-- <el-row>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="患者去向时间 : "
+                  label="流转地址: "
+                >
+                <el-select v-model="value" placeholder="请选择">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                 </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+  -->
+              <el-row>
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="开始时间 : "
                 >
                 <el-date-picker
                   size="small"
@@ -430,6 +450,28 @@
                 </el-form-item>
               </el-col>
 
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="结束时间 : "
+                >
+                <el-date-picker
+                  size="small"
+                  v-model="form.patient_end_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  @change="startTimeChange"
+                 ></el-date-picker>
+                </el-form-item>
+              </el-col> -->
+              </el-row>
+             
+
               <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
@@ -1099,6 +1141,7 @@ const defaultForm = {
   doctor:"",
   patient_source:0,
   patient_start_time:"",
+  patient_end_time:"",
   formItem: [
     {
       id: 0,
@@ -1349,7 +1392,7 @@ export default {
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
         {value:3,label:"请假"},
-        {value:4,label:"备注"}
+        {value:4,label:"流转"}
       ],
       lapsetoOptions: [
         { value: 1, label: "留治" },

src/xt_pages/workforce/components/editTableData.vue

@@ -1413,28 +1413,28 @@
               >
               </el-option>
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
         
-          <!-- <el-form-item>
+          <el-form-item>
             <span>透析分区:</span>
             <el-select
             filterable 
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
-              @change="changePartition"
+              @change="changePartitionOne"
               >
               <el-option
-                  v-for="(item, index) in zone_names"
+                  v-for="(item, index) in zones"
                   :key="index"
-                  :label="item"
-                  :value="item"
+                  :label="item.name"
+                  :value="item.id"
               >
               </el-option>
               </el-select>
-          </el-form-item> -->
+          </el-form-item>
 
-          <!-- <el-form-item>
+          <el-form-item>
             <span>透析床位:</span>
             <el-select
                filterable 
@@ -1765,6 +1765,7 @@ import {
   ExchangeSch,
   getPatientSmartSch,
   BatchSmartSch,
+
 } from "@/api/schedule_template/sch_template";
 import {
   CancelScheduleTwo,
@@ -1778,7 +1779,8 @@ import {
   getUrgentScheduleInitData,
   getWeekPanelsOne,
   getAllZones,
-  ChangeScheduleTen
+  ChangeScheduleTen,
+  getNumberList
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
 
@@ -5017,13 +5019,13 @@ export default {
         console.log("WOOWOWOWOWOW",this.zones)
         console.log("numberowowow",this.numberList)
         this.changeSchedule.mode_id = row[column.property].mode_id
-        var zone_names = ""
-        for(let i=0;i<this.zones.length;i++){
-          if(row.zone_id == this.zones[i].id){
-           zone_names = this.zones[i].name
-          }
-        }
-        this.changeSchedule.partition_id = zone_names
+        // var zone_names = ""
+        // for(let i=0;i<this.zones.length;i++){
+        //   if(row.zone_id == this.zones[i].id){
+        //    zone_names = this.zones[i].name
+        //   }
+        // }
+        this.changeSchedule.partition_id = row.zone_id
         this.changeSchedule.schedule_type = week[1];
         this.changeSchedule.bed_id = row.jihao_id;
         console.log("床位id",this.changeSchedule.bed_id)
@@ -5108,8 +5110,8 @@ export default {
                   }
                 }
               });
-              this.msDialogVisible = false;
-              this.getAllZones()
+              // this.msDialogVisible = false;
+              // this.getAllZones()
              
             }
             this.changing_mode = false;
@@ -5177,6 +5179,17 @@ export default {
       this.current_devices = this.zone_device_map[value];
       this.device_id = this.current_devices[0].id;
     },
+    changePartitionOne(val){
+      console.log("valwoowow",val)
+
+      getNumberList(val).then(response=>{
+         if(response.data.state==1){
+           var number = response.data.data.number
+           this.numberList = []
+           this.numberList = number
+         }
+      })
+    },
     // 选择下拉框方法
     changeScheduleType(schedule_type) {
       const params = {
@@ -5782,7 +5795,7 @@ export default {
 
           this.strArr = strArr;
           var device_number =  response.data.data.devicenumber
-
+          this.numberList = []
           this.numberList = device_number
           console.log("所有床位",device_number)
           this.getWeekPanels();