From ac72656e8172d93c97898b27ac1bed0d057a604e Mon Sep 17 00:00:00 2001 From: zhangyongQINGHU <15371817+zhangyongqinghu@user.noreply.gitee.com> Date: Sat, 22 Nov 2025 11:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveFinance.vue | 39 +- .../moneyManage/receiveDetail/receiveHead.vue | 37 +- .../moneyManage/receiveDetail/receiveManage.vue | 2821 ++++++++++---------- .../moneyManage/receiveDetail/receiveService.vue | 8 +- .../moneyManage/refundDetail/refundCharge.vue | 21 +- .../moneyManage/refundDetail/refundFinance.vue | 30 +- .../moneyManage/refundDetail/refundHeader.vue | 23 +- .../moneyManage/refundDetail/refundService.vue | 15 +- 8 files changed, 1518 insertions(+), 1476 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 59706cc..e21b9f9 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -762,10 +762,10 @@ const exportExcel = async function () { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } - if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { - ElMessage.error('精网号只能是数字') - return - } + // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + // ElMessage.error('精网号只能是数字') + // return + // } const cashRoleId = '1'; const submitterMarket = adminData.value.markets; @@ -882,10 +882,10 @@ const getlist = async () => { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } - if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { - ElMessage.error('精网号只能是数字') - return - } + // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + // ElMessage.error('精网号只能是数字') + // return + // } // 地区财务固定参数:角色ID=1,按标签页筛选状态 const cashRoleId = '1'; @@ -997,7 +997,6 @@ const submitRefund = async () => { // 2.2 搜索与重置 const search = () => { getlist(); - ElMessage.success('查询成功'); }; const reset = () => { @@ -1239,17 +1238,17 @@ const getAdminData = async () => { adminData.value = result; // 超级管理员判断(仅用于角色切换权限) - if (adminData.value.roleId === 2) { - superAdmin.value = true; - // 管理员所属地区提示 - if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') { - ElMessageBox.alert( - '管理员账号仅显示所属地区的财务数据,请确认地区设置', - '温馨提示', - { type: 'warning' } - ); - } - } + // if (adminData.value.roleId === 2) { + // superAdmin.value = true; + // // 管理员所属地区提示 + // if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') { + // ElMessageBox.alert( + // '管理员账号仅显示所属地区的财务数据,请确认地区设置', + // '温馨提示', + // { type: 'warning' } + // ); + // } + // } } catch (error) { console.error('管理员信息获取失败:', error); ElMessage.error('管理员信息加载异常'); diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index 0320d88..4224f4c 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -617,10 +617,10 @@ const exportExcel = async function () { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } - if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { - ElMessage.error('精网号只能是数字') - return - } + // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + // ElMessage.error('精网号只能是数字') + // return + // } const cashRoleId = '2'; const submitterMarket = adminData.value.markets; @@ -785,10 +785,10 @@ const getlist = async () => { } } - if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { - ElMessage.error('精网号只能是数字') - return - } + // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + // ElMessage.error('精网号只能是数字') + // return + // } const result = await request({ url: '/cashCollection/selectCollection', @@ -878,7 +878,6 @@ const submitRefund = async () => { // 2.2 搜索与重置 const search = () => { getlist(); - ElMessage.success('查询成功'); }; const reset = () => { @@ -1044,16 +1043,16 @@ const getAdminData = async () => { adminData.value = result; // 超级管理员判断(仅用于角色切换权限) - if (adminData.value.roleId === 2) { - // 管理员所属地区提示 - if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') { - ElMessageBox.alert( - '管理员账号仅显示所属地区的财务数据,请确认地区设置', - '温馨提示', - { type: 'warning' } - ); - } - } + // if (adminData.value.roleId === 2) { + // // 管理员所属地区提示 + // if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') { + // ElMessageBox.alert( + // '管理员账号仅显示所属地区的财务数据,请确认地区设置', + // '温馨提示', + // { type: 'warning' } + // ); + // } + // } } catch (error) { console.error('管理员信息获取失败:', error); ElMessage.error('管理员信息加载异常'); diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index b5c2ed0..917d63b 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -1,367 +1,367 @@ \ No newline at end of file diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 46b3bf2..7ce9682 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -527,10 +527,10 @@ const getlist = async () => { } } - if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { - ElMessage.error('精网号只能是数字') - return - } + // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + // ElMessage.error('精网号只能是数字') + // return + // } const result = await request({ url: '/cashCollection/selectCollection', diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index aa989b9..3389bd7 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -421,10 +421,17 @@ 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 && !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.paymentCurrency) { payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency) @@ -592,10 +599,10 @@ 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 && !isNumber(searchForm.value.jwcode)) { + // ElMessage.error('精网号必须为数字') + // 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 3d1c377..6fe8560 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -479,12 +479,19 @@ 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 && !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; } + } - const params = { + const params = { pageNum: pagination.value.pageNum, pageSize: pagination.value.pageSize, cashRecordDTO: { @@ -647,12 +654,19 @@ 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 && !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; } + } - 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 8623f93..a9e94c9 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -477,12 +477,19 @@ 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 && !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; } + } - const params = { + const params = { pageNum: pagination.value.pageNum, pageSize: pagination.value.pageSize, cashRecordDTO: { @@ -624,10 +631,10 @@ 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 && !isNumber(searchForm.value.jwcode)) { + // ElMessage.error('精网号必须为数字') + // return + // } const params = { pageNum: pagination.value.pageNum, diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 666538f..dded353 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -287,12 +287,19 @@ 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 && !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; } + } - const params = { + const params = { pageNum: pagination.value.pageNum, pageSize: pagination.value.pageSize, cashRecordDTO: {