diff --git a/package.json b/package.json index 5f1d2466..b7ae8df5 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "pdf-lib": "^1.17.1", "pdfjs-dist": "^2.5.207", "print-js": "^1.6.0", + "qrcode": "^1.5.4", "qrcodejs2": "^0.0.2", "quill": "1.3.7", "require.js": "^1.0.0", diff --git a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue index 67fad4ae..9ce3f376 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue @@ -119,6 +119,9 @@ import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import { parseTime } from "@/utils/custom"; +import QRCode from 'qrcode'; + + export default { name: "emisSettlePayRecordForm", props:{ @@ -189,7 +192,7 @@ export default { }, methods: { - initData() { + async initData() { this.reset(); this.form.payScope='1'; @@ -206,10 +209,21 @@ export default { this.loading = false; }); - getWxPayQrCode(this.settleBillNo).then(response => { - this.wxPayQrImageUrl = response.data; - console.log("===>getWxPayQrCode===>",response.data) - }); + // getWxPayQrCode(this.settleBillNo).then(response => { + // this.wxPayQrImageUrl = response.data; + // console.log("===>getWxPayQrCode===>",response.data) + // }); + + const options = { + width: 200, + margin: 1, + color: { + dark:'#000000', + light:'#ffffff' + } + }; + let payUrl="https://oms.tanex56.com/onlinePay?bid="+this.settleBillNo; + this.wxPayQrImageUrl = await QRCode.toDataURL(payUrl, options); let qParam ={ pageNum:1, diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue index 3d5d8c94..17989427 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue @@ -272,7 +272,7 @@ import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImpor export default { - name: "CenterGenBatchMgnt", + name: "BigBatchListPanel", components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,SysUserSimplePicker,