diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue index c35adf14e6..9467f9c125 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue @@ -688,6 +688,10 @@ export default { } }, handlePayment() { + if (this.formobj.payCode === '' || this.formobj.payCode === null || this.formobj.payCode === undefined) { + this.$message({ showClose: true, type: 'error', message: '请先刷新浏览器页面后再进行操作' }) + return + } this.formobj.sids = this.sids this.submitdisabled = true req.updateAllState(this.formobj).then((resp) => { @@ -704,6 +708,10 @@ export default { }) }, handlePass() { + if (this.formobj.payCode === '' || this.formobj.payCode === null || this.formobj.payCode === undefined) { + this.$message({ showClose: true, type: 'error', message: '请先刷新浏览器页面后再进行操作' }) + return + } this.formobj.sids = this.sids this.formobj.name = window.sessionStorage.getItem('name') this.formobj.userSid = window.sessionStorage.getItem('userSid') diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java index 2459fbc957..1b7811a618 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java @@ -51,9 +51,10 @@ import org.springframework.scheduling.annotation.EnableScheduling; "com.yxt.common.base.config", "com.yxt.anrui.fin" }) -@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin", - "com.yxt.anrui.portal", "com.yxt.anrui.buscenter", - "com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter","com.yxt.*"}) +//@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin", +// "com.yxt.anrui.portal", "com.yxt.anrui.buscenter", +// "com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter"}) +@EnableFeignClients(basePackages = {"com.yxt.*"}) public class AnruiFinApplication { public static void main(String[] args) { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue index d16c964d0b..9e3623d0c1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue @@ -116,7 +116,7 @@
*上传金额
- +
其中待确定金额
@@ -257,6 +257,26 @@ export default { this.formobj = row }) }, + getSpecialNumber(val, limit) { + val = val.replace(/[^0-9.-]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点 + val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 val = val.replace(/^00/, '0.') // 开头不能有两个0 diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue index beb83e53c9..9bc14d583a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue @@ -112,12 +112,14 @@ export default { }, methods: { - getNumber(val, limit) { - val = val.replace(/[^0-9.]/g, '') // 保留数字 + getSpecialNumber(val, limit) { + val = val.replace(/[^0-9.-]/g, '') // 保留数字 val = val.replace(/^00/, '0.') // 开头不能有两个0 val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 - val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点 + val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点 + val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号 /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' const reg = new RegExp(str) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index 384d25a15e..2d627c2529 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -92,7 +92,7 @@
*上传金额
- +
其中待确定金额
@@ -245,6 +245,26 @@ export default { this.formobj = row }) }, + getSpecialNumber(val, limit) { + val = val.replace(/[^0-9.-]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点 + val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 val = val.replace(/^00/, '0.') // 开头不能有两个0 diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index da3c9408cd..8a92d04cf0 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -300,7 +300,7 @@
开票单位
- + @@ -988,6 +988,15 @@ export default { } else { this.formobj.billTypeKey = '' } + // 维修单类型参数每次发生改变，清除之前所选客户信息，需重新选择 + this.formobj.customerName = '' + this.formobj.customerSid = '' + this.formobj.mobile = '' + this.formobj.vehMark = '' + this.formobj.vinNo = '' + this.formobj.vehModel = '' + this.formobj.customerSource = '' + this.formobj.customerVehicleSid = '' }, changeSubject(value) { const choose = this.subject_list.filter((item) => item.dictValue === value)