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

src/api/config.js

@@ -202,3 +202,11 @@ export function changePrescriptionConfig(params) {
     params: params
   })
 }
+
+export function changeDrugOpenConfig(params) {
+  return request({
+    url: '/api/changedrugopenconfig',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/basicConfig.vue

@@ -39,6 +39,9 @@
             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
+            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
+                <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
+            </p> -->
         </div>
 
 
@@ -94,7 +97,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -115,6 +118,7 @@ export default {
       is_open_is_type:false,
       is_open_advice_xt_his:false,
       is_open_prescription_xt_his:false,
+      drug_out_open:false,
     };
   },
   methods: {
@@ -154,6 +158,12 @@ export default {
               this.is_open_prescription_xt_his = false
             }
 
+            if(response.data.data.is_open == 1){
+              this.drug_out_open = true
+            }else{
+              this.drug_out_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -376,6 +386,25 @@ export default {
             this.$message.success("保存成功!")
           }
       })
+    },
+    changeDrugOpen(){
+      var drug_out_open = 0
+      if(this.drug_out_open == false){
+        drug_out_open = 2
+      }
+      if(this.drug_out_open == false){
+        drug_out_open = 2
+      }
+      var params = {
+        drug_out_open:drug_out_open,
+      }
+      changeDrugOpenConfig(params).then(response=>{
+        if(response.data.state == 1){
+           var msg =  response.data.data.msg
+           this.$message.success("保存成功!")
+        }
+      })
+
     }
 
   },

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1385,7 +1385,7 @@ export default {
       const style11 =
         '@media print {.dialysis-print-order{width:960px;margin:100px auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:30px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:15px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       // 漳浦天福样式
-      const style12 ='@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
+      const style12 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1670,7 +1670,7 @@ export default {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style,
+          style: style2,
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 43) {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -3,19 +3,6 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name">{{ orgname }}</div>
       <div class="order-title">血液透析（滤过）记录表单</div>
-
-      <!-- <table class="table-box" style="margin-top: 10px;">
-            <tbody>
-            <tr>
-
-              <td width="40">诊 断:</td>
-              <td width="">
-                <div class="under-line">&nbsp;{{patientInfo.diagnose}}</div>
-              </td>
-
-            </tr>
-            </tbody>
-          </table> -->
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -24,7 +11,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="11">
+            <td colspan="11" style="padding-left: 10px">
               <div class="list_table">
                 <div>姓 名:&nbsp;{{ patientInfo.name }}</div>
                 <div>
@@ -35,10 +22,12 @@
             </td>
           </tr>
           <tr class="list_table_1">
-            <td colspan="11">
+            <td colspan="11" style="padding-left: 10px">
               <div style="display: flex">
                 <div style="width: 400px">
-                  病情评估:&nbsp;<span>{{ sick_condition ? sick_condition : "" }}</span>
+                  病情评估:&nbsp;<span>{{
+                    sick_condition ? sick_condition : ""
+                  }}</span>
                 </div>
                 <div style="width: 400px">
                   入科方式:&nbsp;<span
@@ -54,7 +43,11 @@
             </td>
           </tr>
           <tr class="list_table_1">
-            <td width="250" style="border-right: none" colspan="2">
+            <td
+              width="250"
+              style="border-right: none; padding-left: 10px"
+              colspan="2"
+            >
               治疗方式:
               <label-box
                 :isChecked="prescription.mode_id == 1 ? true : false"
@@ -99,7 +92,7 @@
               </span>
             </td>
             <!-- <td width="20" style="border: none"></td> -->
-            <td width="200">
+            <td width="200" style="padding-left: 10px">
               治疗时间：&nbsp;{{
                 afterdialysis.actual_treatment_hour
                   ? afterdialysis.actual_treatment_hour
@@ -111,40 +104,114 @@
               }}&nbsp;分
             </td>
           </tr>
+          <tr v-if="org_id == 10249 || org_id == 0">
+            <td colspan="12" style="padding-left: 10px">
+
+              <div style="display: flex">
+                活动性出血：
+                <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
+                <label-box :isChecked="predialysis.is_hemorrhage == 1 ? true : false" showValue="有"></label-box>
+                （&nbsp;<label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('穿刺点渗血') > -1 ? true : false" showValue="穿刺点渗血"></label-box>
+                <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
+                <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('消化道出血') > -1 ? true : false" showValue="消化道出血"></label-box>
+                <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('女性经期') > -1 ? true : false" showValue="女性经期"></label-box>
+                <div style="display: flex;padding-left:20px;">其他<div style="min-width:200px;border-bottom:1px solid #999;height: 35px;text-align: center;"><span v-if="predialysis.is_hemorrhage == 1">{{
+                            predialysis.hemorrhage_other
+                          }}</span></div></div>
+                &nbsp;）
+
+              </div>
+            </td>
+          </tr>
           <tr class="list_table_1">
-            <td colspan="12">
+            <td colspan="12" style="padding-left: 10px">
               治疗抗凝:
               <label-box
+                v-if="prescription.anticoagulant == 3"
                 :isChecked="prescription.anticoagulant == 3 ? true : false"
                 showValue="低分子肝素:"
               ></label-box>
-              &nbsp;&nbsp;{{prescription.anticoagulant_zongliang && prescription.anticoagulant == "3" ? prescription.anticoagulant_zongliang : ""}}U；&nbsp;&nbsp;
+              <label-box
+                v-if="prescription.anticoagulant == 6"
+                :isChecked="prescription.anticoagulant == 6 ? true : false"
+                showValue="低分子肝素钙:"
+              ></label-box>
+              <label-box
+                v-if="prescription.anticoagulant == 7"
+                :isChecked="prescription.anticoagulant == 7 ? true : false"
+                showValue="低分子肝素钠:"
+              ></label-box>
+
+              &nbsp;&nbsp;{{
+                prescription.anticoagulant_zongliang &&
+                (prescription.anticoagulant == 3 ||
+                  prescription.anticoagulant == 6 ||
+                  prescription.anticoagulant == 7)
+                  ? prescription.anticoagulant_zongliang
+                  : ""
+              }}U；&nbsp;&nbsp;
               <label-box
                 :isChecked="prescription.anticoagulant == 2 ? true : false"
                 showValue="普通肝素:"
               ></label-box
-              >首剂 &nbsp;&nbsp;<span><span style="width:35px;display: inline-block;">
-                {{ prescription.anticoagulant_shouji && (prescription.anticoagulant != 3 ) && prescription.anticoagulant == 2 ? prescription.anticoagulant_shouji : "" }}
-              </span></span> mg&nbsp;&nbsp;&nbsp;
-              追加&nbsp;&nbsp;<span>{{ prescription.anticoagulant_weichi && prescription.anticoagulant == 2 ? prescription.anticoagulant_weichi : "" }}</span>&nbsp;&nbsp;mg/h&nbsp;
-              总量&nbsp;&nbsp;<span>{{ prescription.anticoagulant_zongliang && prescription.anticoagulant == 2 ? prescription.anticoagulant_zongliang : "" }}</span>&nbsp;&nbsp;mg；
+              >首剂 &nbsp;&nbsp;<span
+                ><span style="width: 35px; display: inline-block">
+                  {{
+                    prescription.anticoagulant_shouji &&
+                    prescription.anticoagulant != 3 &&
+                    prescription.anticoagulant == 2
+                      ? prescription.anticoagulant_shouji
+                      : ""
+                  }}
+                </span></span
+              >
+              mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
+                prescription.anticoagulant_weichi &&
+                prescription.anticoagulant == 2
+                  ? prescription.anticoagulant_weichi
+                  : ""
+              }}</span
+              >&nbsp;&nbsp;mg/h&nbsp; 总量&nbsp;&nbsp;<span>{{
+                prescription.anticoagulant_zongliang &&
+                prescription.anticoagulant == 2
+                  ? prescription.anticoagulant_zongliang
+                  : ""
+              }}</span
+              >&nbsp;&nbsp;mg；
               <label-box
                 :isChecked="prescription.anticoagulant == 1 ? true : false"
                 showValue="无肝素"
               ></label-box>
