Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/device/number_main.vue

@@ -217,6 +217,7 @@ export default {
       this.showEditDeviceNumber = true;
     },
     modifyDeviceNumberAt(row) {
+      console.log("row23233232",row)
       this.number_form.id = row.id;
       this.number_form.number = row.number;
       this.number_form.zone = row.zone_id;

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -63,6 +63,7 @@
                          {{ record.patient.diagnose ? record.patient.diagnose : '' }}
                         </div>
                     </td>
+
                     <td width="80">透析频率:</td>
                         <td width="70">
                             <div class="under-line">&nbsp;{{ record.assessment_before_dislysis.dialysis_count ? record.assessment_before_dislysis.dialysis_count : "" }}</div>
@@ -85,9 +86,21 @@
                         <td></td>
                         <td></td>
                     </tr>
+                 
                     </tbody>
                 </table>
-                
+                 <table class="table-box" style="margin-top: 10px;">
+                    <tbody>
+                       <tr>
+                        <td width="40">透析备注:</td>
+                        <td width="500">
+                            <div class="under-line">
+                            {{ record.prescription.dialysis_remark ? record.prescription.dialysis_remark : '' }}
+                            </div>
+                        </td>
+                        </tr>
+                   </tbody>
+                </table>
                 <table class="print-table" border="1">
                     <tbody>
                     <tr>

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

@@ -943,7 +943,7 @@
                 </el-row>
                
                 <el-row :gutter="20">
-                  <el-col :span="24" v-if="isShows('透析备注')">
+                  <el-col :span="24" v-if="isShows('透析备注') && (dialysisPrescription.mode_id == 2 || dialysisPrescription.mode_id == 3 || dialysisPrescription.mode_id == 4)">
                     <el-form-item label="透析备注：">
                       <el-select @change="dialysisAfterTeachSelectChange" v-model="value">
                         <el-option
@@ -957,7 +957,7 @@
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
-                  <el-col v-if="isShows('透析备注')">
+                  <el-col v-if="isShows('透析备注') && (dialysisPrescription.mode_id == 2 || dialysisPrescription.mode_id == 3 || dialysisPrescription.mode_id == 4)">
                     <el-form-item>
                       <el-input
                         type="textarea"
@@ -1731,9 +1731,10 @@
         // console.log('arrthree', arrthree)
         const arrFour = []
         Object.keys(anticoagulantsConfitOne).map((item, index) => {
-          if (index != 2) {
-            arrFour.push(anticoagulantsConfitOne[item])
-          }
+          arrFour.push(anticoagulantsConfitOne[item])
+          // if (index != 2) {
+          //   arrFour.push(anticoagulantsConfitOne[item])
+          // }
         })
 
         this.anticoagulantsConfit = arrFour

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -0,0 +1,384 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+        <el-col :span="24">
+          <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="app-container" style="background-color: white;">
+
+      <div id="print_content">
+        <div class="print_main_content">
+          <div class="order_title_panl">
+            <span class="main_title"> &nbsp;
+              透析药品
+            </span>
+            <span  style="float:right;">打印日期: &nbsp;
+               {{$route.query.schedule_date}}
+            </span>
+          </div>
+          <div class="table_panel">
+
+            <table class="table">
+              <thead>
+              <tr>
+                <td width="50">序号</td>
+                <td width="100">药品名称</td>
+                <td width="100">规格</td>
+                <td width="100">数量</td>
+                
+              </tr>
+              </thead>
+              <tbody>
+               <tr v-for="(item,i) in tableList" :key="i">
+                <td>{{i+1}}</td>
+                <td>{{item.advice_name}}</td>
+                 <td>{{item.specification_name}}</td>
+                <td>
+                  <span v-if="config.is_open == 1">{{getHisCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
+                  <span v-if="config.is_open != 1">{{getCount(item.child)}}</span>
+                </td>
+               </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getDialysisAdviceToday } from '@/api/dialysis'
+  import { parseTime } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getDataConfig } from '@/utils/data'
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班管理' },
+          { path: false, name: '排班打印' }
+        ],
+        td_1_width: '8%',
+        td_2_width: '8%',
+        td_3_width: '64%',
+        td_4_width: '20%',
+        month: 1,
+        begin_day: 1,
+        total:[],
+        list:[],
+        schedule_date:"",
+        schedule_type:0,
+        partition_type:0,
+        keywords:"",
+        loading:false,
+        tableData:[],
+        numberList:[],
+        partitionArr:[],
+        his_config:{},
+        typeList:[],
+        rowList:[],
+        dialysate_formulation:[],
+        body_fluid_option:[],
+        displace_liqui_part_option:[],
+        blood_access_option:[],
+        hemodialysisPipelinesOptions:[],
+        tableList:[],
+        druglist:[],
+        config:{}
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+      this.getDialysisAdviceSchedudeList()
+    },
+    methods: {
+      getDialysisAdviceSchedudeList() {
+          var params = {
+            schedule_type:this.$route.query.schedule_type,
+            partion_type:this.$route.query.partion_type,
+            selected_date:this.$route.query.schedule_date,
+          }
+        console.log("params2332232wo",params)
+       getDialysisAdviceToday(params).then(response=>{
+          if(response.data.state == 1){
+             var doctorList = []
+             var druglist = response.data.data.drug
+             this.druglist = druglist
+             this.startdialogVisible = true
+             var list = response.data.data.list
+          
+             var config = response.data.data.config
+            
+             this.config = config
+             if(list!=null && list.length > 0){
+               for(let i=0;i<list.length;i++){
+                for(let j=0;j<list[i].xt_doctor_advice.length;j++){
+                  doctorList.push(list[i].xt_doctor_advice[j])
+                }
+               }
+             }
+
+             if(config.is_open!=1){
+               if(doctorList!=null && doctorList.length > 0){
+                let dataInfo = {}
+                  doctorList.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfo[advice_name]) {
+                    dataInfo[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      drug_id:item.drug_id,
+                      specification_name:item.advice_desc +item.drug_spec_unit,
+                      patient_id:item.patient_id,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                // console.log("arr23332323232",arr)
+
+
+                if(arr.length > 0){
+                  for(let i=0;i<doctorList.length;i++){
+                    for(let j=0;j<arr.length;j++){
+                      if(doctorList[i].advice_name == arr[j].advice_name){
+                          arr[j].child.push(doctorList[i])
+                      }
+                    }
+                  }
+                }
+               
+                this.tableList = []
+                for(let i=0;i<list.length;i++){
+                  for(let j=0;j<arr.length;j++){
+                    if(list[i].patient_id == arr[j].patient_id){
+                      this.tableList.push(arr[j])
+                    }
+                  }
+                }
+               
+              }
+             }
+                       
+           var his_doctor_advice = []
+
+           for(let i=0;i<list.length;i++){
+             for(let j=0;j<list[i].his_doctor_advice.length;j++){
+                his_doctor_advice.push(list[i].his_doctor_advice[j])
+             }
+           }
+           console.log("his_doctor_advice",his_doctor_advice)
+          
+            var newHisArr = []
+            for(let i=0;i<his_doctor_advice.length;i++){    
+               his_doctor_advice[i].count_one = 0
+               if(his_doctor_advice[i].prescribing_number_unit == his_doctor_advice[i].drug.max_unit){
+                  his_doctor_advice[i].prescribing_number = parseInt(his_doctor_advice[i].prescribing_number) * his_doctor_advice[i].drug.min_number
+                  his_doctor_advice[i].count_one =  parseInt(his_doctor_advice[i].prescribing_number) * his_doctor_advice[i].drug.min_number
+               }
+            }
+
+            for(let i=0;i<his_doctor_advice.length;i++){
+              for(let j=0;j<druglist.length;j++){
+                if(his_doctor_advice[i].drug_id == druglist[j].id){
+                   newHisArr.push(his_doctor_advice[i])
+                }
+              }
+            }
+            console.log("下盘子3223323223",newHisArr)
+            
+             if(config.is_open == 1){
+               if(newHisArr!=null && newHisArr.length > 0){
+                  let dataInfoOne = {}
+                  newHisArr.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfoOne[advice_name]) {
+                    dataInfoOne[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      specification_name:this.getSpecification(item.drug_id),
+                      drug_id:item.drug_id,
+                      patient_id:item.patient_id,
+                      min_number:item.drug.min_number,
+                      max_unit:item.drug.max_unit,
+                      min_unit:item.drug.min_unit
+                    }
+                  }
+                })
+                let hisarr = Object.values(dataInfoOne)
+                console.log("hisarr233232233232",hisarr)
+                if(hisarr.length > 0){
+                  for(let i=0;i<newHisArr.length;i++){
+                    for(let j=0;j<hisarr.length;j++){
+                      if(newHisArr[i].drug_id == hisarr[j].drug_id){
+                          hisarr[j].child.push(newHisArr[i])
+                      }
+                    }
+                  }
+                }
+                console.log("hisarr",hisarr)
+                this.tableList = []
+                this.tableList = hisarr
+              }
+
+              console.log("中国人民解放军",this.tableList)
+             }
+          }
+        })
+      },
+     getTimeOne(val) {
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+     getCount(val){
+       var count = 0
+       if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          count += parseInt(val[i].prescribing_number)
+        }
+       }
+       if(count > 0){
+        return count
+       }else{
+        return 0
+       }
+     },
+    printAction: function() {
+    const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+    printJS({
+        printable: 'print_content',
+        type: 'html',
+        documentTitle: '  ',
+        style: style,
+        scanStyles: false
+     })
+    },
+    getSpecification(id){
+        var specification_name = ""
+        for(let i=0;i<this.druglist.length;i++){
+          if(id == this.druglist[i].id){
+            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+          }
+        }
+        return specification_name
+      },
+     getHisCount(val,max_unit,min_unit,min_number){
+        var total = 0
+        var max_str = "";
+        var min_str = "";
+        for(let i=0;i<val.length;i++){
+          total+=parseInt(val[i].prescribing_number)
+        }
+        if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+        
+      },
+   }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .print_main_content {
+    background-color: white;
+    width: 960px;
+    margin: 0 auto;
+    padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+  .main_title {
+    font-size: 18px;
+    line-height: 40px;
+    font-weight: 500;
+  }
+
+  }
+  .table_panel {
+
+  .table {
+    width: 100%;
+    border: 1px solid;
+    border-collapse: collapse;
+    padding: 2px;
+
+  thead {
+
+  tr {
+
+  td {
+    border: 1px solid;
+    text-align: center;
+    font-size: 20px;
+    padding: 15px 5px;
+  }
+
+  }
+  }
+  tbody {
+
+  tr {
+
+  td {
+    border: 1px solid;
+    text-align: center;
+    font-size: 18px;
+    padding: 10px 5px;
+
+  .proj {
+    padding: 5px 0;
+    text-align: left;
+
+  .proj_title {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 25px;
+  }
+
+  .proj_item {
+    font-size: 15px;
+    line-height: 20px;
+
+  .zone_name {
+    font-weight: 500;
+  }
+
+  }
+  }
+  }
+  }
+  }
+  }
+  }
+  }
+</style>
+

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1219,25 +1219,13 @@
                               : "mmHg"
                           }})
                         </td>
