Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -256,11 +256,15 @@ export default {
         return project_name
      },
 
-     getDiagnosis(id){
+     getDiagnosis(ids){
+        let id = ids.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          // if(id == this.diagnoses[i].id){
+          //    name = this.diagnoses[i].class_name
+          // }
+          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -376,11 +376,15 @@ export default {
           }
        })
      },
-     getDiagnosis(id){
+     getDiagnosis(ids){
+        let id = ids.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          // if(id == this.diagnoses[i].id){
+          //    name = this.diagnoses[i].class_name
+          // }
+          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -54,7 +54,7 @@
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
-              <td style="line-height:18px">{{ item.number }}</td>
+              <td style="line-height:18px">{{ item.batch_number }}</td>
               <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>