-              <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸"></label-box>
+              <label-box
+                :isChecked="prescription.anticoagulant == 5 ? true : false"
+                showValue="枸橼酸"
+              ></label-box>
             </td>
           </tr>
-          <tr class="list_table_1" style="line-height: 30px">
-            <td width="100" style="border-right: none" colspan="2">
+          <tr class="list_table_1" style="line-height: 40px">
+            <td
+              width="100"
+              style="border-right: none; padding-left: 10px"
+              colspan="2"
+            >
               处方脱水量:
-              <p style="display: inline-block; width: 40px">{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }}</p>
+              <p style="display: inline-block; width: 40px">
+                {{
+                  prescription.target_ultrafiltration
+                    ? prescription.target_ultrafiltration
+                    : ""
+                }}
+              </p>
               ml; 透析液流量：
-              <p style="display: inline-block; width: 40px">{{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}</p>
+              <p style="display: inline-block; width: 40px">
+                {{
+                  prescription.dialysate_flow ? prescription.dialysate_flow : ""
+                }}
+              </p>
               ml/h;
             </td>
             <!-- <td style="border: none"></td> -->
-            <td width="20">
+            <td width="20" style="padding-left: 10px">
               医师签名：
               <span v-if="setAdminUserES(prescription.creater) == ''">
                 {{ getAdminUser(prescription.creater) }}
@@ -160,37 +227,57 @@
             </td>
           </tr>
           <tr colspan="13" class="list_table_1">
-            <!-- <td >透析机：{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</td>
-            <td style="width: 175px;">透析（滤）器：{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}</td>
-            <td width="150">透析液：钾：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.kalium ? prescription.kalium : "" }}
-              </span>mmol/L&nbsp; 钙：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.calcium ? prescription.calcium : "" }}
-              </span>mmol/L&nbsp; 碳酸氢根：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.bicarbonate ? prescription.bicarbonate : "" }}
-              </span>mmol/L</td> -->
-              <td colspan="13">
-                <div style="display:flex;">
-                  <div style="width: 230px;border-right: 1px solid;" >透析机：{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</div>
-                  <div style="width: 213px;border-right: 1px solid;">透析（滤）器：{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}</div>
-                  <div>透析液：钾：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.kalium ? prescription.kalium : "" }}
-              </span>mmol/L&nbsp; 钙：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.calcium ? prescription.calcium : "" }}
-              </span>mmol/L&nbsp; 碳酸氢根：
-              <span style="width:30px;display: inline-block;">
-                {{ prescription.bicarbonate ? prescription.bicarbonate : "" }}
-              </span>mmol/L</div>
+            <td colspan="13" style="padding-left: 10px">
+              <div class="td_div1" style="display: flex">
+                <div
+                  style="
+                    display: flex;
+                    min-width: 150px;
+                    border-right: 1px solid;
+                  "
+                >
+                  透析机：{{
+                    dialysisOrder &&
+                    dialysisOrder.DeviceNumber &&
+                    dialysisOrder.DeviceNumber.number.length > 0
+                      ? dialysisOrder.DeviceNumber.number
+                      : patientInfo.DialysisSchedule.device_number.number
+                  }}
+                </div>
+                <div
+                  style="
+                    display: flex;
+                    border-right: 1px solid;
+                    padding: 0 10px;
+                  "
+                >
+                  透析（滤）器：{{
+                    prescription.dialyzer_perfusion_apparatus
+                      ? prescription.dialyzer_perfusion_apparatus
+                      : ""
+                  }}
+                </div>
+                <div style="padding-left: 10px">
+                  透析液：钾：
+                  <span style="width: 30px; display: inline-block">
+                    {{ prescription.kalium ? prescription.kalium : "" }} </span
+                  >mmol/L&nbsp; 钙：
+                  <span style="width: 30px; display: inline-block">
+                    {{
+                      prescription.calcium ? prescription.calcium : ""
+                    }} </span
+                  >mmol/L&nbsp; 碳酸氢根：
+                  <span style="width: 30px; display: inline-block">
+                    {{
+                      prescription.bicarbonate ? prescription.bicarbonate : ""
+                    }} </span
+                  >mmol/L
                 </div>
