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/components/deskPrescription.vue

@@ -1367,8 +1367,6 @@
           this.prescriptions[i].name = '处方' + (i + 1)
           this.prescriptions[i]['pre_time'] = nowTime
 
-          this.prescriptions[i]['med_type'] = 14
-
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
               this.customTabIndex = 1
@@ -2857,17 +2855,6 @@
 
             }
 
-            // if(this.activeName == 2){
-            //
-            //    for(let i = 0; i<temp2.length;i++){
-            //     for(let j=0;j<this.hisList.length;j++){
-            //         if(temp2[i].id == this.hisList[j].project_id){
-            //            temp2[i].total =  this.hisList[j].number
-            //         }
-            //     }
-            //    }
-            //  }
-
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {