@dongkboy 4 mesiacov pred
rodič
commit
abc6a26c6c

+ 9 - 9
src/views/finance/audit.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <div class="audit">
     <div class="audit">
-        <el-tabs class="demo-tabs" @tab-click="handleClick">
+        <el-tabs class="demo-tabs" v-model="activeName" @tab-click="handleClick">
             <el-tab-pane name="0">
             <el-tab-pane name="0">
                 <template #label>
                 <template #label>
                     <el-badge :value="total1">
                     <el-badge :value="total1">
@@ -129,7 +129,7 @@
                     <el-table-column prop="jyPremium" label="驾意险" width="120"></el-table-column>
                     <el-table-column prop="jyPremium" label="驾意险" width="120"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="200">
                     <el-table-column label="操作" fixed="right" width="200">
                         <template #default="scope">
                         <template #default="scope">
-                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 1)">审核</el-button>
+                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 1, '0')">审核</el-button>
                             <el-button link type="primary" size="small" @click="handleUpdateToQuestionOrder(scope)">设置疑问订单</el-button>
                             <el-button link type="primary" size="small" @click="handleUpdateToQuestionOrder(scope)">设置疑问订单</el-button>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
@@ -276,7 +276,7 @@
                     <el-table-column prop="auditTime" label="审核时间" width="120"></el-table-column>
                     <el-table-column prop="auditTime" label="审核时间" width="120"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="200">
                     <el-table-column label="操作" fixed="right" width="200">
                         <template #default="scope">
                         <template #default="scope">
-                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0)">详情</el-button>
+                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0,'1')">详情</el-button>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>
@@ -423,7 +423,7 @@
                     <el-table-column prop="refuse" label="驳回原因" width="120"></el-table-column>
                     <el-table-column prop="refuse" label="驳回原因" width="120"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="200">
                     <el-table-column label="操作" fixed="right" width="200">
                         <template #default="scope">
                         <template #default="scope">
-                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0)">详情</el-button>
+                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0,'2')">详情</el-button>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>
@@ -567,7 +567,7 @@
                     <el-table-column prop="jyPremium" label="驾意险" width="120"></el-table-column>
                     <el-table-column prop="jyPremium" label="驾意险" width="120"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="200">
                     <el-table-column label="操作" fixed="right" width="200">
                         <template #default="scope">
                         <template #default="scope">
-                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0)">详情</el-button>
+                            <el-button link type="primary" size="small" @click="handleToDetail(scope, 0,'3')">详情</el-button>
                             <el-button link type="primary" size="small" @click="handleCancel(scope)">取消疑问订单</el-button>
                             <el-button link type="primary" size="small" @click="handleCancel(scope)">取消疑问订单</el-button>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
@@ -596,8 +596,7 @@ import { useRouter, useRoute } from 'vue-router'
 
 
 const myRouter = useRouter()
 const myRouter = useRouter()
 const myRoute = useRoute()
 const myRoute = useRoute()
-
-let activeName = ref('0')
+let activeName = ref(myRoute.query.activeindex as any || '0')
 const handleClick = (e) => {
 const handleClick = (e) => {
     activeName.value = e.props.name
     activeName.value = e.props.name
     pages.value = 1
     pages.value = 1
@@ -730,12 +729,13 @@ const initList = (type) => {
     })
     })
 }
 }
 
 
-const handleToDetail = (scope, bool) => {
+const handleToDetail = (scope, bool,index) => {
     myRouter.push({
     myRouter.push({
         path: '/finance/auditOrderDetail',
         path: '/finance/auditOrderDetail',
         query: {
         query: {
             id: scope.row.orderNo,
             id: scope.row.orderNo,
-            isShow: bool
+            isShow: bool,
+            activeindex: index
         }
         }
     })
     })
 }
 }

+ 8 - 2
src/views/finance/modules/auditDetail.vue

@@ -778,7 +778,12 @@
                     <el-button @click="handleAudit(2)">确定</el-button>
                     <el-button @click="handleAudit(2)">确定</el-button>
                 </template>
                 </template>
             </el-popconfirm>
             </el-popconfirm>
-            <el-button plain @click="myRouter.push('/finance/audit')">关闭</el-button>
+            <el-button plain @click="myRouter.push({
+                path: '/finance/audit',
+                query: {
+                    activeindex: activeindex
+                }
+            })">关闭</el-button>
         </div>
         </div>
         <el-dialog
         <el-dialog
             title="图片预览"
             title="图片预览"
@@ -818,6 +823,7 @@ import {ElMessage} from "element-plus";
 
 
 const myRoute = useRoute()
 const myRoute = useRoute()
 const myRouter = useRouter()
 const myRouter = useRouter()
+const activeindex = ref(myRoute.query.activeindex)
 
 
 // 页签
 // 页签
 let tipsIndex = ref(0)
 let tipsIndex = ref(0)
@@ -1583,4 +1589,4 @@ onUnmounted(() => {
             display: none;
             display: none;
         }
         }
     }
     }
-</style>
+</style>

+ 4 - 0
src/views/payCredit/index.vue

@@ -83,6 +83,7 @@
                     <el-table-column prop="bank" label="银行"></el-table-column>
                     <el-table-column prop="bank" label="银行"></el-table-column>
                     <el-table-column prop="accountName" label="姓名"></el-table-column>
                     <el-table-column prop="accountName" label="姓名"></el-table-column>
                     <el-table-column prop="bankName" label="开户行"></el-table-column>
                     <el-table-column prop="bankName" label="开户行"></el-table-column>
+                    <el-table-column prop="createTime" label="提现时间" width="180"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="200">
                     <el-table-column label="操作" fixed="right" width="200">
                         <template #default="scope">
                         <template #default="scope">
                             <el-button link type="primary" size="small" @click="handleDraw(scope.row)">领取</el-button>
                             <el-button link type="primary" size="small" @click="handleDraw(scope.row)">领取</el-button>
@@ -299,6 +300,9 @@
                     <el-table-column prop="bank" label="银行"></el-table-column>
                     <el-table-column prop="bank" label="银行"></el-table-column>
                     <el-table-column prop="accountName" label="姓名"></el-table-column>
                     <el-table-column prop="accountName" label="姓名"></el-table-column>
                     <el-table-column prop="bankName" label="开户行"></el-table-column>
                     <el-table-column prop="bankName" label="开户行"></el-table-column>
+                    <el-table-column prop="createTime" label="提现时间" width="180"></el-table-column>
+                    <el-table-column prop="paymentTime" label="支付时间" width="180"></el-table-column>
+
                 </el-table>
                 </el-table>
                 <div class="pagination">
                 <div class="pagination">
                     <el-pagination
                     <el-pagination

+ 1 - 1
src/views/payCredit/myTask.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
     <div class="myTask">
     <div class="myTask">
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-            <el-tab-pane :label="`领取(${total1})`" name="first">
+            <el-tab-pane :label="`领取(${total1})`" name="first">
                 <el-form v-model="firstForm" label-width="100">
                 <el-form v-model="firstForm" label-width="100">
                     <el-row :gutter="20">
                     <el-row :gutter="20">
                         <el-col :span="8">
                         <el-col :span="8">