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){ 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..1204847 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);