-                        <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                        
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
-
-                        <td
-                          width="50"
-                          v-if="
-                            org_id != 10121
-                          "
-                        >
-                          电导度<br />(ms/cm)
-                        </td>
-                        <td
-                          width="50"
-                          v-if="
-                            org_id == 10121
-                          "
-                        >
-                          SpO₂<br />(%)
-                        </td>
+                        <td width="60" v-if="org_id == 9919">血温(°C)</td>
+                        <td width="60" v-if="org_id == 9671">血温(°C)</td>
+                        <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
+                        <td width="50" v-if="org_id != 10121">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td
                           v-if="
@@ -1249,21 +1237,11 @@
                         >
                           置换量<br />(ml)
                         </td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538">KT/V</td>
-                        <td width="50" v-if="org_id == 9538">血容量<br />(L)</td>
+                        <td width="50" v-if="org_id == 9538">KT/V</td>
+                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
+                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
+                        <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="200">病情变化及处理</td>
-
-                        <!-- <td width="100">时间</td>
-                    <td width="30">T<br>C°</td>
-                    <td width="30">P<br/>次/分</td>
-                    <td width="30">R<br/>次/分</td>
-                    <td width="100">BP<br/>mmHg</td>
-                    <td width="60">静脉压/动脉压<br/>mmHg</td>
-                    <td width="80">血流量<br/>ml/min</td>
-                    <td width="90">超滤量累计L</td>
-                    <td width="80">钠浓度<br/>mmol/L</td>
-                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-                    <td  width="100">护士签名</td> -->
                       </tr>
 
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex">
@@ -1311,54 +1289,39 @@
                             }}
                           </span>
                         </td>
-                        <td v-if="org_id != 9836">
-                          {{
-                            monitor.dialysate_temperature
-                              ? monitor.dialysate_temperature
-                              : ""
-                          }}
+                        <td v-if="org_id == 9919">
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
+                        </td>
+                        <td v-if="org_id == 9671">
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
                         </td>
+
                         <td v-if="org_id == 9836">
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-                        <td
-                          v-if="
-                            org_id == 10121
-                          "
-                        >
-                          {{
-                            monitor.blood_oxygen_saturation
-                              ? monitor.blood_oxygen_saturation
-                              : ""
-                          }}
+                         <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836">
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
                         </td>
 
 
-                        <td
-                          v-if="
-                            org_id != 9538 &&
-                            org_id != 10121
-                          "
-                        >
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                        <td v-if="org_id == 10121">
+                          {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
                         </td>
 
-                        <td v-if="org_id == 9538">
-                          {{
-                            monitor.sodium_concentration
-                              ? monitor.sodium_concentration
-                              : ""
-                          }}
+                       <td v-if="org_id == 9538">
+                          {{monitor.sodium_concentration? monitor.sodium_concentration: ""}}
                         </td>
 
-                        <td
-                        >
-                          {{
-                            monitor.ultrafiltration_volume
-                              ? monitor.ultrafiltration_volume
-                              : ""
-                          }}
+
+                        <td v-if="org_id != 9538 &&org_id != 10121">
+                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                        </td>
+
+                      
+
+                        <td>
+                          {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
@@ -1384,10 +1347,10 @@
                             }}
                           </span>
                         </td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
                           {{ monitor.ktv }}
                         </td>