-              </td>
+              </div>
+            </td>
           </tr>
           <tr class="list_table_1">
-            <td colspan="11">
+            <td colspan="11" style="padding-left: 10px">
               <div style="display: flex; justify-content: flex-start">
                 <div style="width: 75%">
                   血管通路: &nbsp;
@@ -260,11 +347,34 @@
                   ></label-box>
                   &nbsp;
                 </div>
-                <div style="width: 25%">穿刺者：
-                <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
-                  {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}
-                </span>
-                <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt srcset v-else /></div>
+                <div style="width: 25%">
+                  穿刺者：
+                  <span
+                    v-if="
+                      setAdminUserES(
+                        dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse
+                      ) == ''
+                    "
+                  >
+                    {{
+                      getAdminUser(
+                        dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse
+                      )
+                    }}
+                  </span>
+                  <img
+                    class="es-img"
+                    style="height: 30px"
+                    :src="
+                      setAdminUserES(
+                        dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse
+                      )
+                    "
+                    alt
+                    srcset
+                    v-else
+                  />
+                </div>
               </div>
             </td>
           </tr>
@@ -372,7 +482,11 @@
                   }}
                 </td>
                 <td width="25%">
-                  &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+                  &nbsp;{{
+                    monitor.ultrafiltration_volume
+                      ? monitor.ultrafiltration_volume
+                      : ""
+                  }}
                 </td>
               </table>
             </td>
