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

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

@@ -3,57 +3,55 @@
         <el-dialog
                 title="透析处方"
                 :visible.sync="isVisibility"
-                width="72%"
+                width="80%"
                 :modal = 'false'
                 :modal-append-to-body="false"
                 :close-on-click-modal="false"
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
-
-            <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
-              透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
-            </span>
-
-            <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702">
-              透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
-            </span>
-
+            <div style="position: absolute;left: 20%;top: 3%;width: 70%;">
+              <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
+                透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
+              </span>&nbsp;&nbsp;
+
+              <span style="" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702">
+                透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+              </span>&nbsp;&nbsp;
+              <!-- style="position: absolute;left: 20%;top: 3%"  position: absolute;left:38%;top: 3%-->
+              <span style="">
+                干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
+              </span>&nbsp;&nbsp;
+              <span style="">
+                上次透后体重：
+                <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
+                <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
+              </span>&nbsp;&nbsp;
+            </div>
+            <div style="position: absolute;left: 20%;top: 10%;width: 70%;">
+              <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id ==10721">
+                衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
+              </span>&nbsp;&nbsp;
+              <div v-if="org_id == 0 ||org_id ==10702 || org_id ==10598 || org_id ==10721" style="display: inline-block;">
+                体重增长：
+                <span v-if="predialysis!=null && last_record!=null">
+                  {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
+                </span>&nbsp;&nbsp;
+                <span style="">
+                  4小时超滤量上限（5%）：
+                  <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
+                  kg
+                </span>&nbsp;&nbsp;
+              </div>
+              <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id!=10702">
+                透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
+              </span>
+            </div>
 
 
-            <span style="position: absolute;left: 30%;top: 3%">
-              干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
-            </span>
             <!-- <span style="position: absolute;left: 48%;top: 3%"  :modal = 'false'>
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
-            <span style="position: absolute;left:38%;top: 3%">
-              上次透后体重：
-               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
-               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
-            </span>
-
-            <span style="position: absolute;left:51%;top: 3%">
-              4小时超滤量上限（5%）：
-              <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
-              kg
-            </span>
-            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702 &&this.$store.getters.xt_user.template_info.org_id!=10721">
-              透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
-            </span>
-
-            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702">
-             衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
-            </span>
-
-            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10721">
-              体重增长：
-              <span v-if="predialysis!=null && last_record!=null">
-                {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
-              </span>
-
-
-            </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -953,7 +951,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                       
+
                     </el-col>
 
                     <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
@@ -1932,6 +1930,7 @@
         tableData:[],
         afterList:[],
         monitorList:[],
+        org_id:'',
       }
 
     },
@@ -2637,7 +2636,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
-      
+
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
@@ -3106,7 +3105,7 @@ mu
         if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726){
           this.getPatientBefor()
         }
-      
+
 
         let last_weight_after = 0
         let weight_before = 0
@@ -3242,14 +3241,14 @@ mu
         }
 
         if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10721){
-         
+
           if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
-          
+
              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
-          
+
           }
         }
-      
+
       },
       hide() {
         this.isVisibility = false
@@ -3365,7 +3364,7 @@ mu
                 ParamsQuery['mode'] = '1'
                 ParamsQuery['patient_id'] = this.patient.id
                 console.log('第一', ParamsQuery)
-             
+
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -4894,7 +4893,7 @@ mu
         })
     },
     getPatientBefor(){
-     
+
        var patient_id = 0
        var record_date =""
        if(this.$route.query.patient_id!=undefined){
@@ -4932,13 +4931,13 @@ mu
             // }
           }
           if(prescription!=undefined){
-           
+
             this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
             this.dialysisPrescription.prescription_water = prescription.prescription_water
           }
 
          }
-      }) 
+      })
     },
     unique(arr) {
       const res = new Map()
@@ -5562,7 +5561,7 @@ mu
 
         }
 
-      
+
 
       },
       stockType: function() {
@@ -5630,7 +5629,8 @@ mu
 
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
 
-
+      this.org_id = this.$store.getters.xt_user.org.id
+      console.log('this.org_id',this.org_id);
 
     }
   }

