转账凭证
-
![]()
+
无转账凭证
@@ -282,12 +284,20 @@ const getRefund = async function () {
}
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
- ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+ ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
- ElMessage.error('精网号必须为数字')
- return
- }
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
+ }
const params = {
pageNum: pagination.value.pageNum,
@@ -295,7 +305,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,
name: searchForm.value.name,
- markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
+ markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,
statuses: statusesParam.value,//10:地区财务待审核;12:地区财务驳回;
// 20:地区负责人待审核;22:地区负责人驳回;
@@ -495,12 +505,12 @@ const reset = function () {
getRefund()
}
const handlePageSizeChange = function (val) {
- pagination.value.pageSize = val
- getRefund()
+ pagination.value.pageSize = val
+ getRefund()
}
const handleCurrentChange = function (val) {
- pagination.value.pageNum = val
- getRefund()
+ pagination.value.pageNum = val
+ getRefund()
}
onMounted(() => {
console.log('???????????????????', adminData.value)
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 3389bd7..5a64898 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -421,17 +421,18 @@ const getRefund = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
- if (searchForm.value.jwcode) {
- const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
- if (!isPositiveInteger) {
- ElMessage.error('请输入正确的精网号')
- return;
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
}
- }
if (searchForm.value.paymentCurrency) {
payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
@@ -599,10 +600,18 @@ const exportExcel = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
+ }
if (searchForm.value.paymentCurrency) {
payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 6fe8560..7a4b1de 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -103,7 +103,8 @@
style="margin-top: 1vh;">
-
+
退款申请信息
@@ -479,19 +480,20 @@ const getRefund = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
- if (searchForm.value.jwcode) {
- const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
- if (!isPositiveInteger) {
- ElMessage.error('请输入正确的精网号')
- return;
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
}
- }
- const params = {
+ const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
cashRecordDTO: {
@@ -652,21 +654,22 @@ const exportExcel = async function () {
}
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
- ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
-
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
- if (searchForm.value.jwcode) {
- const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
- if (!isPositiveInteger) {
- ElMessage.error('请输入正确的精网号')
- return;
+ ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : '';
+
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
}
- }
- const params = {
+ const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
cashRecordDTO: {
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 6401d72..fd0d6cb 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -104,7 +104,8 @@
style="margin-top: 1vh;">
-
+
退款申请信息
@@ -477,19 +478,20 @@ const getRefund = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
- if (searchForm.value.jwcode) {
- const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
- if (!isPositiveInteger) {
- ElMessage.error('请输入正确的精网号')
- return;
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
}
- }
- const params = {
+ const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
cashRecordDTO: {
@@ -633,10 +635,18 @@ const exportExcel = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
+ }
const params = {
pageNum: pagination.value.pageNum,
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index dded353..e763ee4 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -115,7 +115,8 @@
style="margin-top: 1vh;">
-
+
@@ -287,25 +288,26 @@ const getRefund = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
- // ElMessage.error('精网号必须为数字')
- // return
- // }
- if (searchForm.value.jwcode) {
- const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
- if (!isPositiveInteger) {
- ElMessage.error('请输入正确的精网号')
- return;
+ if (searchForm.value.jwcode) {
+ const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+ if (!isPositiveInteger) {
+ ElMessage.error('请输入正确的精网号')
+ return;
+ }
+ }
+ // 增加精网号长度限制,防止后端400错误
+ if (searchForm.value.jwcode.length > 8) {
+ ElMessage.error('精网号长度不能超过8位')
+ return;
}
- }
- const params = {
+ const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
- markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
+ markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statusParam.value,//10:地区财务待审核;12:地区财务驳回;
// 20:地区负责人待审核;22:地区负责人驳回;
@@ -375,25 +377,25 @@ const submitEdit = async function () {
jwcode: editRow.value.jwcode,
paymentAmount: editRow.value.paymentAmount,
paymentCurrency: editRow.value.paymentCurrency,
- newRefundGold: (editForm.value.partRefundGold*100),
- newRefundFree: (editForm.value.partRefundFree)*100
+ newRefundGold: (editForm.value.partRefundGold * 100),
+ newRefundFree: (editForm.value.partRefundFree) * 100
}
console.log(editRow.value.goodsName);
-
+
if (editRow.value.goodsName != '金币充值') {
params.newRefundGold = ''
- params.newRefundFree = ''
+ params.newRefundFree = ''
}
- if(editRow.value.goodsName == '金币充值'){
- if(editForm.value.partRefundGold>editRow.value.gold){
- ElMessage.error('退款金币数不能大于原金币数')
- return
- }
- if(editForm.value.partRefundFree>editRow.value.free){
- ElMessage.error('退款免费金币数不能大于原免费金币数')
- return
- }
+ if (editRow.value.goodsName == '金币充值') {
+ if (editForm.value.partRefundGold > editRow.value.gold) {
+ ElMessage.error('退款金币数不能大于原金币数')
+ return
+ }
+ if (editForm.value.partRefundFree > editRow.value.free) {
+ ElMessage.error('退款免费金币数不能大于原免费金币数')
+ return
+ }
}
const result = await API({
url: '/Money/update',