@@ -385,11 +499,7 @@
                 frame="void"
               >
                 <td style="width: 20%">
-                  &nbsp;{{
-                    monitor.monitor_temperature
-                      ? monitor.monitor_temperature
-                      : ""
-                  }}
+                  &nbsp;{{ monitor.temperature ? monitor.temperature : "" }}
                 </td>
                 <td style="width: 20%">
                   &nbsp;{{
@@ -403,24 +513,31 @@
                 </td>
                 <td style="width: 20%">
                   &nbsp;{{
-                    monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : ""
+                    monitor.systolic_blood_pressure
+                      ? monitor.systolic_blood_pressure
+                      : ""
+                  }}/{{
+                    monitor.diastolic_blood_pressure
+                      ? monitor.diastolic_blood_pressure
+                      : ""
                   }}
                 </td>
                 <td style="width: 20%">
                   &nbsp;{{
-                    monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : ""
+                    monitor.blood_oxygen_saturation
+                      ? monitor.blood_oxygen_saturation
+                      : ""
                   }}
                 </td>
               </table>
             </td>
             <td>
-              <span style="line-height:18px;display:block;">
-              {{ monitor.symptom }}&nbsp;{{ monitor.dispose }}&nbsp;{{
-              monitor.result
-              }}
-            </span>
+              <span style="line-height: 18px; display: block">
+                {{ monitor.symptom }}&nbsp;{{ monitor.dispose }}&nbsp;{{
+                  monitor.result
+                }}
+              </span>
             </td>
-
           </tr>
         </tbody>
       </table>
@@ -443,7 +560,9 @@
             <td style="width: 60px; height: 40px">
               <p style="height: 20px; line-height: 20px">上次透后体重</p>
             </td>
-            <td style="width: 45px; height: 40px">{{assessmentafter.weight_after}}kg</td>
+            <td style="width: 45px; height: 40px">
+              {{ assessmentafter.weight_after }}kg
+            </td>
           </tr>
 
           <tr v-for="(advice, advice_index) in advices">
@@ -494,7 +613,6 @@
               />
             </td>
 
-            
             <td v-if="advice_index === 0">透前体重:</td>
             <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
             <td v-if="advice_index === 1">体重增加量:</td>
@@ -502,7 +620,7 @@
               {{
                 (
                   predialysis.weight_before - assessmentafter.weight_after
-                ).toFixed(1)
+                ).toFixed(2)
               }}kg
             </td>
             <td v-if="advice_index === 2">干体重(DW):</td>
@@ -510,51 +628,116 @@
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
               {{
-                (
-                  assessmentafter.weight_after -
-                  predialysis.dry_weight
-                ).toFixed(2)
+                (afterdialysis.weight_after - predialysis.dry_weight).toFixed(
+                  2
+                )
               }}kg
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
             <td v-if="advice_index === 4">
-              {{ afterdialysis.actual_ultrafiltration }}L
+              {{ afterdialysis.actual_ultrafiltration }}ml
             </td>
             <td v-if="advice_index === 5">透后体重:</td>
             <td v-if="advice_index === 5">
-              {{ assessmentafter.weight_after }}kg
+              {{ afterdialysis.weight_after }}kg
             </td>
-             <td v-if="advice_index === 6">本次透析体重下降量:</td>
+            <td v-if="advice_index === 6">本次透析体重下降量:</td>
             <td v-if="advice_index === 6">
-              {{ afterdialysis.weight_after }}kg
+              {{
+                (
+                  predialysis.weight_before - afterdialysis.weight_after
+                ).toFixed(2)
+              }}kg
             </td>
+            <td v-if="advice_index > 6"></td>
+            <td v-if="advice_index > 6"></td>
           </tr>
         </tbody>
       </table>
       <table class="print-table" border="1">
-         <tr style="height:60px;text-align:left;border:none;">
-            <td style="padding-left:5px;border:none">
-              治疗小结：{{ summary.dialysis_summary ? summary.dialysis_summary : "" }}
-            </td>
-          </tr>
-          <tr style="height:40px">
-            <td rowspan="11" style="border:none;text-align:right;height:40px">
-              医生签名
-              <span style="display: inline-block;width:100px;text-align: left;">
-                &nbsp;
-                  <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                  <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
-              </span>
-              护士签名
-              <span style="display: inline-block;width:100px;text-align: left;">
-                &nbsp;
-                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
-                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+        <tr style="height: 60px; text-align: left; border: none">
+          <td style="padding-left: 5px; border: none">
+            治疗小结：{{
+              summary.dialysis_summary ? summary.dialysis_summary : ""
+            }}
+          </td>
+        </tr>
+        <tr style="height: 40px">
+          <td
+            rowspan="11"
+            style="border: none; text-align: right; height: 40px"
+          >
+            医生签名
+            <span style="display: inline-block; width: 100px; text-align: left">
+              &nbsp;
+              <span
+                v-if="
+                  setAdminUserES(
+                    prescription == null
+                      ? 0
+                      : prescription.prescription_doctor
+                      ? prescription.prescription_doctor
+                      : ''
+                  ) == ''
+                "
+              >
+                {{
+                  getAdminUser(
+                    prescription == null
+                      ? 0
+                      : prescription.prescription_doctor
+                      ? prescription.prescription_doctor
+                      : ""
+                  )
+                }}
               </span>
-       
-            </td>
-          </tr>
-      </table >
+              <img
+                style="height: 30px"
+                :src="
+                  setAdminUserES(
+                    prescription == null
+                      ? 0
+                      : prescription.prescription_doctor
+                      ? prescription.prescription_doctor
+                      : ''
+                  )
+                "
+                alt=""
+                srcset=""
+                v-else
+              />
+            </span>
+            护士签名
+            <span style="display: inline-block; width: 100px; text-align: left">
+              &nbsp;
+              <span
+                v-if="
+                  setAdminUserES(
+                    dialysisOrder == null ? 0 : dialysisOrder.start_nurse
+                  ) == ''
+                "
+                >{{
+                  getAdminUser(
+                    dialysisOrder == null ? 0 : dialysisOrder.start_nurse
+                  )
+                }}</span
+              >
+              <img
+                class="es-img"
+                style="height: 30px"
+                :src="
+                  setAdminUserES(
+                    dialysisOrder == null ? 0 : dialysisOrder.start_nurse
+                  )
+                "
+                alt=""
+                srcset=""
+                v-else
+              />
+            </span>
+          </td>
+        </tr>
+      </table>
 
       <table class="table-box" style="margin-top: 10px">
         <tbody>
@@ -567,7 +750,7 @@
         </tbody>
       </table>
     </div>
-    <div style="position: absolute; top: 1380px; left: 50%">1</div>
+    <div style="position: absolute; top: 1380px; left: 50%"></div>
   </div>
 </template>
 
@@ -669,13 +852,14 @@ export default {
       advices: [],
       users: [],
       monitors: [],
-      sick_condition:"",
+      sick_condition: "",
       summary: {},
       receiverTreatmentAccess: {},
       org_template_info: {},
 
       doctor_advices: [],
       advice_groups: [],
+      org_id: 0,
 
       AlPanel: {
         id: 0,
@@ -822,7 +1006,10 @@ export default {
               this.predialysis.blood_access_part_opera_id
             );
 
-            console.log(this.predialysis.blood_access_part_opera_name,'this.predialysis.blood_access_part_opera_name')
+          console.log(
+            this.predialysis.blood_access_part_opera_name,
+            "this.predialysis.blood_access_part_opera_name"
+          );
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;
           this.operators = response.data.data.operators;
           this.dialysisOrder =
@@ -889,13 +1076,13 @@ export default {
           this.receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess;
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
-          this.sick_condition_arr.forEach(o => {
+          this.sick_condition_arr.forEach((o) => {
             // console.log(o,'hh')
-            if(this.receiverTreatmentAccess.sick_condition == o.id){
-              this.sick_condition = o.name
+            if (this.receiverTreatmentAccess.sick_condition == o.id) {
+              this.sick_condition = o.name;
             }
-          })
-          console.log(this.sick_condition,'hh')
+          });
+          console.log(this.sick_condition, "hh");
 
           console.log("上次透后体重", this.assessmentafter);
 
@@ -982,9 +1169,9 @@ export default {
             advices.push(item);
           }
 
-           var tableAdvice =  this.advices;
+          var tableAdvice = this.advices;
           console.log("医生", tableAdvice);
-           if (tableAdvice.length === 0) {
+          if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1012,7 +1199,7 @@ export default {
             tableAdvice.push(obj4);
             this.advices = tableAdvice;
           }
-           if (tableAdvice.length === 2) {
+          if (tableAdvice.length === 2) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1062,9 +1249,8 @@ export default {
             tableAdvice.push(obj1);
             this.advices = tableAdvice;
           }
-     
 
-          console.log(this.advices,'this.advices')
+          console.log(this.advices, "this.advices");
 
           this.loading = false;
 
@@ -1166,9 +1352,8 @@ export default {
       });
     },
     bloodAccessParOperaName(id) {
-      console.log(this.bloodAccessParOpera)
+      console.log(this.bloodAccessParOpera);
       if (id in this.bloodAccessParOpera) {
-        
         return this.bloodAccessParOpera[id].name;
       }
       return "";
@@ -1228,6 +1413,7 @@ export default {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org_id;
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -1236,7 +1422,7 @@ export default {
     this.precaution_arr = getDataConfig("hemodialysis", "precaution");
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
-        var bloodAccessParOpera = getDataConfig(
+    var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
     );
@@ -1290,7 +1476,7 @@ export default {
 
 <style>
 .dialysis-print-order {
-  width: 890px;
+  width: 960px;
   margin: 0 auto;
 }
 
@@ -1488,4 +1674,7 @@ export default {
   padding: 0;
   border: 1px solid #dcdfe6;
 }
+.list_table_1 {
+  text-align: left;
+}
 </style>

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164"
+        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164 && org_id == 10188"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -1246,6 +1246,17 @@ export default {
     },
   },
   created() {
+    let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.start_time == "") {
+            this.chargeDate[0] = "";
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (list_1.end_time == "") {
+            this.chargeDate[1] = "";
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+    }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];

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

@@ -159,26 +159,17 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-           <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
-             <!-- <span v-if="scope.row.price >0">
-                <span v-if="scope.row.count_unit == scope.row.min_unit">
-                  {{(scope.row.price * scope.row.count).toFixed(2)}}
-                </span>  
-                <span v-if="scope.row.count_unit == scope.row.max_unit">{{(scope.row.price * scope.row.count * scope.row.min_number).toFixed(2)}}</span>
-              </span>
-             <span v-if="scope.row.price  == 0">
-               <span v-if="scope.row.count_unit  == scope.row.min_unit">
-                 {{((getPrice(scope.row.drug_id)* scope.row.count)).toFixed(2)}}
-               </span> 
-               <span v-if="scope.row.count_unit == scope.row.max_unit">
-                 {{(getPrice(scope.row.drug_id)* scope.row.count * scope.row.min_number).toFixed(2)}}
-              </span>
-             </span> -->
-             {{scope.row.total_price}}
-           </span>
+            <span v-if="scope.row.is_total !=1">
+              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
+                 {{scope.row.total_price}}
+               </span>
+            </span>
+            <span v-if="scope.row.is_total == 1">
+              {{scope.row.total_price}}
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -437,10 +428,11 @@ export default {
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
+               console.log("555555555555",order[i])
                if(order[i].price > 0){
+                console.log("近来33232323322323")
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
-                  total_price += order[i].total_price
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
@@ -449,12 +441,15 @@ export default {
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
+
+                total_price += order[i].total_price
                 
                }
+
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                   total_price +=order[i].total_price
+                  
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
                 
@@ -466,13 +461,13 @@ export default {
                    }
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
-                 
+                total_price +=order[i].total_price
                } 
                
              }
             
           }
-         
+           console.log("toal_p3232332332233232",total_price)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -487,6 +482,7 @@ export default {
        
           console.log("233223322323322332232323",order)
           this.tableData = order
+
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
@@ -579,7 +575,7 @@ export default {
           this.tablePrint[i].index = i+1
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           if(this.org_id == 9919 ){
+           if(this.org_id == 9919){
            
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,6 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
+        <div v-if="org_id!=9671 && org_id!=10210">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -58,8 +59,77 @@
              </tr>
             </tbody>
           </table>
+          <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+          <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
+            <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+          </div>
+        </div>
+      </div> 
+
 
+      <div v-if="org_id == 9671 || org_id == 10210">
+       <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
+              <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height:50px" width="80">出库价格</td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">批号</td>
+              <td style="line-height: 50px" width="80">生产日期</td>
+              <td style="line-height: 50px" width="80">有效日期</td>
+            </tr>
+
+            <tr v-for="(item,i) in it.xt_drug_warehouse_out_info" :key="i">
+              <td style="line-height: 50px">
+                <span>{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span>{{item.drug.dose}}{{item.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.count_unit}}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+             <td>{{item.batch_number}}</td>
+             <td>{{(getTime(item.product_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="7"></td>
+               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
+             </tr>
+            </tbody>
+          </table>
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
@@ -77,6 +147,7 @@
           </div>
         </div>
 
+       </div>
       </div>
 
     </div>
@@ -133,7 +204,8 @@
         manufactureList:[],
         tableList:[],
         loading:false,
-        warehouseList:[]
+        warehouseList:[],
+        tableData:[],
       }
     },
     methods: {
@@ -175,25 +247,25 @@
             const params = {
             'id': order_id
             };
-            getDrugWarehouseOutInfo(params).then(response => {
-            if (response.data.state == 0) {
+     getDrugWarehouseOutInfo(params).then(response => {
+        if (response.data.state == 0) {
 
-                this.$message.error(response.data.msg);
-                return false
-            } else {
-              for (let i = 0; i < response.data.data.list.length; i++) {
-                this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-               }
-               var total_price = 0;
-               for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
-                 total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
-               }
-               this.allPrice = total_price;
-               this.warehousingOutInfo.info = response.data.data.info;
-               this.handleSpanTempArr()
+            this.$message.error(response.data.msg);
+            return false
+        } else {
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
-            })
-        },
+            var total_price = 0;
+            for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+              total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
+            }
+            this.allPrice = total_price;
+            this.warehousingOutInfo.info = response.data.data.info;
+            this.handleSpanTempArr()
+        }
+      })
+     },
         getList() {
         let params = {
           page: this.page,
@@ -213,7 +285,7 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-            console.log("list222222",this.list)
+           
           }
         })
       },
@@ -265,7 +337,6 @@
         getDrugWarehouseOrderInfo().then(response=>{
            if(response.data.state == 1){
              var list =  response.data.data.list
-             console.log("入库单详情",list)
              this.drugOrderList = list
            }
         })
@@ -315,9 +386,7 @@
         getDrugOutOrderDetailPrint(params).then(response=>{
           if(response.data.state ==1){
              var info = response.data.data.info
-             console.log("info",info)
             var warehousing = response.data.data.warehousing
-            console.log("ware2232",warehousing)
             this.warehouseList = warehousing
           
             for(let i=0;i<info.length;i++){
@@ -330,10 +399,11 @@
             }
             
             var manufacturerList = response.data.data.manufacturerList
-            console.log("manufacturelist",manufacturerList)
+           
             this.manufactureList = manufacturerList
-            console.log("列表",info)
+
             this.tableList = info
+            this.tableData = response.data.data.drug_warhouse_out
             this.loading = false
           }
         })
@@ -346,7 +416,14 @@
           }
         }
         return count
-      }
+      },
+      getTotalPrice(val){
+        var count = 0
+        for(let i=0;i<val.length;i++){
+           count +=val[i].count * val[i].price
+          }
+         return count.toFixed(2)
+        }
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;