Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1289,7 +1289,6 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
-              console.log("呵呵")
             }
           }
         }