-                        <td width="50" v-if="org_id == 9538">
+                        <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
                           {{ monitor.accumulated_blood_volume }}
                         </td>
                         <td style="line-height: 16px; padding: 0px">
@@ -1441,6 +1404,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
                           v-if="
                             prescription.mode_id == 2 ||
@@ -1449,7 +1413,7 @@
                           "
                           width="50"
                         ></td>
-                        <td v-if="org_id == 9919||org_id == 9538"></td>
+                        <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -35,9 +35,8 @@
             <td style="text-align: center" colspan="2">
               透析次数:
               <span style="display: inline-block; margin-left: 10px">
-                {{
-                  patientInfo.total_dialysis + patientInfo.user_sys_before_count
-                }}
+               <span v-if="dialysisOrder && dialysisOrder.dialysis_date<=1672416000">{{patientInfo.total_dialysis + patientInfo.user_sys_before_count}}</span>  
+               <span v-if="dialysisOrder && dialysisOrder.dialysis_date>=1672502400">{{patientInfo.total_dialysis}}</span>  
               </span>
             </td>
             <!-- <td style="text-align:center;" colspan="1">
@@ -1142,10 +1141,8 @@
             <td style="text-align: center" colspan="2">
               透析次数:
               <span style="display: inline-block; margin-left: 10px">
-                {{
-                  patientInfo.total_dialysis + patientInfo.user_sys_before_count
-                }}
-              </span>
+                <span v-if=""></span> {{patientInfo.total_dialysis + patientInfo.user_sys_before_count}}
+              </span> 
             </td>
             <!-- <td style="text-align:center;">
               <template v-if="receiverTreatmentAccess.condition == 1">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -72,8 +72,20 @@
               <td></td>
               <td></td>
           </tr>
+         
           </tbody>
         </table>
+        <table class="table-box" style="margin-top: 10px;">
+         <tr>
+             <td width="40">透析备注:</td>
+             <td width="500">
+               <div class="under-line">
+                {{prescription.dialysis_remark?prescription.dialysis_remark:"" }}
+              </div>
+             </td>
+           
+          </tr>
+        </table>  
         <!-- <table class="table-box" style="margin-top: 10px;">
           <tbody>
             <tr>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2554,6 +2554,64 @@ export default {
                       console.log("newArr",newArr )
                     }
                   }
