From c110e665d6fb7ef95a7d657788b71c83b6bdfdb6 Mon Sep 17 00:00:00 2001 From: 13181781697 <14369705+gaiya001@user.noreply.gitee.com> Date: Sat, 18 May 2024 17:44:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E5=89=8D=E7=AB=AF=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=A6=81=E6=AD=A2=E5=86=92=E6=B3=A1=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=94=B5=E5=AD=90=E7=A8=8E=E5=8A=A1=E5=B1=80?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA120=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-ui/src/main.js | 2 ++ .../src/views/freedom/taxBureauLogin/index.vue | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jianshui-ui/src/main.js b/jianshui-ui/src/main.js index 0fa21a0..597186f 100644 --- a/jianshui-ui/src/main.js +++ b/jianshui-ui/src/main.js @@ -35,6 +35,8 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' +//全局修改默认配置，点击空白处不能关闭弹窗 +Element.Dialog.props.closeOnClickModal.default = false // 全局方法挂载 Vue.prototype.getDicts = getDicts diff --git a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue index dd19aaa..362b607 100644 --- a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue +++ b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue @@ -45,6 +45,7 @@ class="dialog" title="短信登录" :visible.sync="dialogVisible" + :close-on-click-modal="false" width="550px" >
@@ -63,13 +64,14 @@
- 取 消 + 取 消 确 定 @@ -84,7 +86,7 @@ - 取 消 + 取 消 确 定 @@ -128,7 +130,7 @@ export default { anewLoginBtnLoading:false, getyzmBtnloading:false, getQrCodeBtnloading:false, - countdown:60, + countdown:120, timec: null, // 定时器 }; }, @@ -216,7 +218,7 @@ export default { } else { // 倒计时结束，重置状态 this.getyzmBtnloading = false; - this.countdown = 60; + this.countdown = 120; clearInterval(this.timec); // 清除定时器 } }, 1000); @@ -306,6 +308,7 @@ export default { if(this.loginKey.id !== '' && this.loginKey.key !== ''){ this.getRpaAuthStatus() } + this.dialogVisible= true }, beforeDestroy(){ window.clearInterval(this.timer); From efff0c8e2d396b7d747a252128143b252616e7ed Mon Sep 17 00:00:00 2001 From: 13181781697 <14369705+gaiya001@user.noreply.gitee.com> Date: Sat, 18 May 2024 17:46:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E7=94=B5=E5=AD=90=E7=A8=8E=E5=8A=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=B9=E7=AA=97=E5=88=A0=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-ui/src/views/freedom/taxBureauLogin/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue index 362b607..1204847 100644 --- a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue +++ b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue @@ -308,7 +308,6 @@ export default { if(this.loginKey.id !== '' && this.loginKey.key !== ''){ this.getRpaAuthStatus() } - this.dialogVisible= true }, beforeDestroy(){ window.clearInterval(this.timer); From 1d00d454a2b2f44d9ed0fd2724a3c251342dc28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 20 May 2024 11:05:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:1501=E5=88=A4=E6=96=AD=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=A7=8D=E7=B1=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java index cc03842..e5f6574 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java @@ -243,7 +243,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { } } - if (StringUtils.isNoneBlank(billInfo.getInvoiceType()) && !environment.getProperty("billing.limit.nsrsbh").equals(billInfo.getInvoiceType())){ + if (StringUtils.isNoneBlank(billInfo.getInvoiceType()) && !environment.getProperty("billing.limit.invoiceType").equals(billInfo.getInvoiceType())){ throw new RuntimeException("所开发票不是普票，请选择发票种类为普票"); } if (billDetailList != null && billDetailList.size() > 0){