src/xt_pages/outpatientCharges/listPrint.vue

@@ -41,6 +41,7 @@
   import PrintTwo10265 from "./listTemplate/printTwo10265";
   import ListPrintThree from "./listTemplate/listPrintThree";
   import listPrintforu from "./listTemplate/listPrintforu"
+import { watch } from 'vue';
   export default {
     name: 'listPrint',
     components: {
@@ -53,7 +54,8 @@
       printTwo,
     },
     props: {
-      paramsObj: Object
+      paramsObj: Object,
+      // paramsObj3:Object
     },
     data() {
       return {
@@ -67,11 +69,17 @@
         charge_admin:{},
         org_id:'',
 
-        hospital_record:{}
+        hospital_record:{},
+        paramsobjid:0,
       }
     },
     created() {
-      this.getInfo(this.paramsObj.id)
+      this.paramsobjid = this.paramsObj.id
+      console.log('1111111222222',this.paramsObj.id);
+      
+      // this.getInfo(this.paramsObj.id)
+      this.getInfo(this.paramsobjid)
+      console.log('333333333',this.paramsObj.id);
       this.org_id = this.$store.getters.xt_user.org_id
       if(this.org_id == 10106){
         if(this.paramsObj.balance_accounts_type == 2){
@@ -80,13 +88,14 @@
 
         }else{
           this.getInfo10106(this.paramsObj.id)
-
-
-
         }
       }
       // this.getinfos(this.paramsObj.id)
     },
+    beforeUpdate(){
+      console.log('444444',this.paramsObj.id);
+      
+    },
 
     methods: {
       getTimes(time) {
@@ -828,8 +837,8 @@
       //     }
       //   })
       // }
-    }
-
+    },
+    
   }
 </script>
 

src/xt_pages/outpatientCharges/summary.vue

@@ -445,7 +445,7 @@
       title="打印"
       :visible.sync="listVisible"
     >
-      <listPrint :paramsObj='paramsObj'></listPrint>
+      <listPrint ref="checklists" :paramsObj='paramsObj' :key="jgFileTimer"></listPrint>
     </el-dialog>
     
     <el-dialog
@@ -625,7 +625,6 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
 import { ModifyFapiaoCode } from '@/api/his/his_tools'
 
-
 // import NewStatementPrint from './newStatementPrint'
 import { adminMainView} from "@/api/role/admin";
 import NewStatementPrint from './statementPrint.vue'
@@ -667,7 +666,7 @@ export default {
     listPrint,
     allListPrint,
     invoicePrint,
-    settlementPrint
+    settlementPrint,
   },
   data() {
     return {
@@ -729,9 +728,7 @@ export default {
       patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
                         {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
       ],
-      // paramsObj3:{
-      //   id:''
-      // }
+      jgFileTimer:''
     }
   },
 
@@ -4042,6 +4039,7 @@ export default {
     getTimes(time) {
       return uParseTime(time, '{y}-{m}-{d}')
     },
+    
     toDetail(row) {
       this.$router.push(
         '/outpatientCharges/summaryDetail?patient_id=' +
@@ -4095,13 +4093,14 @@ export default {
       })
     },
     open(row) {
-      console.log('row',row);
-      this.paramsObj.id = row.id
-      // if (index == 1) {
-        this.listVisible = true
-      // } else if (index == 2) {
-      //   this.allListVisible = true
-      // }
+      this.paramsObj.id =''
+      console.log('row',(row.id).toString());
+      const id = (row.id).toString()
+      this.paramsObj.id = id
+      this.jgFileTimer = new Date().getTime()
+      console.log('this.paramsObj.id',this.paramsObj.id);
+      this.listVisible = true
+
     }, unique(array) {
       // res用来存储结果
       var res = []
@@ -4190,7 +4189,8 @@ export default {
 
 
     }
-  }
+  },
+  
 }
 </script>
 <style lang="scss">