From c5b7deac2e3db721c7bdfcbd4701a7cbb9deeea5 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Tue, 11 Nov 2025 16:09:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=8E=B0=E9=87=91=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=A4=A7=E5=B0=8F=E6=95=B4=E4=BD=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/receiveDetail/receiveFinance.vue | 2 +- src/views/moneyManage/receiveDetail/receiveHead.vue | 2 +- src/views/moneyManage/receiveDetail/receiveManage.vue | 2 +- src/views/moneyManage/receiveDetail/receiveService.vue | 2 +- src/views/moneyManage/refundDetail/refundCharge.vue | 2 +- src/views/moneyManage/refundDetail/refundFinance.vue | 2 +- src/views/moneyManage/refundDetail/refundHeader.vue | 2 +- src/views/moneyManage/refundDetail/refundService.vue | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 98a790f..46be806 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -97,7 +97,7 @@
- diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index 63ca0a5..4a1c9f2 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -86,7 +86,7 @@
- diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index cb76943..1234529 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -97,7 +97,7 @@
- diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index e5721c1..564dcde 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -73,7 +73,7 @@
- diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 68485b8..6bf08ba 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -57,7 +57,7 @@ - + diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 9663d8d..2776384 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -56,7 +56,7 @@ - + diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index e340243..76cbf7e 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -57,7 +57,7 @@ - + diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index b0b3a17..2f4091e 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -55,7 +55,7 @@ - + From 0f37b2696cff79eae34e81c38469fad11e3c808a Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Tue, 11 Nov 2025 16:35:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveFinance.vue | 110 ++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 46be806..711a22d 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -58,6 +58,8 @@
查询 重置 + 导出excel + 查看导出列表
@@ -231,6 +233,38 @@ + + + + + + + + + + + + + + + + + @@ -688,6 +722,80 @@ const closeConfirmRefund = () => { textContent.value = '' } +//导出相关 +const exportListVisible = ref(false) +const exportList = ref([]) +const exportExcel = async function () { + const statusParam = ref([30, 32, 40, 41])// 默认：看不到进度没到这里的 + if (searchData.value.statuses === '待审核') { + statusParam.value = [30] + } else if (searchData.value.statuses === '审核通过') { + statusParam.value = [40] + } else if (searchData.value.statuses === '已驳回') { + statusParam.value = [32] + } else if (searchData.value.statuses === '退款成功') { + statusParam.value = [41] + } else { + statusParam.value = [30, 32, 40, 41] + } + + const params = { + pageNum: pagination.value.pageNum, + pageSize: pagination.value.pageSize, + cashRecordDTO: { + jwcode: searchData.value.jwcode, + name: searchData.value.name, + markets: searchData.value.markets, + goodsNames: searchData.value.goodsName, + statuses: statusParam.value, + paymentCurrency: searchData.value.paymentCurrency, + payType: searchData.value.payType, + startTime: getTime.value && getTime.value[0] ? dayjs(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", + endTime: getTime.value && getTime.value[1] ? dayjs(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", + adminId: adminData.value.id + } + } + + const res = await API({ url: '/export/exportFinance', data: params }) + if (res.code === 200) { + ElMessage.success('导出成功') + } else { + ElMessage.error(res.msg || '导出失败') + } +} +const openExportList = () => { + getExportList() + exportListVisible.value = true +} +const getExportList = async () => { + exportListLoading.value = true + try { + const result = await API({ url: '/export/export' }) + if (result.code === 200) { + const filteredData = result.data.filter(item => { + return item.type === 12 + }) + exportList.value = filteredData + } else { + ElMessage.error(result.msg || '获取导出列表失败') + } + } catch (error) { + console.error('获取导出列表出错:', error) + ElMessage.error('获取导出列表失败，请稍后重试') + } finally { + exportListLoading.value = false + } +} +const downloadExportFile = (item) => { + if (item.state === 2) { + const link = document.createElement('a') + link.href = item.url + link.download = item.fileName + link.click() + } else { + ElMessage.warning('文件还在导出中，请稍后再试') + } +} // 2.1 数据加载：获取地区财务订单列表 const getlist = async () => { @@ -771,7 +879,7 @@ const submitRefund = async () => { } if (refundFormData.value.refundModel == 0) { refundFormData.value.partRefundGold = refundFormData.value.permanentGold, - refundFormData.value.partRefundFree = refundFormData.value.freeGold + refundFormData.value.partRefundFree = refundFormData.value.freeGold } const result = await request({ url: '/Money/addOnline', From c7686ab1189f90aed0017fbd095e5447d0018578 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Wed, 12 Nov 2025 10:22:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveFinance.vue | 93 ++++++++++++++++------ 1 file changed, 68 insertions(+), 25 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 711a22d..b70ff15 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -725,55 +725,68 @@ const closeConfirmRefund = () => { //导出相关 const exportListVisible = ref(false) const exportList = ref([]) +const exportListLoading = ref(false) const exportExcel = async function () { - const statusParam = ref([30, 32, 40, 41])// 默认：看不到进度没到这里的 - if (searchData.value.statuses === '待审核') { - statusParam.value = [30] - } else if (searchData.value.statuses === '审核通过') { - statusParam.value = [40] - } else if (searchData.value.statuses === '已驳回') { - statusParam.value = [32] - } else if (searchData.value.statuses === '退款成功') { - statusParam.value = [41] + + let payCurrencySelect = ''; + let goodsName = ''; + + // 处理时间范围 + if (getTime.value && getTime.value.length === 2) { + searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss'); + searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss'); } else { - statusParam.value = [30, 32, 40, 41] + searchData.value.startTime = ''; + searchData.value.endTime = ''; } + // 处理产品名称（级联选择取最后一级） + if (searchData.value.goodsName) { + goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]; + } + + // 处理付款币种（转ID） + if (searchData.value.paymentCurrency) { + payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); + } + + const cashRoleId = '1'; + const submitterMarket = adminData.value.markets; + searchData.value.status = 46; const params = { - pageNum: pagination.value.pageNum, - pageSize: pagination.value.pageSize, - cashRecordDTO: { - jwcode: searchData.value.jwcode, - name: searchData.value.name, - markets: searchData.value.markets, - goodsNames: searchData.value.goodsName, - statuses: statusParam.value, - paymentCurrency: searchData.value.paymentCurrency, - payType: searchData.value.payType, - startTime: getTime.value && getTime.value[0] ? dayjs(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", - endTime: getTime.value && getTime.value[1] ? dayjs(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", - adminId: adminData.value.id + ...pageInfo.value, + cashCollection: { + ...searchData.value, + submitterId: adminData.value.id, + receivedMarket: MarketNameForId(submitterMarket), + cashRoleId: cashRoleId, + paymentCurrency: payCurrencySelect, + submitterMarket: submitterMarket, + goodsName: goodsName, + market: MarketNameForId(searchData.value.market) } } - const res = await API({ url: '/export/exportFinance', data: params }) + const res = await API({ url: '/export/exportCash', data: params }) if (res.code === 200) { ElMessage.success('导出成功') } else { ElMessage.error(res.msg || '导出失败') } } + const openExportList = () => { getExportList() exportListVisible.value = true } +//获取导出列表 const getExportList = async () => { exportListLoading.value = true try { const result = await API({ url: '/export/export' }) if (result.code === 200) { const filteredData = result.data.filter(item => { - return item.type === 12 + return item.type === 13 }) exportList.value = filteredData } else { @@ -796,6 +809,36 @@ const downloadExportFile = (item) => { ElMessage.warning('文件还在导出中，请稍后再试') } } +//根据状态返回对应的标签类型 +const getTagType = (state) => { + switch (state) { + case 0: + return 'info'; + case 1: + return 'primary'; + case 2: + return 'success'; + case 3: + return 'danger'; + default: + return 'info'; + } +} +//根据状态返回对应的标签文案 +const getTagText = (state) => { + switch (state) { + case 0: + return '待执行'; + case 1: + return '执行中'; + case 2: + return '执行完成'; + case 3: + return '执行出错'; + default: + return '未知状态'; + } +} // 2.1 数据加载：获取地区财务订单列表 const getlist = async () => { From 4d2619b928bd5b1cced662f8f8204305d887450b Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Fri, 14 Nov 2025 17:57:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveFinance.vue | 141 ++++++------ .../moneyManage/receiveDetail/receiveHead.vue | 250 +++++++++++++++++---- .../moneyManage/receiveDetail/receiveManage.vue | 244 ++++++++++++++++---- .../moneyManage/receiveDetail/receiveService.vue | 11 +- 4 files changed, 501 insertions(+), 145 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index b70ff15..e089a8e 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -2,7 +2,7 @@
-
+
精网号
-
-
- 活动名称 - - - -
-
- 产品名称 - -
-
- 付款时间 - -
- -
- 查询 - 重置 - 导出excel - 查看导出列表 +
+
+
+ 活动名称 + + + +
+
+ 产品名称 + +
+
+ 付款时间 + +
+ 查询 + 重置 + 导出excel + 查看导出列表
@@ -811,33 +813,33 @@ const downloadExportFile = (item) => { } //根据状态返回对应的标签类型 const getTagType = (state) => { - switch (state) { - case 0: - return 'info'; - case 1: - return 'primary'; - case 2: - return 'success'; - case 3: - return 'danger'; - default: - return 'info'; - } + switch (state) { + case 0: + return 'info'; + case 1: + return 'primary'; + case 2: + return 'success'; + case 3: + return 'danger'; + default: + return 'info'; + } } //根据状态返回对应的标签文案 const getTagText = (state) => { - switch (state) { - case 0: - return '待执行'; - case 1: - return '执行中'; - case 2: - return '执行完成'; - case 3: - return '执行出错'; - default: - return '未知状态'; - } + switch (state) { + case 0: + return '待执行'; + case 1: + return '执行中'; + case 2: + return '执行完成'; + case 3: + return '执行出错'; + default: + return '未知状态'; + } } // 2.1 数据加载：获取地区财务订单列表 @@ -1283,25 +1285,38 @@ const handlePagination = (type, val) => { width: 100%; background: #F3FAFE; - .row { + .rowItem { + display: flex; + width: 15vw; + align-items: center; + justify-content: center; + margin-right: 0.5vw; + } + + el-button { + margin-left: 10px; + } + + .row1 { height: 4vh; width: 80vw; display: flex; min-height: 40px; + } - .rowItem { - display: flex; - width: 15vw; - align-items: center; - justify-content: center; - margin-right: 0.5vw; - } + .row2 { + height: 4vh; + width: 80vw; + display: flex; + align-items: center; - .buttons { + min-height: 40px; + + .left { + height: 4vh; + width: 58vw; display: flex; - justify-content: center; - align-items: center; - margin-left: 10px; + min-height: 40px; } } } diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index 4a1c9f2..77bea24 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -2,7 +2,7 @@
-
+
精网号
- +
付款币种
-
-
- 活动名称 - - - -
-
- 产品名称 - -
-
- 付款时间 - -
- -
- 查询 - 重置 +
+
+
+ 活动名称 + + + +
+
+ 产品名称 + +
+
+ 付款时间 + +
+ 查询 + 重置 + 导出excel + 查看导出列表
@@ -450,6 +454,39 @@
+ + + + + + + + + + + + + + + + + +
@@ -539,6 +576,126 @@ const ifRefundGold = () => { } +//导出相关 +const exportListVisible = ref(false) +const exportList = ref([]) +const exportListLoading = ref(false) +const exportExcel = async function () { + + let payCurrencySelect = ''; + let goodsName = ''; + + // 处理时间范围 + if (getTime.value && getTime.value.length === 2) { + searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss'); + searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss'); + } else { + searchData.value.startTime = ''; + searchData.value.endTime = ''; + } + + // 处理产品名称（级联选择取最后一级） + if (searchData.value.goodsName) { + goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]; + } + + // 处理付款币种（转ID） + if (searchData.value.paymentCurrency) { + payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); + } + + const cashRoleId = '2'; + const submitterMarket = adminData.value.markets; + searchData.value.status = 46; + const params = { + ...pageInfo.value, + cashCollection: { + ...searchData.value, + submitterId: adminData.value.id, + receivedMarket: MarketNameForId(submitterMarket), + cashRoleId: cashRoleId, + paymentCurrency: payCurrencySelect, + submitterMarket: submitterMarket, + goodsName: goodsName, + market: MarketNameForId(searchData.value.market) + } + } + + const res = await API({ url: '/export/exportCash', data: params }) + if (res.code === 200) { + ElMessage.success('导出成功') + } else { + ElMessage.error(res.msg || '导出失败') + } +} + +const openExportList = () => { + getExportList() + console.log('daoshiu'); + + exportListVisible.value = true +} +//获取导出列表 +const getExportList = async () => { + exportListLoading.value = true + try { + const result = await API({ url: '/export/export' }) + if (result.code === 200) { + const filteredData = result.data.filter(item => { + return item.type === 13 + }) + exportList.value = filteredData + } else { + ElMessage.error(result.msg || '获取导出列表失败') + } + } catch (error) { + console.error('获取导出列表出错:', error) + ElMessage.error('获取导出列表失败，请稍后重试') + } finally { + exportListLoading.value = false + } +} +const downloadExportFile = (item) => { + if (item.state === 2) { + const link = document.createElement('a') + link.href = item.url + link.download = item.fileName + link.click() + } else { + ElMessage.warning('文件还在导出中，请稍后再试') + } +} +//根据状态返回对应的标签类型 +const getTagType = (state) => { + switch (state) { + case 0: + return 'info'; + case 1: + return 'primary'; + case 2: + return 'success'; + case 3: + return 'danger'; + default: + return 'info'; + } +} +//根据状态返回对应的标签文案 +const getTagText = (state) => { + switch (state) { + case 0: + return '待执行'; + case 1: + return '执行中'; + case 2: + return '执行完成'; + case 3: + return '执行出错'; + default: + return '未知状态'; + } +} + // 基础数据 const adminData = ref({}); @@ -593,7 +750,7 @@ const getlist = async () => { // 总部财务固定参数：角色ID=1，按标签页筛选状态 const cashRoleId = '2'; const receivedMarket = adminData.value.markets; - if (activeTab.value === 'pass') searchData.value.status = 13; + if (activeTab.value === 'pass') searchData.value.status = 13; else if (activeTab.value === 'done') searchData.value.status = 46; const result = await request({ @@ -645,7 +802,7 @@ const submitRefund = async () => { } if (refundFormData.value.refundModel == 0) { refundFormData.value.partRefundGold = refundFormData.value.permanentGold, - refundFormData.value.partRefundFree = refundFormData.value.freeGold + refundFormData.value.partRefundFree = refundFormData.value.freeGold } const result = await request({ url: '/Money/addOnline', @@ -931,25 +1088,38 @@ const handlePagination = (type, val) => { width: 100%; background: #F3FAFE; - .row { + .rowItem { + display: flex; + width: 15vw; + align-items: center; + justify-content: center; + margin-right: 0.5vw; + } + + el-button { + margin-left: 10px; + } + + .row1 { height: 4vh; width: 80vw; display: flex; min-height: 40px; + } - .rowItem { - display: flex; - width: 15vw; - align-items: center; - justify-content: center; - margin-right: 0.5vw; - } + .row2 { + height: 4vh; + width: 80vw; + display: flex; + align-items: center; - .buttons { + min-height: 40px; + + .left { + height: 4vh; + width: 58vw; display: flex; - justify-content: center; - align-items: center; - margin-left: 10px; + min-height: 40px; } } } diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 1234529..e089a8e 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -2,7 +2,7 @@
-
+
精网号
-
-
- 活动名称 - - - -
-
- 产品名称 - -
-
- 付款时间 - -
- -
- 查询 - 重置 +
+
+
+ 活动名称 + + + +
+
+ 产品名称 + +
+
+ 付款时间 + +
+ 查询 + 重置 + 导出excel + 查看导出列表
@@ -231,6 +235,38 @@
+ + + + + + + + + + + + + + + + + @@ -688,6 +724,123 @@ const closeConfirmRefund = () => { textContent.value = '' } +//导出相关 +const exportListVisible = ref(false) +const exportList = ref([]) +const exportListLoading = ref(false) +const exportExcel = async function () { + + let payCurrencySelect = ''; + let goodsName = ''; + + // 处理时间范围 + if (getTime.value && getTime.value.length === 2) { + searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss'); + searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss'); + } else { + searchData.value.startTime = ''; + searchData.value.endTime = ''; + } + + // 处理产品名称（级联选择取最后一级） + if (searchData.value.goodsName) { + goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]; + } + + // 处理付款币种（转ID） + if (searchData.value.paymentCurrency) { + payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); + } + + const cashRoleId = '1'; + const submitterMarket = adminData.value.markets; + searchData.value.status = 46; + const params = { + ...pageInfo.value, + cashCollection: { + ...searchData.value, + submitterId: adminData.value.id, + receivedMarket: MarketNameForId(submitterMarket), + cashRoleId: cashRoleId, + paymentCurrency: payCurrencySelect, + submitterMarket: submitterMarket, + goodsName: goodsName, + market: MarketNameForId(searchData.value.market) + } + } + + const res = await API({ url: '/export/exportCash', data: params }) + if (res.code === 200) { + ElMessage.success('导出成功') + } else { + ElMessage.error(res.msg || '导出失败') + } +} + +const openExportList = () => { + getExportList() + exportListVisible.value = true +} +//获取导出列表 +const getExportList = async () => { + exportListLoading.value = true + try { + const result = await API({ url: '/export/export' }) + if (result.code === 200) { + const filteredData = result.data.filter(item => { + return item.type === 13 + }) + exportList.value = filteredData + } else { + ElMessage.error(result.msg || '获取导出列表失败') + } + } catch (error) { + console.error('获取导出列表出错:', error) + ElMessage.error('获取导出列表失败，请稍后重试') + } finally { + exportListLoading.value = false + } +} +const downloadExportFile = (item) => { + if (item.state === 2) { + const link = document.createElement('a') + link.href = item.url + link.download = item.fileName + link.click() + } else { + ElMessage.warning('文件还在导出中，请稍后再试') + } +} +//根据状态返回对应的标签类型 +const getTagType = (state) => { + switch (state) { + case 0: + return 'info'; + case 1: + return 'primary'; + case 2: + return 'success'; + case 3: + return 'danger'; + default: + return 'info'; + } +} +//根据状态返回对应的标签文案 +const getTagText = (state) => { + switch (state) { + case 0: + return '待执行'; + case 1: + return '执行中'; + case 2: + return '执行完成'; + case 3: + return '执行出错'; + default: + return '未知状态'; + } +} // 2.1 数据加载：获取地区财务订单列表 const getlist = async () => { @@ -771,7 +924,7 @@ const submitRefund = async () => { } if (refundFormData.value.refundModel == 0) { refundFormData.value.partRefundGold = refundFormData.value.permanentGold, - refundFormData.value.partRefundFree = refundFormData.value.freeGold + refundFormData.value.partRefundFree = refundFormData.value.freeGold } const result = await request({ url: '/Money/addOnline', @@ -1093,7 +1246,7 @@ onMounted(async () => { await getlist(); // 菜单权限校验（确保地区财务权限） - if (!hasMenuPermission(menuTree.value, 79)) { + if (!hasMenuPermission(menuTree.value, 67)) { ElMessageBox.alert( '您暂无该页面操作权限，请联系管理员', '权限提示', @@ -1132,25 +1285,38 @@ const handlePagination = (type, val) => { width: 100%; background: #F3FAFE; - .row { + .rowItem { + display: flex; + width: 15vw; + align-items: center; + justify-content: center; + margin-right: 0.5vw; + } + + el-button { + margin-left: 10px; + } + + .row1 { height: 4vh; width: 80vw; display: flex; min-height: 40px; + } - .rowItem { - display: flex; - width: 15vw; - align-items: center; - justify-content: center; - margin-right: 0.5vw; - } + .row2 { + height: 4vh; + width: 80vw; + display: flex; + align-items: center; - .buttons { + min-height: 40px; + + .left { + height: 4vh; + width: 58vw; display: flex; - justify-content: center; - align-items: center; - margin-left: 10px; + min-height: 40px; } } } diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 564dcde..e94b7d8 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -561,9 +561,14 @@ const jwcodeSeachMarket = async () => { url: '/cashCollection/getNameAndMarket', data: addFormData.value.jwcode }) - addFormData.value.market = result.data.market - addFormData.value.marketName = result.data.marketName - addFormData.value.name = result.data.name + if(result.code == 200){ + ElMessage.success('客户信息查询成功') + addFormData.value.market = result.data.market + addFormData.value.marketName = result.data.marketName + addFormData.value.name = result.data.name + }else{ + ElMessage.error('客户不存在') + } } catch (error) { console.log(error); }