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

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1084,7 +1084,6 @@
                  this.zhiShow = false
                  this.totalShow = false
                  this.huShow =false
-                 console.log('啊啊')
             }else{
               this.zhiShow = true
               this.totalShow = true