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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -151,7 +151,7 @@
                                                     </div>
                                                     </el-tab-pane>
 
-                                                    
+
 
                                                     <prescription-table ref="prescription_tables"
                                                                         :prescription="items.curPrescriptions"></prescription-table>
@@ -700,8 +700,6 @@
       }
     },
     created() {
-      var xml=new ActiveXObject("yinhai.yh_hb_sctr")
-      console
       const tableHeight = document.body.clientHeight - 290
       this.tableHeight = tableHeight
       var nowDate = new Date()

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1376,7 +1376,6 @@
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
-                    groupno: prescription.advices[b].groupno
 
                   }
 

src/xt_pages/outpatientRegistration/index.vue

@@ -1542,8 +1542,7 @@
 
           }
         }
-      }
-      ,
+      },
       changeName(id) {
         this.form.sex = ''
         this.form.age = ''