diff --git a/.env.production b/.env.production index 2d862aea..2143668f 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ VUE_APP_VERSION = '20240520' # 管理系统/生产环境 VUE_APP_PDOMAIN = 'tanex56' VUE_APP_DATA_FROM = 'pc' -VUE_APP_BASE_API = 'https://api-emis.jtrs56.com/api/bizsvr' -VUE_APP_WS_HOST = 'wss://api-emis.jtrs56.com/api/bizsvr' +VUE_APP_BASE_API = 'https://api-emis.tanex56.com/api/bizsvr' +VUE_APP_WS_HOST = 'wss://api-emis.tanex56.com/api/bizsvr' VUE_APP_PRINTER_HOST = '127.0.0.1:17080' diff --git a/package.json b/package.json index 9ed3654f..e1bce49e 100644 --- a/package.json +++ b/package.json @@ -139,6 +139,7 @@ "script-loader": "^0.7.2", "speed-measure-webpack-plugin": "^1.5.0", "svg-sprite-loader": "5.1.1", + "vue-cli-plugin-electron-builder": "~2.1.1", "vue-template-compiler": "2.6.12", "webpack-bundle-analyzer": "^4.9.1" }, diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index 2011432e..1415a55d 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -270,7 +270,7 @@ - + diff --git a/src/views/emis/emisSettleInvoiceChRecord/index.vue b/src/views/emis/emisSettleInvoiceChRecord/index.vue index 20545631..bfc7dbbb 100644 --- a/src/views/emis/emisSettleInvoiceChRecord/index.vue +++ b/src/views/emis/emisSettleInvoiceChRecord/index.vue @@ -192,6 +192,15 @@ @click="handleExport" v-hasPermi="['emis:emisSettleInvoiceChRecord:export']" >导出 + + 定制导出 @@ -568,6 +577,15 @@ export default { }).catch(() => {}); }, + handleCustomExport(){ + let qExportParam=this.initQueryParams(); + qExportParam.pageNum=1; + qExportParam.pageSize=10000; + this.download('emis/emisArticleLikeRecord/export', { + ...qExportParam + }, `定制发票列表.xlsx`) + }, + /** 导出按钮操作 */ handleExport() { const loadingInstance = this.$loading({ @@ -580,7 +598,7 @@ export default { else{ let qExportParam=this.initQueryParams(); qExportParam.pageNum=1; - qExportParam.pageSize=5000; + qExportParam.pageSize=10000; listEmisSettleInvoiceChRecord(qExportParam).then(response => { if (response.code === 200) { diff --git a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue index d32cef6c..a167027f 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue @@ -125,12 +125,6 @@ export default { props:{ settleBillNo:{ type:String - }, - settleType:{ - type:String - }, - billList:{ - type:Array } }, components: { EmisMonthpayAccountPicker,PayeePicker }, @@ -183,13 +177,13 @@ export default { // } }, watch: { - "settleBillNo": { - handler (newValue, oldValue) { - this.form.settleBillNo = this.settleBillNo; - this.initData(); - }, - deep: true - }, + // "settleBillNo": { + // handler (newValue, oldValue) { + // this.form.settleBillNo = this.settleBillNo; + // this.initData(); + // }, + // deep: true + // }, }, created() { this.initData();