新分支

src/router/modules/patient.js

@@ -480,16 +480,16 @@ export default {
   //     noCache: true
   //   }
   // },
-  {//血管通路图
-    path: '/patients/patient/:id/angiogram',
-    component: () => import('@/xt_pages/user/angiogram'),
-    hidden: true,
-    is_menu: false,
-    name: 'angiogram',
-    meta: {
-      title: 'angiogram',
-      noCache: true
-    }
-  },
+  // {//血管通路图
+  //   path: '/patients/patient/:id/angiogram',
+  //   component: () => import('@/xt_pages/user/angiogram'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'angiogram',
+  //   meta: {
+  //     title: 'angiogram',
+  //     noCache: true
+  //   }
+  // },
   ]
 }

src/xt_pages/device/airDisinfectTwo.vue

@@ -2023,6 +2023,7 @@
                var airSetting =  response.data.data.airSetting
                this.$message.success("保存成功")
                this.setEditDialog = false
+               this.getSetAirDisInfectById()
              }
           })  
         },

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -2085,21 +2085,23 @@
       toSetting(){
         getObjectWayDisinfect().then(response=>{
            if(response.data.state==1){
-             var objctSet = response.data.data.objctSet
+             var objctSet = response.data.data.disinfect
              if(objctSet!=undefined){
                 this.art_way_one = objctSet.air_way.toString()
              }
              this.setEditDialog = true
+             
            }
         })
       },
       getObjectWayDisinfect(){
         getObjectWayDisinfect().then(response=>{
            if(response.data.state==1){
-             var objctSet = response.data.data.objctSet
+             var objctSet = response.data.data.disinfect
              if(objctSet!=undefined){
                 this.art_way_one = objctSet.air_way
              }
+             console.log("art_way_one23232322323",this.art_way_one)
             
            }
         })
@@ -2112,6 +2114,7 @@
            if(response.data.state==1){
              var objctSet = response.data.data.objctSet
              this.setEditDialog = false
+             this.getObjectWayDisinfect()
            }
         })
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4144,6 +4144,73 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
+
+
+        
+
+        console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
+        if(this.org_id ==10515 || this.org_id == 0){
+          if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+            for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
+              this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
+            }
+         }
+
+
+         let projects = [];
+        response.data.data.projects.map((item) => {
+          if (item.type == 2) {
+            projects.push(item);
+          }
+        });
+        this.projects = projects;
+
+      
+        console.log("this.projects", this.projects);
+
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
+        if(this.projects!=null && this.projects.length >0){
+           for(let i=0;i<this.projects.length;i++){
+             if(this.projects[i].type== 2){
+            
+              this.projects[i].project_team_name = ""
+              this.projects[i].project_team_id = 0
+              console.log("this.projects[i].project.team",this.projects[i].project.team)
+              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                this.projects[i].project_team = this.projects[i].team.project_team
+                this.projects[i].project_team_id = this.projects[i].team.id
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_name =  this.projects[i].team.project_team
+              
+               
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.project[i])
+              }else{
+                this.projects[i].project_team = this.projects[i].project.project_name
+                this.projects[i].advice_name = this.projects[i].project.project_name
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.projects[i])
+              }
+             
+             }
+             
+           }
+        }
+         
+        }
+      
+        console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
@@ -4178,6 +4245,8 @@ export default {
           this.doctor_advices_2 = doctor_advices_2;
         }
         // console.log(this.advice_groups);
+
+       
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,9 +12,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
         <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" >
+          <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 !=0" >
             <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -33,7 +33,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 == 0">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -5,7 +5,7 @@
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
           <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
-          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">晁海燕 123456789011234</div>
+          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">{{ doctor_info.user_name }}  {{ doctor_info.doctor_number }} </div>
       </div>
       <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:76+ 'px',}">
           <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
@@ -117,6 +117,7 @@ export default {
           org_name:'',
           page:1,
           pageArr:[],
+          doctor_info:{},
       }
   },
   created(){
@@ -151,6 +152,8 @@ export default {
               this.getPage()
               this.pageArr.push(10)
               console.log('pageArr',this.pageArr.length)
+              this.doctor_info = res.data.data.doctor_info
+              console.log("doc_ON2O2O2O",this.doctor_info)
           })
       },
       smalltoBIG(n) {