Merge remote-tracking branch 'origin/master'

src/main.js

@@ -16,13 +16,13 @@ import i18n from '@/i18n/i18n'
 import './utils/directives'
 import decimalUtil from '@/utils/decimalUtil.js'
 import getLodop from '@/utils/LodopFuncs.js'
-import pdf from 'vue-pdf'
+// import pdf from 'vue-pdf'
 import { debounce,throttle} from '@/utils/common.js'
 import './utils/vxe-table'
 
 
 Vue.component('downloadExcel', JsonExcel)
-Vue.component('pdf', pdf)
+// Vue.component('pdf', pdf)
 Vue.use(VueCookie)
 Vue.config.productionTip = false