518合并代码

src/xt_pages/dialysis/details/index.vue

@@ -237,8 +237,7 @@
              <div v-for="(main_collection,index) in printList" :key="index">
               <div class="signPrint" style="font-size:16px;">
                 <div style="margin-left:50px;">姓名:
-                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
-                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                  <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
                 </div>
                 <div class="printCell">
@@ -248,7 +247,7 @@
                     <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
                   </span>
-                  <span> </span>
+                  <span>{{ printDate }}</span> 
                 </div>
                 <div class="printCell">
                    <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
@@ -371,7 +370,6 @@
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="startVisibility = false">取 消</el-button>
-        <el-button type="primary" @click="startVisibility = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -858,9 +856,11 @@ export default {
       startVisibility:false,
       printList:[],
       anticoagulants_confit:null,
+      printDate:''
     }
   },
   created() {
+   this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     if(this.$route.query.showView){
       this.showView = this.$route.query.showView
     }
@@ -903,7 +903,7 @@ export default {
     };
     this.websocketSend(this.initData)
     this.getInitData()
-    this.getInitPrintData()
+   
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
   },
   beforeMount() {
@@ -1400,7 +1400,8 @@ export default {
       )
     },
     printOrderOne(){
-      this.startVisibility = true
+      this.getInitPrintData()
+     
     },
     // 日期
     handleScheduleDateChange: function(index) {
@@ -2162,6 +2163,7 @@ export default {
           var list = response.data.data.list
           console.log("list2332322332",list)
           this.printList = list
+          this.startVisibility = true
         }
       })
     }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -559,7 +559,7 @@ export default {
             
             if(project_config.is_open == 1){
               this.project = resp.data.project
-              console.log( this.project)
+              console.log("wode 2o2o3o3o23o32o32o23o32o32o", this.project)
              
               let projectArr = []
               if(this.org_id!= 10318){
@@ -570,7 +570,7 @@ export default {
                     }
                   })
                 })
-                
+                console.log("projectArr2332323232323232",projectArr)
                  resp.data.hisAdvices.map((item,index) => {
                   if(projectArr[index].project && projectArr[index].project.length > 0){
                      projectArr[index].project.map(it => {
@@ -598,10 +598,8 @@ export default {
                     })
                   }
                 })
+                console.log("hh3oo1o3o123o3oo312o132o312o31o132o",resp.data.hisAdvices)
               }
-            
-             
-
             }
            
            if(config.is_open == 0 || config.is_open == 2){