+
+
+              // var project_arr = []
+              // //耗材
+              // for(let i=0;i<this.prescriptions.length;i++){
+              //   if(this.prescriptions[i].id == 0){
+              //     for(let j=0;j<this.prescriptions[i].project.length;j++){
+              //        if(this.prescriptions[i].project[j].type == 3){
+              //          project_arr.push(this.prescriptions[i].project[j])
+              //        }
+                    
+              //     }
+              //   }
+              // }
+
+              // if(project_arr.length > 0){
+              //     let objInfo = {};
+              //     project_arr.forEach((item, index) => {
+              //     let { project_id } = item.project_id;
+              //     if (!objInfo[project_id]) {
+              //         objInfo[project_id] = {
+              //           project_id:item.project_id,
+              //           child: [],
+              //           sum_count:item.good_info.sum_count,
+              //           out_count:0,
+              //           str:item.good_info.good_name +" "+ item.good_info.specification_name,
+              //           is_user:item.good_info.is_user,
+              //         };
+              //       }
+              //     });
+              //     let newProjectArr = Object.values(objInfo);
+
+
+              //     for(let i=0;i<project_arr.length;i++){
+              //       for(let j=0;j<newProjectArr.length;j++){
+              //         if(project_arr[i].project_id == newProjectArr[j].project_id){
+              //           newProjectArr[j].child.push(project_arr[i])
+              //         }
+              //       }
+              //     }
+                 
+                  
+              //     for(let i=0;i<newProjectArr.length;i++){
+              //       for(let j=0;j<newProjectArr[i].child.length;j++){
+              //          newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
+              //       }
+              //     }
+              //     console.log("河滨232332newArr",newProjectArr)
+              //     for(let i=0;i<newProjectArr.length;i++){
+              //        if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
+              //             this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
+              //             isLoading = false
+              //             this.$emit('editKeepLoad', false)
+              //             return 
+              //        } 
+              //     }
+
+              //    }  
                 }
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2423,7 +2423,10 @@
               if (num == 0) {
                 var arr = []//新增处方
                 var arr_one = []
+               
                 console.log("ooo233323233232323232",this.prescriptions)
+                
+               //药品
                 for(let i=0;i<this.prescriptions.length;i++){
                   if(this.prescriptions[i].id == 0){
                     for(let j=0;j<this.prescriptions[i].advices.length;j++){
@@ -2554,11 +2557,67 @@
 
                         }
                       }
-                      console.log("newArr",newArr )
+                     
                     }
                   }
                 }
 
+              // var project_arr = []
+              // //耗材
+              // for(let i=0;i<this.prescriptions.length;i++){
+              //   if(this.prescriptions[i].id == 0){
+              //     for(let j=0;j<this.prescriptions[i].project.length;j++){
+              //        if(this.prescriptions[i].project[j].type ==3){
+              //          project_arr.push(this.prescriptions[i].project[j])
+              //        }
+                     
+              //     }
+              //   }
+              // }
+
+              // if(project_arr.length > 0){
+              //     let objInfo = {};
+              //     project_arr.forEach((item, index) => {
+              //     let { project_id } = item.project_id;
+              //     if (!objInfo[project_id]) {
+              //         objInfo[project_id] = {
+              //           project_id:item.project_id,
+              //           child: [],
+              //           sum_count:item.good_info.sum_count,
+              //           out_count:0,
+              //           str:item.good_info.good_name +" "+ item.good_info.specification_name,
+              //           is_user:item.good_info.is_user,
+              //         };
+              //       }
+              //     });
+              //     let newProjectArr = Object.values(objInfo);
+
+
+              //     for(let i=0;i<project_arr.length;i++){
+              //       for(let j=0;j<newProjectArr.length;j++){
+              //         if(project_arr[i].project_id == newProjectArr[j].project_id){
+              //           newProjectArr[j].child.push(project_arr[i])
+              //         }
+              //       }
+              //     }
+                 
+                  
+              //     for(let i=0;i<newProjectArr.length;i++){
+              //       for(let j=0;j<newProjectArr[i].child.length;j++){
+              //          newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
+              //       }
+              //     }
+              //     console.log("河滨232332newArr",newProjectArr)
+              //     for(let i=0;i<newProjectArr.length;i++){
+              //        if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
+              //             this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
+              //             isLoading = false
+              //             this.$emit('editKeepLoad', false)
+              //             return 
+              //        } 
+              //     }
+                  
+              //   }
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)

