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/index.vue

@@ -459,10 +459,10 @@
             <div style="border: 1px solid black;width: 82%;"  >
               <div style="margin: 5px 0;">
                 <span style="font-weight: bolder;">{{main_collection.patient.name}} </span>&nbsp;&nbsp;
+                 
+                <span>
                   <span v-if="main_collection.patient.gender==1">男</span>
                   <span v-if="main_collection.patient.gender==2">女</span>
-                <span>
-
                 </span>&nbsp;&nbsp;
                 <span>{{getNewAge(main_collection.patient.id_card_no)  }}岁</span>&nbsp;&nbsp;<span>{{getTimes(main_collection.schedule_date)}}</span>&nbsp;&nbsp;
                 <span></span>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1567,7 +1567,7 @@ export default {
 
     }, searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
-
+      console.log('1111',this.allProject)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
 
@@ -1581,6 +1581,7 @@ export default {
           
         }
         this.tabProject = arr
+        console.log('rrrr',this.tabProject)
       }
 
     }, searchProjectTeamAction() {
@@ -3459,13 +3460,12 @@ export default {
               total: good_info[i].total,
               is_special_diseases: good_info[i].is_special_diseases,
               good_info: good_info[i],
-              stock_count: good_info[i].stock_count
+              stock_count: good_info[i].stock_count,
+              first_letter:good_info[i].first_letter
             }
             this.tabProject.push(obj)
           }
-
           this.allProject = this.tabProject
-
         }
       })
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -558,10 +558,14 @@ export default {
             let arr4 = []
             // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
-                arr4 = arr4.concat(this.all_data[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 ||
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                    arr4 = arr4.concat(this.all_data[i])
+                }
               }
+              
             }
             this.patientTableData = arr4
             break
@@ -569,10 +573,14 @@ export default {
             let arr2 = []
             // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
-                arr2 = arr2.concat(this.all_data[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 ||
+                    this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr2 = arr2.concat(this.all_data[i])
+                }
               }
+             
             }
             this.patientTableData = arr2
 
@@ -581,10 +589,14 @@ export default {
             let arr3 = []
             // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
-                arr3 = arr3.concat(this.all_data[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 || 
+                  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/statementPrint.vue

@@ -58,20 +58,19 @@
       <printEleven :info="info" v-if="org_id == 10485"></printEleven>
       <!-- 阜阳经沃 -->
       <printtwelve :info="info" v-if="org_id == 10480 || org_id == 0"></printtwelve>
-
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
 
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 &&org_id != 10480 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3569,6 +3569,7 @@ export default {
               is_special_diseases: good_info[i].is_special_diseases,
               good_info: good_info[i],
               stock_count:good_info[i].stock_count,
+              first_letter:good_info[i].first_letter
             }
             this.tabProject.push(obj)
           }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -849,11 +849,15 @@ export default {
           case 0:
             let arr = []
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
-               this.all_data[i].number.indexOf(this.search_input) != -1) {
-                arr = arr.concat(this.all_data[i])
-                console.log(arr)
+              if( this.all_data[i].first_letter !=undefined){
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
+                this.all_data[i].number.indexOf(this.search_input) != -1 ||
+                this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr = arr.concat(this.all_data[i])
+                  console.log(arr)
+                }
               }
+              
             }
             this.all_data = arr
 
@@ -862,11 +866,15 @@ export default {
             let arr2 = []
            
             for (let i = 0; i < this.cure_data.length; i++) {
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
-              this.cure_data[i].number.indexOf(this.search_input) != -1) {
-                console.log('2222',this.cure_data);
-                arr2 = arr2.concat(this.cure_data[i])
+              if(this.cure_data[i].first_letter != undefined){
+                if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
+                  this.cure_data[i].number.indexOf(this.search_input) != -1 ||
+                  this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                    console.log('2222',this.cure_data);
+                    arr2 = arr2.concat(this.cure_data[i])
+                }
               }
+             
             }
             this.cure_data = arr2
 
@@ -878,7 +886,8 @@ export default {
             for (let i = 0; i < this.un_cure_data.length; i++) {
               if(this.un_cure_data[i].first_letter!=undefined){
                 if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || 
-                this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
+                this.un_cure_data[i].number.indexOf(this.search_input) != -1 ||
+                this.un_cure_data[i].first_letter.indexOf(this.search_input) != -1) {
                   arr3 = arr3.concat(this.un_cure_data[i])
                 }
               }
@@ -1521,7 +1530,7 @@ export default {
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
                 first_letter:response.data.data.list_two[i].first_letter
               }
-              console.log('6666',obj);
+              // console.log('6666',obj);
               this.un_cure_data.push(obj)
             }
 
@@ -1550,7 +1559,7 @@ export default {
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
                   first_letter:response.data.data.list[i].first_letter
                 }
-                console.log('8888',obj);
+                // console.log('8888',obj);
                 this.un_cure_data.push(obj)
               }
               //已就诊

src/xt_pages/outpatientDoctorStation/print.vue

@@ -159,7 +159,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;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; 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:300px;}.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;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; 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;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="prescriptionBox" >
+        <div class="prescriptionBox" style="min-height: 350px;">
           <div class="Rp">Rp:</div>
           <div
             class="drugsBox"