@@ -10,39 +10,35 @@
- + - + - + - + - + 至 - + - + 至 - + - + - + - +
@@ -54,19 +50,16 @@
配件销售单开票申请列表
-
- - - + + + @@ -76,16 +69,16 @@ {{ scope.row.nodeState }} - - - - - - - - - - + + + + + + + + + + From 73c0e19950772e62fae4e071eaab55eb0d37dbf8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 7 Mar 2025 17:06:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=AF=AF=E5=B7=AE=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=83=BD=E5=A1=AB=E5=86=99=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/procurement/procurementAdd.vue | 25 ++++++++++++++++++- .../workFlow/caigouFlow/procurementEdit.vue | 25 ++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index de13c1712d..dd78c9e356 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -243,7 +243,7 @@
应付金额：
- {{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费： - 优惠： + 误差调整： + {{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费： - 优惠： + 误差调整： @@ -511,6 +511,29 @@ export default { } return val }, + inputByAstrict(val, limit) { + let value = val.replace(/[^\-\d.]/g, '') // 只能输入'.'和'-'及数字 + value = value.replace(/^\./g, '') // 第一个字符不能是'.' + value = value.replace(/\.{2,}/g, '.') // 不能连续输入'.' + value = value.replace(/(\.\d+)\./g, '$1') // '.'后面不能在输入'0' + value = value.replace(/(-)\./g, '$1') // '-'后面不能输入'.' + value = value.replace(/\-{2,}/g, '-') // 只保留一个'-' + value = value.replace(/(\d+|\.)-/g, '$1') // 数字和'.'后面不能跟'-', 例如11- 或 11.- + value = value.replace(/-(0){2,}/g, '$1') // 不能出现-00、-001、-0001等 + value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01、-02等 + value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉0， 取后面的数字 + value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15整数 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + value = value.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + value = value.replace(reg, '$1.$2') + } + return value + }, purchaseTypeChange(value) { const choose = this.procurementType_list.filter((item) => item.dictValue === value) if (choose !== null && choose.length > 0) { diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue index b63da66b25..f020b952b2 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue @@ -242,7 +242,7 @@
应付金额：
- {{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费： - 优惠： + 误差调整： + {{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费： - 优惠： + 误差调整： @@ -502,6 +502,29 @@ export default { } return val }, + inputByAstrict(val, limit) { + let value = val.replace(/[^\-\d.]/g, '') // 只能输入'.'和'-'及数字 + value = value.replace(/^\./g, '') // 第一个字符不能是'.' + value = value.replace(/\.{2,}/g, '.') // 不能连续输入'.' + value = value.replace(/(\.\d+)\./g, '$1') // '.'后面不能在输入'0' + value = value.replace(/(-)\./g, '$1') // '-'后面不能输入'.' + value = value.replace(/\-{2,}/g, '-') // 只保留一个'-' + value = value.replace(/(\d+|\.)-/g, '$1') // 数字和'.'后面不能跟'-', 例如11- 或 11.- + value = value.replace(/-(0){2,}/g, '$1') // 不能出现-00、-001、-0001等 + value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01、-02等 + value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉0， 取后面的数字 + value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15整数 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + value = value.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + value = value.replace(reg, '$1.$2') + } + return value + }, purchaseTypeChange(value) { const choose = this.procurementType_list.filter((item) => item.dictValue === value) if (choose !== null && choose.length > 0) { From 89aee7557ade5a120e084521d69bf7811eca1a8c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 7 Mar 2025 17:20:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93?= =?UTF-8?q?=E9=A1=B9=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=9C=AA=E4=B8=8A=E4=BC=A0=E3=80=81?= =?UTF-8?q?=E9=A2=84=E6=8F=90=E5=8F=82=E6=95=B0=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue | 2 +- .../bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue | 2 +- .../specialrebatecheck/specialrebatetobechecked.vue | 2 +- .../specialrebatemanagement/specialrebatemanagement.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 0b0efb2729..5a0e9162ce 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -891,7 +891,7 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') { + if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'withholdCost' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue index 14b4a51766..94bb57eaed 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue @@ -615,7 +615,7 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') { + if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'topAmount' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue index 4b656980b2..efe65423f9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -877,7 +877,7 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') { + if (column.property === 'estimateRebate' || column.property === 'withholdCost' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue index 6b95da0efe..209c2f3162 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue @@ -601,7 +601,7 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') { + if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) {