Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -964,7 +964,7 @@
             var sodiumArr = []
             var calciumArr = []
             var glucoseArr = []
-            console.log("rowlist233223323223w",this.rowList)
+          
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
                  list[i].dialysis_dialyszers_arr = []
@@ -972,6 +972,7 @@
                  list[i].dialysis_irrigation_arr = []
                  list[i].puncture_needle_arr = []
                  list[i].dialysis_strainer_arr = []
+
                  
                  if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
                   if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
@@ -1054,6 +1055,7 @@
               }
             }
 
+
             console.log("glucoseArr",glucoseArr)
             if(kaliumArr!=null && kaliumArr.length > 0){
               let dataInfo = {}
@@ -1319,6 +1321,8 @@
               Arr.push(a);
             }
 
+        
+
        
            
 
@@ -1376,7 +1380,12 @@
             //  console.log("list23233223232wode",list)
             this.startHisDialogVisible = true
              var projectList = []
+             console.log("rowlist233223323223w",this.rowList)
+             var dialysis_soluton_calcium = []
              for(let i=0;i<list.length;i++){
+               list[i].calcium_name = ""
+               list[i].calcium_name = "钙" + list[i].dialysis_solution.calcium
+               dialysis_soluton_calcium.push(list[i].calcium_name)
                 if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length>0){
                     for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
                       for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
@@ -1385,7 +1394,44 @@
                      }
                 }
              }
-            console.log("projectList",projectList)
+            console.log("dialysis_soluton_calcium",dialysis_soluton_calcium)
+             this.tableList = []
+            if(dialysis_soluton_calcium!=null && dialysis_soluton_calcium.length>0){
+                
+                let dataInfo = {}
+                dialysis_soluton_calcium.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                  dataInfo[item] = {
+                    good_name:item,
+                    specification_name:item,
+                    child: [],
+                    count:0,
+                  }
+                }
+              })
+              let newArrList = Object.values(dataInfo)
+              console.log("newArr================",newArrList)
+              for(let i=0;i<newArrList.length;i++){
+                for(let j=0;j<dialysis_soluton_calcium.length;j++){
+                   if(newArrList[i].good_name == dialysis_soluton_calcium[j]){
+                    newArrList[i].child.push(dialysis_soluton_calcium[j])
+                   }
+                }
+              }
+              console.log("newArr------------",newArrList)
+
+              for(let i=0;i<newArrList.length;i++){
+                 newArrList[i].count = newArrList[i].child.length
+              }
+              if(this.org_id == 0 || this.org_id == 10610){
+                this.tableList.push(...newArrList)
+              }else{
+                this.tableList = []
+              }
+             
+            }
+           
+            console.log("this.-------------",this.tableList)
 
              if(projectList!=null && projectList.length > 0){
                for(let i=0;i<projectList.length;i++){
@@ -1423,7 +1469,7 @@
               }
             }
             console.log("newArr32323233223wo",newArr)
-            this.tableList = newArr
+            this.tableList.push(...newArr)
           }
         })
       },

src/xt_pages/dialysis/details/consumable/dialysisGoodCountPrint.vue

@@ -913,7 +913,12 @@
              console.log("list23233223232wode",list)
             this.startHisDialogVisible = true
              var projectList = []
+             var dialysis_soluton_calcium = []
+           
              for(let i=0;i<list.length;i++){
+              list[i].calcium_name = ""
+              list[i].calcium_name = "钙" + list[i].dialysis_solution.calcium
+              dialysis_soluton_calcium.push(list[i].calcium_name)
                 if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length>0){
                     for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
                       for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
@@ -923,7 +928,41 @@
                 }
              }
              console.log("projectList",projectList)
