diff --git a/.env.development b/.env.development
index 8a24113..0f38e29 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境
@@ -11,7 +11,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/'
# 本地
-VITE_API_BASE='http://localhost:8081/'
+# VITE_API_BASE='http://localhost:8081/'
# sunjiabei
# VITE_API_BASE='http://192.168.1.70:8081/'
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 27644d0..3e19386 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -19,7 +19,7 @@
退款币种
-
+
@@ -293,11 +293,12 @@ const getRefund = async function () {
// 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,
- payType: searchForm.value.payType,
+ refundCurrency: searchForm.value.refundCurrency,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endtime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
adminId: adminData.value.id,
- account: adminData.value.account
+ account: adminData.value.account,
+ refundChannels:searchForm.value.refundChannels
}
}
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 3d58dba..1931824 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -112,8 +112,8 @@
- 退款备注
- 退款理由
+
@@ -538,7 +538,7 @@ const handleReject = async function () {
}
}
const showStep = function (row) {
- if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
+ if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeProgShow)) {
ElMessage.error('无此权限')
return
}
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 4d58ff3..200ba07 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -61,7 +61,6 @@
-
@@ -112,7 +111,7 @@
- 退款备注
+ 退款理由
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 2fb9bbf..209d85f 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -112,8 +112,8 @@
- 退款备注
- 退款理由
+
@@ -624,7 +624,7 @@ const reset = function () {
getRefund()
}
const showStep = function (row) {
- if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
+ if (!hasMenuPermission(menuTree.value, permissionMapping.refundHeaderProgShow)) {
ElMessage.error('无此权限')
return
}
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 223530d..996e295 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -22,7 +22,7 @@
订单状态
-
+
@@ -246,28 +246,7 @@ const uploadRef = ref(null)
const showBack = ref(false)
const showError = ref(false)
const isKF = adminData.value.adminName.includes('客服')
-const statusList = ref([
- {
- value:'submitted',
- label:'已提交',
- },
- {
- value: 'back',
- label: '已撤回',
- },
- {
- value: 'pending',
- label: '审核中'
- },
- {
- value: 'completed',
- label: '已退款'
- },
- {
- value:'rejected',
- label:'已驳回'
- }
-])
+const statusList = ref(['已提交', '已撤回', '进行中','已退款','已驳回'])
// 查全部
const getRefund = async function () {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundServiceShow)) {
@@ -275,16 +254,17 @@ const getRefund = async function () {
return
}
try {
- if (searchForm.value.statuses === 'submitted') {
- searchForm.value.statuses = [10]
- } else if (searchForm.value.statuses === 'back') {
- searchForm.value.statuses = [11]
- } else if (searchForm.value.statuses === 'pending') {
- searchForm.value.statuses = [20,30,40]
- } else if(searchForm.value.statuses === 'completed') {
- searchForm.value.statuses = [41]
- } else if(searchForm.value.statuses === 'rejected') {
- searchForm.value.statuses = [12,22,32]
+ const statusParam = ref([])
+ if (searchForm.value.statuses === '已提交') {
+ statusParam.value = [10]
+ } else if (searchForm.value.statuses === '已撤回') {
+ statusParam.value = [11]
+ } else if (searchForm.value.statuses === '进行中') {
+ statusParam.value = [20,30,40]
+ } else if(searchForm.value.statuses === '已退款') {
+ statusParam.value = [41]
+ } else if(searchForm.value.statuses === '已驳回') {
+ statusParam.value = [12,22,32]
}
const params = {
pageNum: pagination.value.pageNum,
@@ -294,7 +274,7 @@ const getRefund = async function () {
name: searchForm.value.name,//姓名
markets: searchForm.value.market,//地区
goodsNames: searchForm.value.goodsName,//商品名
- statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
+ statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成；