Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

jianshui-ui
dongxiaoke 1 year ago
commit d489e8be12
  1. 2
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
  2. 2
      jianshui-ui/src/main.js
  3. 10
      jianshui-ui/src/views/freedom/taxBureauLogin/index.vue

@ -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("所开发票不是普票,请选择发票种类为普票"); throw new RuntimeException("所开发票不是普票,请选择发票种类为普票");
} }
if (billDetailList != null && billDetailList.size() > 0){ if (billDetailList != null && billDetailList.size() > 0){

@ -35,6 +35,8 @@ import DictTag from '@/components/DictTag'
import VueMeta from 'vue-meta' import VueMeta from 'vue-meta'
// 字典数据组件 // 字典数据组件
import DictData from '@/components/DictData' import DictData from '@/components/DictData'
//全局修改默认配置,点击空白处不能关闭弹窗
Element.Dialog.props.closeOnClickModal.default = false
// 全局方法挂载 // 全局方法挂载
Vue.prototype.getDicts = getDicts Vue.prototype.getDicts = getDicts

@ -45,6 +45,7 @@
class="dialog" class="dialog"
title="短信登录" title="短信登录"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
width="550px" width="550px"
> >
<div class="dialog_title"> <div class="dialog_title">
@ -63,13 +64,14 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button> <el-button @click.stop="dialogVisible = false"> </el-button>
<el-button type="primary" @click="yzmloginBtn()"> </el-button> <el-button type="primary" @click="yzmloginBtn()"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="责任人" title="责任人"
:visible.sync="zzrdialogVisible" :visible.sync="zzrdialogVisible"
:close-on-click-modal="false"
width="550px" width="550px"
> >
<el-form ref="form" :model="form" label-width="60px" label-position="left" align="center" class="form"> <el-form ref="form" :model="form" label-width="60px" label-position="left" align="center" class="form">
@ -84,7 +86,7 @@
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="zzrdialogVisible = false"> </el-button> <el-button @click.stop="zzrdialogVisible = false"> </el-button>
<el-button type="primary" @click="zzrloginBtn()"> </el-button> <el-button type="primary" @click="zzrloginBtn()"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -128,7 +130,7 @@ export default {
anewLoginBtnLoading:false, anewLoginBtnLoading:false,
getyzmBtnloading:false, getyzmBtnloading:false,
getQrCodeBtnloading:false, getQrCodeBtnloading:false,
countdown:60, countdown:120,
timec: null, // timec: null, //
}; };
}, },
@ -216,7 +218,7 @@ export default {
} else { } else {
// //
this.getyzmBtnloading = false; this.getyzmBtnloading = false;
this.countdown = 60; this.countdown = 120;
clearInterval(this.timec); // clearInterval(this.timec); //
} }
}, 1000); }, 1000);

Loading…
Cancel
Save