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

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_analysis.vue

@@ -179,7 +179,11 @@ import { forEach } from 'jszip';
             const option = {
               xAxis: {
                 type: 'category',
-                data: this.bar_xAxis
+                data: this.bar_xAxis,
+                axisLabel:{
+                  interval:0,
+                  rotate: 35
+                }
               },
               yAxis: {
                 type: 'value'

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/anticoagulant.vue

@@ -255,7 +255,10 @@ import html2canvas from "html2canvas"
             const option = {
               xAxis: {
                 type: 'category',
-                data: xAxis
+                data: xAxis,
+                axisLabel:{
+                  interval:0,
+                }
               },
               yAxis: {
                 type: 'value'

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/dialyzer.vue

@@ -292,6 +292,9 @@ import html2canvas from "html2canvas"
               xAxis: {
                 type: 'category',
                 data: xAxis,
+                axisLabel:{
+                  interval:0,
+                }
               },
               yAxis: {
                 type: 'value'

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -40,13 +40,13 @@
        </el-autocomplete>
        <el-button type="primary" @click="toSeach">搜索</el-button>
 
-       
+
       </div>
       <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
-       
+
       </div>
       <div class="cell clearfix">
         <label class="title">
@@ -189,7 +189,7 @@
 
         <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
 
-        
+
       </div>
 
 
@@ -308,7 +308,7 @@
             <span v-else>
 
             </span>
-           
+
           </template>
         </el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
@@ -1002,7 +1002,7 @@ export default {
           for(let i=0;i<this.partitionArr.length;i++){
            this.zoneIdList.push(this.partitionArr[i].id)
           }
-         
+
           // this.partitionArr.unshift({ id: 0, name: "全部" });
           var dics  =  response.data.data.dics
           var obj = {id:0,name:"全部"}
@@ -1027,7 +1027,7 @@ export default {
         if(name == '全部'){
           name = ""
         }
-       
+
         var nameOne = ""
          for(let i=0;i<this.excutList.length;i++){
             if(this.execution_frequency == this.excutList[i].id){
@@ -1043,7 +1043,7 @@ export default {
 
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
-       
+
         getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
@@ -1113,7 +1113,7 @@ export default {
            if(this.is_sort == 0){
               newList = schedules
            }
-          
+
            if(this.is_sort == 0 ||  this.is_sort == 1){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
@@ -1561,23 +1561,23 @@ export default {
 
         if (row.prescribing_number) {
           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
-         
+
         }
 
         if (row.single_dose) {
           if (this.template_id != 6) {
             tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
-           
+
           } else {
             tempSingleDoseDesc = row.single_dose  + row.single_dose_unit
-            
+
           }
         }
 
         if (row.advice_desc) {
-           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
-         
-          
+           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+
+
         }
 
         if (isChild == 1) {
@@ -1592,11 +1592,11 @@ export default {
         } else {
           // 是子药
           return (row.advice_name +tempDrugSpecDesc +' ' + tempPrescribingNumberDesc + tempSingleDoseDesc)
-         
+
         }
     },
     handleSelectionChange(val){
-     
+
       this.selecting_schs = val;
       this.is_status = 1
     },
@@ -1622,7 +1622,7 @@ export default {
         return searchArray
       },
      handleSelect(val) {
-      
+
        this.patient_id = val.id
        this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)
@@ -1827,7 +1827,7 @@ export default {
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
@@ -1857,7 +1857,7 @@ export default {
 
              if(config.is_open!=1){
                if(doctorList!=null && doctorList.length > 0){
-                let dataInfo = {}
+                  let dataInfo = {}
                   doctorList.forEach((item, index) => {
                   let { advice_name } = item
                   if (!dataInfo[advice_name]) {
@@ -1959,7 +1959,7 @@ export default {
                 this.tableList = hisarr
               }
 
-             
+
              }
           }
         })
@@ -1974,7 +1974,7 @@ export default {
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
@@ -2095,7 +2095,7 @@ export default {
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
@@ -2113,7 +2113,7 @@ export default {
                  }
                }
              }
-             
+
              let dataInfo = {}
               newArr.forEach((item, index) => {
               let { project_id } = item
@@ -2128,14 +2128,14 @@ export default {
               }
             })
             let arr = Object.values(dataInfo)
-            
+
             if(arr!=null && arr.length >0){
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<newArr.length;j++){
                    if(arr[i].project_id == newArr[j].project_id){
                       arr[i].child.push(newArr[i])
                    }
-                } 
+                }
               }
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<arr[i].child.length;j++){
@@ -2559,14 +2559,14 @@ export default {
         const { columns, data } = param;
         const sums = [];
         columns.forEach((column, index) => {
-        
+
           if (index === 0) {
             sums[index] = '总数';
             return;
           }
           if(index > 2){
             const values = data.map(item => item[column.property]);
-           
+
 
           }
 
@@ -2646,7 +2646,7 @@ export default {
         }
       })
     },
-   
+
 
   },
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4775,7 +4775,8 @@ export default {
            }
         }
 
-        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id == 0 || this.org_id == 10644){
+        //HIS客户显示临时医嘱的地方
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -195,6 +195,7 @@
 
     </div>
 
+    <!-- 电子病历打印 -->
     <el-dialog
       title="打印"
       :visible.sync="centerDialogVisible"
@@ -336,6 +337,8 @@
                 :visible.sync="checkVisible">
             <checkPrint v-if="index == 20" :paramsObj='paramsObj'></checkPrint>
         </el-dialog> -->
+
+    <!-- 电子病历打印 -->
     <el-dialog
       class="centerDialog"
       width="600px"
@@ -855,8 +858,10 @@ export default {
           scanStyles: false
         })
       } else {
+        // const style =
+        //   '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         const style =
-          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         printJS({
           printable: 'printMain',
           type: 'html',

src/xt_pages/outpatientDoctorStation/print.vue

@@ -173,7 +173,7 @@ export default {
       }
        else {
         const style =
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:100px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -19,7 +19,7 @@
               <div>地址：{{item.patient.home_address}}</div>
               <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
           </div>
-          <div class="prescriptionBox">
+          <div class="prescriptionBox" style="height: 300px;">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
                 :style="{'page-break-after':index==4&&item.advices.length>5? 'always':'auto'}"
@@ -186,7 +186,6 @@
 
 
           </div>
-          <div style="page-break-after:always"></div>
       </div>
     </div>
 
@@ -472,7 +471,7 @@ export default {
 }
 .prescriptionBox{
     padding:0 10px;
-    min-height:450px;
+    // max-height:400px;
 }
 .Rp{
     font-size: 22px;

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -184,7 +184,10 @@
         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 13">调拨入库</span>
-            <span v-else>手动入库</span>
+            <span v-else>
+              <span v-if="org_id !=10633"> 手动入库</span>
+              <span v-if="org_id ==10633"> 验货入库</span>
+            </span>
           </template>
         </el-table-column>
 

src/xt_pages/stock/stockInOrder.vue

@@ -170,7 +170,10 @@
         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 12">调拨入库</span>
-            <span v-if="scope.row.is_sys == 0">手动入库</span>
+            <span v-if="scope.row.is_sys == 0">
+              <span v-if="org_id !=10633"> 手动入库</span>
+              <span v-if="org_id ==10633"> 验货入库</span>
+            </span>
           </template>
         </el-table-column>
 

src/xt_pages/user/coursePrint.vue

@@ -9,8 +9,8 @@
     <div class="app-container">
       <div id="print_content">
         <div class="print_page_main_content">
-          <div class="order-yy-name">{{orgname}}</div>
-          <div class="order_title" style="padding-top:12px;"> 病程记录</div>
+          <div class="order-yy-name" style="text-align: center;">{{orgname}}</div>
+          <div class="order_title" style="padding-top:12px;text-align: center;"> 病程记录</div>
           <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;">
 
             <div  style="flex:1;text-align: center;">