5月27

src/xt_pages/Pharmacy/PatientDispensing.vue

       ],
       tableHeight: 400,
       start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
-      start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD hh:mm"),
+      start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD HH:mm"),
       state: 1, //1待发药，2已发药
       waitmount: 0, //待发药人数
       waitmount_data: [],
       baseList:[],
       org_id:'',
       patients:{},
-      doctors:[]
+      doctors:[],
+      diagnosearr:[],
+      diagnosis:'',
     };
   },
   watch: {},
            this.baseList =[]
           this.baseList = res.data.data.baseList
           this.doctors = res.data.data.doctors
+          this.diagnosearr = res.data.data.diagnose
+          this.diagnosis = res.data.data.prescription.diagnosis
           const obj={
             age:res.data.data.patients.age,
             gender: res.data.data.patients.gender,
             this.tableData,
             this.currentRow,
             this.state,
-            this.start_time2,
+            this.start_time,
             this.baseList,
             this.patients,
-            this.doctors
+            this.doctors,
+            this.diagnosearr,
+            this.diagnosis
           )
         }
       }

src/xt_pages/Pharmacy/print/patientPrintTwo.vue

     :close-on-press-escape="isClose"
   >
     <el-button type="primary" @click="print" class="print_style"
-      >打印23</el-button
+      >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
       <div class="list_title" style="border-bottom:none;">
         <span>性别:{{ patients.gender==1 ?'男':'女'}}</span>&nbsp;&nbsp;
         <span>年龄:{{patients.age}}</span>&nbsp;&nbsp;
         <span>住院科室:肾内科</span>&nbsp;&nbsp;
-        <span>入院诊断:{{patients.diagnose}}</span>
+        <!-- <span>入院诊断:{{patients.diagnose}}</span> -->
+        <span>入院诊断:{{ getdiagnosis(diagnosis) }}</span>
       </div>
       <div>
         <table class="table" border="1" 
       Doctor:'',
       patients:{},
       doctors:[],
-      Price_zong:0
+      Price_zong:0,
+      diagnosearr:[],
+      diagnosis:'',
     };
   },
   props: {
         }
       }
     },
-    show: function (val,data,state,times,base,patients,doctors) {
+    show: function (val,data,state,times,base,patients,doctors,arr,diagnosis) {
       this.times = times
       this.visibility = true;
       console.log("val",val)
       this.baseList = base
       this.patients = patients
       this.doctors = doctors
+      this.diagnosearr = arr
+      this.diagnosis = diagnosis
       if (state == 1){
         this.state = "待发药"
       }
         }
       }
     },
-
+    getdiagnosis(val){
+      const diagnosis = val.split(',')
+      console.log('diagnosis',diagnosis)
+      const diagn = []
+      // const dia_id =[]
+      const arr = this.diagnosearr
+      if(diagnosis.length>0 && arr.length>0){
+        for(let i in arr){
+          for(let j in diagnosis){
+            if(arr[i].id ==diagnosis[j]){
+              diagn.push(arr[i].class_name)
+            }
+          }
+          var arr2 = diagn.join()
+          console.log('arr2',arr2);
+        }
+      }
+      return arr2
+    },
     comfirm: function (formName) {
       this.goodInfo = [];
       this.goodInfoTableData = [];
 .table tr td{
  border:1px solid black;
  padding: 5px 0;
-//  border-left: none;
-//  border-right: none;
+ border-left: none;
+ border-right: none;
 }
 </style>