-             
+             this.tableList = []
+             if(dialysis_soluton_calcium!=null && dialysis_soluton_calcium.length>0){
+                
+                let dataInfo = {}
+                dialysis_soluton_calcium.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                  dataInfo[item] = {
+                    good_name:item,
+                    specification_name:item,
+                    child: [],
+                    count:0,
+                  }
+                }
+              })
+              let newArrList = Object.values(dataInfo)
+              console.log("newArr================",newArrList)
+              for(let i=0;i<newArrList.length;i++){
+                for(let j=0;j<dialysis_soluton_calcium.length;j++){
+                   if(newArrList[i].good_name == dialysis_soluton_calcium[j]){
+                    newArrList[i].child.push(dialysis_soluton_calcium[j])
+                   }
+                }
+              }
+              console.log("newArr------------",newArrList)
+
+              for(let i=0;i<newArrList.length;i++){
+                 newArrList[i].count = newArrList[i].child.length
+              }
+              
+              if(this.org_id == 0 || this.org_id == 10610){
+                this.tableList.push(...newArrList)
+              }else{
+                this.tableList = []
+              }
+            }
              if(projectList!=null && projectList.length > 0){
                for(let i=0;i<projectList.length;i++){
                  projectList[i].good_id = 0
@@ -960,7 +999,7 @@
               }
             }
             console.log("newArr32323233223wo",newArr)
-            this.tableList = newArr
+            this.tableList.push(...newArr)
           }
         })
       },

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

@@ -2821,7 +2821,7 @@ mu
          }
         }
         //古镇乐生
-        if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
+        if(this.$store.getters.xt_user.template_info.org_id==10727){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
@@ -3339,7 +3339,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        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.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745){
+        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.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745){
           this.getPatientBefor()
         }
 
@@ -3494,7 +3494,7 @@ mu
 
 
         //古镇乐生
-         if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
+         if(this.$store.getters.xt_user.template_info.org_id==10727){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
@@ -5190,7 +5190,7 @@ mu
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745 ){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745 ){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4262,7 +4262,7 @@ export default {
         }
 
 
-        console.log("RESWOOWOWWOOW", response.data.data.doctorAdevieInfo)
+        console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
 
         //华池
         if (this.org_id == 10440) {
@@ -4308,7 +4308,7 @@ export default {
           this.projects = projects;
 
 
-          // console.log("this.projects=========================================", this.projects);
+        // console.log("this.projects=========================================", this.projects);
 
 
 
@@ -4467,8 +4467,8 @@ export default {
 
 
         if (this.doctor_advices.length + this.projectsOne.length <= 6) {
-          var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
-          this.print_length = 6;
+            var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
+            this.print_length = 6;
 
           for (let index = 0; index < nl; index++) {
             if (
@@ -4772,7 +4772,6 @@ export default {
 .inline_block {
   display: inline-block;
 }
-
 .under_line_two {
   display: inline-block;
   border-bottom: 1px solid #999;
@@ -4841,8 +4840,7 @@ export default {
 
 .print_page_main_content .proj_table .inside_table {
   width: 100%;
-  border: hidden;
-  /* 解决边框冲突 */
+  border: hidden; /* 解决边框冲突 */
   border-collapse: collapse;
 }
 
@@ -4879,35 +4877,28 @@ export default {
 .margin-bottom-300 {
   margin-bottom: 450px;
 }
-
 .margin-bottom-600 {
   margin-bottom: 600px;
 }
-
 .margin-bottom-900 {
   margin-bottom: 900px;
 }
-
 .print-yema {
   position: absolute;
   left: 50%;
 }
-
 .print-yema2 {
   position: absolute;
   left: 50%;
 }
-
 .print-yema3 {
   position: absolute;
   left: 50%;
 }
-
 .print-yema4 {
   position: absolute;
   left: 50%;
 }
-
 .check_box_panel .did_checke::after {
   font-size: 8px;
   margin-left: 2px;

src/xt_pages/stock/detail/print.vue

@@ -182,6 +182,7 @@
           type: this.$route.query.type,
           limit:this.$route.query.limit,
           page:this.$route.query.page,
+          good_id:this.good_id,
         },
         totalPrice: 0,
         stockDatas: [],
@@ -195,7 +196,8 @@
         informationList:[],
         wareOutList:[],
         manufacturerList:[],
-        dealerList:[]
+        dealerList:[],
+        good_id:0,
       }
     },
     methods: {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -769,6 +769,7 @@ export default {
           limit:this.limit,
           page:this.page,
           keywords:this.$router.keywords,
+          good_id:this.good_id,
         }
       });
       }