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

src/components/Editor/index.vue

@@ -21,7 +21,7 @@
       initEditor() {
         this.ue = UE.getEditor(this.id, {
           initialFrameWidth: '100%',
-          initialFrameHeight: '350',
+          initialFrameHeight: '600',
           topOffset: '110',
           toolbars: [[
             'bold', //加粗

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -165,7 +165,7 @@
                       label="处方编号"
                       width="120">
                   <template slot-scope="scope">
-                      <span>处方 {{scope.$index + 1}}</span>
+                      <span>{{getprescriptionName(scope.row)}}</span>
                   </template>
               </el-table-column>
               <el-table-column label="处方号">
@@ -194,7 +194,7 @@
                       label="治疗单编号"
                       width="120">
                   <template slot-scope="scope">
-                      <span>治疗 {{scope.$index + 1}}</span>
+                      <span>治疗 {{getprescriptionName(scope.row)}}</span>
                   </template>
               </el-table-column>
               <el-table-column label="治疗单号">
@@ -223,7 +223,7 @@
                       label="处方编号"
                       width="120">
                   <template slot-scope="scope">
-                      <span>检验单1</span>
+                      <span>检验单</span>
                   </template>
               </el-table-column>
               <el-table-column label="检验单号">
@@ -404,7 +404,7 @@ export default {
   },
   methods: {
    getSunziValue(val){
-     
+
      this.getInitData()
    },
     editKeepLoad(data){
@@ -543,6 +543,16 @@ export default {
     setData(val) {
       this.prescriptions = val
 
+    },getprescriptionName(row){
+      console.log("~~~~~~")
+      console.log(row)
+      for(let i = 0;i < this.prescriptions.length;i++){
+        if(this.prescriptions[i].id == row.id){
+          return this.prescriptions[i].name
+        }
+      }
+
+
     },
     getDictionaryDataConfig(module, filed_name) {
       return getDictionaryDataConfig(module, filed_name)
@@ -559,13 +569,13 @@ export default {
             // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if(this.all_data[i].first_letter !=undefined){
-                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
                   this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
                   this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                     arr4 = arr4.concat(this.all_data[i])
                 }
               }
-              
+
             }
             this.patientTableData = arr4
             break
@@ -574,13 +584,13 @@ export default {
             // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if(this.all_data[i].first_letter !=undefined){
-                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
                     this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
                     this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                   arr2 = arr2.concat(this.all_data[i])
                 }
               }
-             
+
             }
             this.patientTableData = arr2
 
@@ -590,13 +600,13 @@ export default {
             // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if(this.all_data[i].first_letter !=undefined){
-                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
                   this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                   arr3 = arr3.concat(this.all_data[i])
                 }
               }
-              
+
             }
             this.patientTableData = arr3
             break

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,9 +15,9 @@
       size="small" type="success"
       @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10633 && org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10633 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
@@ -40,7 +40,7 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 ">
+    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 10633">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>
@@ -142,7 +142,7 @@
         return "";
       },
       printThisPage() {
-        if (this.org_id == 10217){
+        if (this.org_id == 10217 || this.org_id == 10633){
           const style =
             // '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
             '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;}.actionBar div{width:150px;}}';

src/xt_pages/outpatientCharges/statementTemplate/print10191.vue

@@ -1,12 +1,12 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10633">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10387">湖南省社会医疗保险医疗费用结算单</div>
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10633 && this.$store.getters.xt_user.org_id != 10510 || this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,13 +1,13 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10633">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10387">湖南省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510 || this.$store.getters.xt_user.org_id == 0">湖北省基本医疗保险门诊费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 &&this.$store.getters.xt_user.org_id != 0">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510  &&this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/printSix.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10633">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 || this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -1,13 +1,13 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10633">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10515">湖南省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/test.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10633">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>
@@ -132,7 +132,7 @@
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
-            
+
         </td>
       </tr>
       <tr>
@@ -291,7 +291,7 @@
       <tr>
         <td>收款人:</td>
         <!-- <td colspan="2">{{info.charge_admin.user_name}}</td> -->
-        <td colspan="2">高慧与</td> 
+        <td colspan="2">高慧与</td>
         <td>审核人:</td>
         <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
         <!-- <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td> -->

src/xt_pages/user/courseOfDisease.vue

@@ -678,7 +678,7 @@
         </div>
       </div>
       <!-- </div> -->
-      <el-dialog title="新增病程记录" width="70%" top="5vh" :visible.sync="show_dialog">
+      <el-dialog title="新增病程记录" class="eldialog" width="70%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -725,7 +725,7 @@
       </el-dialog>
 
 
-      <el-dialog title="修改病程记录" width="70%" top="5vh" :visible.sync="show_edit_dialog">
+      <el-dialog title="修改病程记录" class="eldialog" width="70%" top="5vh" :visible.sync="show_edit_dialog" style="">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -1323,9 +1323,18 @@
     margin-top: 10px;
   }
 
+  }
+  .eldialog{
+    .el-dialog{
+      .el-dialog__body{
+        max-height: calc(100vh - 80px) !important;
+        padding: 0px 20px;
+      }
+    }
+    
   }
 </style>
-<style>
+<style lang="scss">
 .el-table td,
 .el-table th.is-leaf,
 .el-table--border,
@@ -1337,4 +1346,14 @@
 .el-table::before {
   background-color: #d0d3da;
 }
+
+.eldialog{
+    .el-dialog{
+      .el-dialog__body{
+        max-height: calc(100vh - 80px) !important;
+        padding: 0px 20px;
+      }
+    }
+    
+  }
 </style>

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;">