src/xt_pages/stock/detail/print.vue

@@ -53,8 +53,8 @@
                 <span v-if="type == 2">
                   <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
-                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
+                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -79,8 +79,8 @@
                      {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
                   <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=9675 && org_id!=9679 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -810,7 +810,7 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675 || this.orgId == 9679 || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -282,10 +282,20 @@
               {{ scope.row.medical_insurance_number }}
             </template>
           </el-table-column>
-          <el-table-column label="仓库名称" align="center">
+          <!-- <el-table-column label="仓库名称" align="center">
             <template slot-scope="scope">
               {{ getHouseName(scope.row.storehouse_id) }}
             </template>
+          </el-table-column> -->
+          <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end:none;text-align: center">
+                    {{ getHouseName(item.storehouse_id) }}
+                  </td>
+               </tr>
+            </template>
           </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
@@ -293,7 +303,7 @@
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end:none;text-align: center">
                     <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
-                    <span v-if="is_sys == 12">{{getOutCountSeven(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
+                    <span v-if="is_sys == 12">{{getOutCountTen(item.count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                   </td>
                </tr>
@@ -667,7 +677,7 @@ export default {
       ],
       tabList:[],
       tabListOne:[],
-      outList:[],
+      drugOutInfo:[],
       warehouseOutList:[],
       exportLoding:false,
       outInfoList:[],
@@ -1206,6 +1216,7 @@ export default {
           this.tableShow = true;
           this.tableList = [];
           var list = response.data.data.list;
+          console.log("listwowowowoow",list)
           this.warehouseOutList = list
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
@@ -1214,10 +1225,12 @@ export default {
         
           this.tabList = drugList
           var drugListOne = response.data.data.drugListFlow
+          //按批号分组
           var drugListTwo=  response.data.data.drugListOne
-
+          console.log("drugListTwo9922wo",drugListTwo)
           var drugoutlist = response.data.data.drugoutlist
           this.outList = drugoutlist
+          this.drugOutInfo = drugoutlist
           if (is_sys == 1) {
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
@@ -1284,8 +1297,6 @@ export default {
           }
 
      
-         
-        console.log("is_sys2332232323wo",is_sys)
         if(is_sys == 1 || is_sys == 5){
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1302,14 +1313,14 @@ export default {
           }
           this.tableList = list;
         }
-
         if(is_sys == 12){
+          
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
                list[i].childOne[j].over_count_total = this.getOutCountSeven(list[i].childOne[j].warehousing_detail_id,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
             }
           }
-
+       
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
                if(list[i].childOne[j].over_count_total !=""){
@@ -1317,6 +1328,18 @@ export default {
                } 
             }
           }
+         
+          // for(let i=0;i<list.length;i++){
+          //  for(let j=0;j<list[i].child.length;j++){
+          //   list[i].child[j].outInfo = []
+          //    for(let z=0;z<this.drugOutInfo.length;z++){
+          //      if(list[i].child[j].warehousing_detail_id == this.drugOutInfo[z].warehouse_info_id&&list[i].child[j].drug_id == this.drugOutInfo[z].drug_id){
+          //        list[i].child[j].outInfo.push(this.drugOutInfo[z])
+          //      }
+          //    }
+          //  }
+          // }
+          // console.log("list23322332233wo",list)
           this.tableList = list;
         }
 
@@ -1690,7 +1713,7 @@ export default {
     },
     // 合并单元格样式
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      let arr = [5,6, 7, 8, 9,10,11,12,13,14];
+      let arr = [4,5,6, 7, 8, 9,10,11,12,13,14];
       if (arr.indexOf(columnIndex) > -1) {
         return "spanClass";
       }
@@ -1747,7 +1770,6 @@ export default {
            total +=arr[i].count
         }
       }
-     
       if (total < min_number) {
         min_str = total + min_unit;
       }
@@ -2173,7 +2195,31 @@ export default {
        }
       }
       return price
-    }
+    },
+
+    getOutCountTen(total,max_unit,min_unit,min_number){
+    
+      var max_str = ""
+      var min_str = ""
+  
+     console.log("total",total)
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
   },
 };
 </script>