退款方式+重置500

src/views/moneyManage/executor/executor.vue

@@ -35,7 +35,7 @@
             <div class="search2">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-option v-for="item in statusList"  :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
             <div class="search2" style="width: 28vw;">
@@ -104,7 +104,7 @@
             </el-table-column>
             <el-table-column prop="status" label="订单状态" width="120">
                 <template #default="scope">
-                    {{ scope.row.status === 41 ? '已完成' : '待处理' }}
+                    {{ scope.row.status === 41 ? '退款成功' : '待处理' }}
                 </template>
             </el-table-column>
             <el-table-column prop="operation" label="操作" fixed="right" width="100px">
@@ -252,6 +252,7 @@ const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
 const dateRange = ref([])
 const tableData = ref([])
 const editRow = ref({})// 编辑回显
+const statusList = ref(['待处理', '退款成功'])
 const pagination = ref({
     pageNum: 1,
     pageSize: 50,
@@ -270,7 +271,14 @@ const editForm = ref({
 // 查全部
 const getRefund = async function () {
     try {
-        searchForm.value.statuses = [40, 41] // 默认：看不到进度没到这里的
+        const statusesParam = [40, 41] // 默认：看不到进度没到这里的
+        if(searchForm.value.statuses === '待处理'){
+            statusesParam.value = [40]
+        } else if (searchForm.value.statuses === '退款成功'){
+            statusesParam.value = [41]
+        } else {
+            statusesParam.value = [40, 41]
+        }
 
         const params = {
             pageNum: pagination.value.pageNum,
@@ -280,7 +288,7 @@ const getRefund = async function () {
                 name: searchForm.value.name,
                 markets: searchForm.value.markets,
                 goodsNames: searchForm.value.goodsName,
-                statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
+                statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
@@ -378,17 +386,6 @@ const hideEditDialog = () => {
         jwcode: ''
     }
 }
-
-const statusList = ref([
-    {
-        value: 40,
-        label: '待处理',
-    },
-    {
-        value: 41,
-        label: '退款完成'
-    }
-])
 const channelOptions = ref([{
     value: '银行转账',
     label: '银行转账'

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -23,7 +23,7 @@
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-option v-for="item in statusList"  :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
         </div>
@@ -75,9 +75,10 @@
             <el-table-column prop="status" label="订单状态" width="120">
                 <template #default="scope">
                     {{
-                        [20, 30, 40].includes(scope.row.status) ? '审核中' :
-                            [22, 32].includes(scope.row.status) ? '审核驳回' :
-                                scope.row.status === 41 ? '退款完成' : scope.row.status
+                        [20].includes(scope.row.status) ? '待审核' :
+                        [30,40].includes(scope.row.status) ? '审核通过' :
+                            [22, 32].includes(scope.row.status) ? '已驳回' :
+                                scope.row.status === 41 ? '退款成功' : scope.row.status
                     }}
                 </template>
             </el-table-column>
@@ -104,7 +105,7 @@
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款类型</el-text>
+                <el-text style="width:4vw;" size="small">退款方式</el-text>
                 <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
                     <el-option label="全部退款" :value="0"></el-option>
                     <el-option label="部分退款" :value="1"></el-option>
@@ -427,24 +428,7 @@ const channelOptions = ref([{
     label: 'Ipay88-Link平台'
 }
 ])
-const statusList = ref([
-    {
-        value: 20,
-        label: '待审核',
-    },
-    {
-        value: '审核通过',
-        label: '审核通过'
-    },
-    {
-        value: '审核驳回',
-        label: '审核驳回'
-    },
-    {
-        value: 41,
-        label: '退款完成'
-    }
-])
+const statusList = ref(['待审核','审核通过','已驳回','退款成功'])
 // 查全部
 const getRefund = async function () {
     if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeShow)) {
@@ -452,11 +436,17 @@ const getRefund = async function () {
         return
     }
     try {
-        searchForm.value.statuses = [20, 22, 30, 32, 40, 41] // 看不到进度没到这里的
+        const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
         if (searchForm.value.statuses === '审核通过') {
-            statuses = [30, 40]
-        } else if (searchForm.value.statuses === '审核驳回') {
-            statuses = [22, 32]
+            statuses.value = [30, 40]
+        } else if (searchForm.value.statuses === '已驳回') {
+            statuses.value = [22, 32]
+        } else if (searchForm.value.statuses === '待审核') {
+            statuses.value = [20]
+        } else if (searchForm.value.statuses === '退款成功') {
+            statuses.value = [41]
+        } else {
+            statuses.value = [20, 22, 30, 32, 40, 41]
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -466,7 +456,7 @@ const getRefund = async function () {
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.markets,//地区
                 goodsNames: searchForm.value.goodsName,//商品名
-                statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
+                statuses: statuses.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
@@ -736,7 +726,7 @@ const hideReject = function () {
 const reset = function () {
     searchForm.value = {
         jwcode: '',
-        market: [],
+        markets: [],
         statuses: []
     }
     dateRange.value = []

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -22,7 +22,7 @@
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-option v-for="item in statusList"  :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
         </div>
@@ -75,9 +75,10 @@
             <el-table-column prop="status" label="订单状态" width="120">
                 <template #default="scope">
                     {{
-                        [10, 20, 30, 40].includes(scope.row.status) ? '审核中' :
-                            [12, 22, 32].includes(scope.row.status) ? '审核驳回' :
-                                scope.row.status === 41 ? '退款完成' : scope.row.status
+                        [10].includes(scope.row.status) ? '待审核' :
+                            [20, 30, 40].includes(scope.row.status) ? '审核通过' :
+                                [12, 22, 32].includes(scope.row.status) ? '已驳回' :
+                                    [41].includes(scope.row.status) ? '退款成功' : scope.row.status
                     }}
                 </template>
             </el-table-column>
@@ -104,7 +105,7 @@
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款类型</el-text>
+                <el-text style="width:4vw;" size="small">退款方式</el-text>
                 <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
                     <el-option label="全部退款" :value="0"></el-option>
                     <el-option label="部分退款" :value="1"></el-option>
@@ -405,24 +406,7 @@ const statusStepMap = {
     40: [5, false],
     41: [6, false]
 }
-const statusList = ref([
-    {
-        value: 20,
-        label: '待审核',
-    },
-    {
-        value: '审核通过',
-        label: '审核通过'
-    },
-    {
-        value: '审核驳回',
-        label: '审核驳回'
-    },
-    {
-        value: 41,
-        label: '退款完成'
-    }
-])
+const statusList = ref(['待审核','审核通过','已驳回','退款成功'])
 // 查全部
 const getRefund = async function () {
     if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceShow)) {
@@ -430,10 +414,17 @@ const getRefund = async function () {
         return
     }
     try {
+        const statusParam = ref([])
         if (searchForm.value.statuses === '审核通过') {
-            searchForm.value.statuses = [20, 30, 40]
-        } else if (searchForm.value.statuses === '审核驳回') {
-            searchForm.value.statuses = [12, 22, 32]
+            statusParam.value = [20, 30, 40]
+        } else if (searchForm.value.statuses === '已驳回') {
+            statusParam.value = [12, 22, 32]
+        } else if (searchForm.value.statuses === '待审核') {
+            statusParam.value = [10]
+        } else if (searchForm.value.statuses === '退款成功') {
+            statusParam.value = [41]
+        } else {
+            statusParam.value = []
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -443,7 +434,7 @@ const getRefund = async function () {
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.markets,//地区
                 goodsNames: searchForm.value.goodsName,//商品名
-                statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
+                statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
@@ -799,7 +790,7 @@ const showAudit2 = function (row) {
 const reset = function () {
     searchForm.value = {
         jwcode: '',
-        market: [],
+        markets: [],
         statuses: []
     }
     dateRange.value = []

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -12,17 +12,18 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" 
-                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
+                    clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" placeholder="请选择产品名称" clearable />
+                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
+                    placeholder="请选择产品名称" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-option v-for="item in statusList"  :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
         </div>
@@ -74,9 +75,10 @@
             <el-table-column prop="status" label="订单状态" width="120">
                 <template #default="scope">
                     {{
-                        [30, 40].includes(scope.row.status) ? '审核中' :
-                            scope.row.status === 32 ? '审核驳回' :
-                                scope.row.status === 41 ? '退款完成' : scope.row.status
+                        [30].includes(scope.row.status) ? '待审核' :
+                        [40].includes(scope.row.status) ? '审核通过' :
+                            scope.row.status === 32 ? '已驳回' :
+                                scope.row.status === 41 ? '退款成功' : scope.row.status
                     }}
                 </template>
             </el-table-column>
@@ -103,7 +105,7 @@
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款类型</el-text>
+                <el-text style="width:4vw;" size="small">退款方式</el-text>
                 <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
                     <el-option label="全部退款" :value="0"></el-option>
                     <el-option label="部分退款" :value="1"></el-option>
@@ -438,12 +440,7 @@ const channelOptions = ref([{
     label: 'Ipay88-Link平台'
 }
 ])
-const statusList = ref([
-    { value: 30, label: '待审核' },
-    { value: 40, label: '审核通过' },
-    { value: 32, label: '审核驳回' },
-    { value: 41, label: '退款完成' }
-])
+const statusList = ref(['待审核', '审核通过', '已驳回', '退款成功'])
 const executorList = ref([
     {
         value: '305485',
@@ -485,7 +482,18 @@ const getRefund = async function () {
         return
     }
     try {
-        searchForm.value.statuses = [30, 32, 40, 41] // 默认：看不到进度没到这里的
+        const statusParam = ref([30, 32, 40, 41])// 默认：看不到进度没到这里的
+        if (searchForm.value.statuses === '待审核') {
+            statusParam.value = [30]
+        } else if (searchForm.value.statuses === '审核通过') {
+            statusParam.value = [40]
+        } else if (searchForm.value.statuses === '已驳回') {
+            statusParam.value = [32]
+        } else if (searchForm.value.statuses === '退款成功') {
+            statusParam.value = [41]
+        } else {
+            statusParam.value = [30, 32, 40, 41]
+        }
 
         const params = {
             pageNum: pagination.value.pageNum,
@@ -495,10 +503,7 @@ const getRefund = async function () {
                 name: searchForm.value.name,
                 markets: searchForm.value.markets,
                 goodsNames: searchForm.value.goodsName,
-                statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
-                // 20：地区负责人待审核；22：地区负责人驳回；
-                // 30：总部财务待审核；32：总部财务驳回；
-                // 40：执行人待处理；41：执行人已处理，退款完成；
+                statuses: statusParam.value,
                 paymentCurrency: searchForm.value.paymentCurrency,
                 payType: searchForm.value.payType,
                 startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
@@ -612,7 +617,7 @@ const hideReject = function () {
 const reset = function () {
     searchForm.value = {
         jwcode: '',
-        market: [],
+        markets: [],
         statuses: []
     }
     dateRange.value = []