diff --git a/.env.development b/.env.development index 78c0c88..153d3e6 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/' # 正式环境 @@ -16,4 +16,5 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # VITE_API_BASE='http://192.168.1.70:8081/' # lijianlin -# VITE_API_BASE='http://192.168.9.41:8081/' \ No newline at end of file +# VITE_API_BASE='http://192.168.9.41:8081/' +VITE_API_BASE='http://localhost:8081/' diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index a03434b..620d388 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -256,7 +256,7 @@ const getRefund = async function () { jwcode: searchForm.value.jwcode, name: searchForm.value.name, markets: searchForm.value.markets, - goodsName: searchForm.value.goodsName, + goodsNames: searchForm.value.goodsName, statuses: searchForm.value.statuses,//10:地区财务待审核;12:地区财务驳回; // 20:地区负责人待审核;22:地区负责人驳回; // 30:总部财务待审核;32:总部财务驳回; @@ -618,6 +618,15 @@ const productList = [ }, ] +const reset = function () { + searchForm.value = { + jwcode: '', + market: searchForm.value.market, + statuses: searchForm.value.statuses + } + dateRange.value = [] + getRefund() +} onMounted(() => { console.log('???????????????????', adminData.value) getRefund() diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index f0b747d..a56eb60 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -737,7 +737,9 @@ const hideReject = function () { } const reset = function () { searchForm.value = { - jwcode: '' + jwcode: '', + market: searchForm.value.market, + statuses: searchForm.value.statuses } dateRange.value = [] getRefund() diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 940bd07..7639a3e 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -803,7 +803,9 @@ const showAudit2 = function (row) { } const reset = function () { searchForm.value = { - jwcode: '' + jwcode: '', + market: searchForm.value.market, + statuses: searchForm.value.statuses } dateRange.value = [] getRefund() diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 054969b..2ed6add 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -602,7 +602,9 @@ const hideReject = function () { } const reset = function () { searchForm.value = { - jwcode: '' + jwcode: '', + market: searchForm.value.markets, + statuses: searchForm.value.statuses } dateRange.value = [] getRefund() diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 98f830b..16ce039 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -609,7 +609,9 @@ const productList = [ ] const reset = function () { searchForm.value = { - jwcode: '' + jwcode: '', + market: searchForm.value.market, + statuses: searchForm.value.statuses } dateRange.value = [] getRefund()