diff --git a/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue b/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue index ed357bf39a..0942047069 100644 --- a/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue +++ b/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue @@ -87,9 +87,11 @@ + - + + diff --git a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue index f54572f1a0..a972f3dcb7 100644 --- a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue +++ b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue @@ -102,6 +102,7 @@ {{ formobj.partProceRemarks }} +
判决信息
判决日期
@@ -117,14 +118,10 @@ - +
判决备注
{{ formobj.judgRemarks }} - -
判决生效后回款金额
- - @@ -132,16 +129,12 @@ -
车辆信息
- - - - - - - - +
预执行立案信息
+ +
当前欠款金额
+ {{ formobj.amountInArear }} +
预执行立案日期
@@ -154,10 +147,30 @@ + + -
执行立案金额
+
预执行立案金额
{{ formobj.executeRegisMoney }} + +
其中执行欠款金额
+ + + +
其中执行费用金额
+ + + + + +
预计申请坏账金额
+ {{ formobj.badDebtAmount }} + + +
备注
+ + @@ -167,6 +180,15 @@ +
车辆信息
+ + + + + + + + @@ -238,6 +260,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] }, rules: {} @@ -251,6 +278,24 @@ export default { } }) }, + getNumber(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('$#$', '.'); // 只保留一个小数点 + /^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 + }, showAdd(sid) { this.viewTitle = '【新增】执行立案申请' this.$nextTick(() => { @@ -290,8 +335,11 @@ export default { } }) }, - judgPayMoneyInput() { - this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0) + totalMoney() { + // 预执行立案金额 = 其中执行欠款金额 + 其中执行费用金融 + this.formobj.executeRegisMoney = Math.round((parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0) + parseFloat(this.formobj.executeExpenseAmount !== '' ? this.formobj.executeExpenseAmount : 0)) * 100) / 100 + // 预计申请坏账金额 = 当前欠款金额 - 其中执行欠款金额 + this.formobj.badDebtAmount = Math.round((parseFloat(this.formobj.amountInArear !== '' ? this.formobj.amountInArear : 0) + parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0)) * 100) / 100 }, executeDeadlineChange(value) { const choose = this.executeDeadline_list.filter((item) => item.dictKey === value) @@ -390,6 +438,11 @@ export default { useOrgName: '', useOrgSid: '', userSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] } this.image_list = [] @@ -413,6 +466,10 @@ export default { justify-content: flex-start; align-items: center; } +.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { + margin-left: 140px !important; + width: calc(100% - 135px); +} /deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo { line-height: 15px !important; display: flex; diff --git a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue index 4718429c7b..5f5a7dbeff 100644 --- a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue +++ b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue @@ -100,6 +100,7 @@ {{ formobj.partProceRemarks }} +
判决信息
判决日期
@@ -115,14 +116,10 @@ - +
判决备注
{{ formobj.judgRemarks }} - -
判决生效后回款金额
- {{ formobj.judgPayMoney }} - @@ -130,16 +127,12 @@ -
车辆信息
- - - - - - - - +
预执行立案信息
+ +
当前欠款金额
+ {{ formobj.amountInArear }} +
预执行立案日期
{{ formobj.executeRegisDate }} @@ -148,10 +141,30 @@
执行时限
{{ formobj.executeDeadline }} + + -
执行立案金额
+
预执行立案金额
{{ formobj.executeRegisMoney }} + +
其中执行欠款金额
+ {{ formobj.executeAmountInArear }} + + +
其中执行费用金额
+ {{ formobj.executeExpenseAmount }} + + + + +
预计申请坏账金额
+ {{ formobj.badDebtAmount }} + + +
备注
+ {{ formobj.remarks }} + @@ -159,6 +172,15 @@ +
车辆信息
+ + + + + + + + @@ -224,6 +246,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] }, rules: {} @@ -309,6 +336,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] } this.$emit('doback') diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue index 51b5f64b13..8d83869a1c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue @@ -103,6 +103,7 @@ {{ formobj.partProceRemarks }} +
判决信息
判决日期
@@ -118,14 +119,10 @@ - +
判决备注
{{ formobj.judgRemarks }} - -
判决生效后回款金额
- {{ formobj.judgPayMoney }} - @@ -133,16 +130,12 @@ -
车辆信息
- - - - - - - - +
预执行立案信息
+ +
当前欠款金额
+ {{ formobj.amountInArear }} +
预执行立案日期
{{ formobj.executeRegisDate }} @@ -151,10 +144,30 @@
执行时限
{{ formobj.executeDeadline }} + + -
执行立案金额
+
预执行立案金额
{{ formobj.executeRegisMoney }} + +
其中执行欠款金额
+ {{ formobj.executeAmountInArear }} + + +
其中执行费用金额
+ {{ formobj.executeExpenseAmount }} + + + + +
预计申请坏账金额
+ {{ formobj.badDebtAmount }} + + +
备注
+ {{ formobj.remarks }} + @@ -162,6 +175,15 @@ +
车辆信息
+ + + + + + + + @@ -266,6 +288,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] }, rules: {}, diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue index 912f94e86b..2a7e2798c1 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue @@ -101,6 +101,7 @@ {{ formobj.partProceRemarks }} +
判决信息
判决日期
@@ -116,14 +117,10 @@ - +
判决备注
{{ formobj.judgRemarks }} - -
判决生效后回款金额
- - @@ -131,16 +128,12 @@ -
车辆信息
- - - - - - - - +
预执行立案信息
+ +
当前欠款金额
+ {{ formobj.amountInArear }} +
预执行立案日期
@@ -153,10 +146,30 @@ + + -
执行立案金额
+
预执行立案金额
{{ formobj.executeRegisMoney }} + +
其中执行欠款金额
+ + + +
其中执行费用金额
+ + + + + +
预计申请坏账金额
+ {{ formobj.badDebtAmount }} + + +
备注
+ + @@ -166,6 +179,15 @@ +
车辆信息
+ + + + + + + + @@ -237,6 +259,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] }, rules: {} @@ -267,6 +294,24 @@ export default { } }) }, + getNumber(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('$#$', '.'); // 只保留一个小数点 + /^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 + }, showInfo(sid) { this.viewTitle = '【编辑】执行立案申请' this.$nextTick(() => { @@ -287,8 +332,11 @@ export default { } }) }, - judgPayMoneyInput() { - this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0) + totalMoney() { + // 预执行立案金额 = 其中执行欠款金额 + 其中执行费用金融 + this.formobj.executeRegisMoney = Math.round((parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0) + parseFloat(this.formobj.executeExpenseAmount !== '' ? this.formobj.executeExpenseAmount : 0)) * 100) / 100 + // 预计申请坏账金额 = 当前欠款金额 - 其中执行欠款金额 + this.formobj.badDebtAmount = Math.round((parseFloat(this.formobj.amountInArear !== '' ? this.formobj.amountInArear : 0) + parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0)) * 100) / 100 }, executeDeadlineChange(value) { const choose = this.executeDeadline_list.filter((item) => item.dictKey === value) @@ -368,6 +416,10 @@ export default { .addinputInfo { margin-left: 140px !important; } +.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { + margin-left: 140px !important; + width: calc(100% - 135px); +} .tlineheightb { display: flex; flex-direction: row; diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue index c189def962..af1a6eaf64 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue @@ -100,6 +100,7 @@ {{ formobj.partProceRemarks }} +
判决信息
判决日期
@@ -115,14 +116,10 @@ - +
判决备注
{{ formobj.judgRemarks }} - -
判决生效后回款金额
- {{ formobj.judgPayMoney }} - @@ -130,16 +127,12 @@ -
车辆信息
- - - - - - - - +
预执行立案信息
+ +
当前欠款金额
+ {{ formobj.amountInArear }} +
预执行立案日期
{{ formobj.executeRegisDate }} @@ -148,10 +141,30 @@
执行时限
{{ formobj.executeDeadline }} + + -
执行立案金额
+
预执行立案金额
{{ formobj.executeRegisMoney }} + +
其中执行欠款金额
+ {{ formobj.executeAmountInArear }} + + +
其中执行费用金额
+ {{ formobj.executeExpenseAmount }} + + + + +
预计申请坏账金额
+ {{ formobj.badDebtAmount }} + + +
备注
+ {{ formobj.remarks }} + @@ -159,6 +172,15 @@ +
车辆信息
+ + + + + + + + @@ -224,6 +246,11 @@ export default { taskId: '', useOrgName: '', useOrgSid: '', + amountInArear: '', + executeAmountInArear: '', + executeExpenseAmount: '', + badDebtAmount: '', + remarks: '', zxclFiles: [] }, // 环节所需参数 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index 9c3d2a963d..9310d38e24 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -1259,6 +1259,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) {