diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 3e19386..372cadf 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -294,8 +294,8 @@ const getRefund = async function () { // 40:执行人待处理;41:执行人已处理,退款完成; paymentCurrency: searchForm.value.paymentCurrency, 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') : "", + sTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", + eTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", adminId: adminData.value.id, account: adminData.value.account, refundChannels:searchForm.value.refundChannels @@ -655,7 +655,7 @@ const disabledDate = (time) => { const reset = function () { searchForm.value = { jwcode: '', - market: [], + markets: [], statuses: [] } dateRange.value = [] diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 209d85f..4c868c6 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -247,10 +247,9 @@ @@ -261,10 +260,10 @@ @@ -275,10 +274,10 @@ @@ -289,9 +288,9 @@ @@ -344,14 +343,14 @@ const areaCharge = ref('')// 地区负责人 const headFinance = ref('')// 总部财务 const executor = ref('')// 指定执行人 const statusStepMap = { - 10: [2, false], - 12: [12, true], + 10: [1, false], + 12: [2, true], 20: [3, false], - 22: [22, true], - 30: [4, false], - 32: [32, true], - 40: [5, false], - 41: [6, false] + 22: [4, true], + 30: [5, false], + 32: [6, true], + 40: [7, false], + 41: [8, false] } const currencies = ref([ {