linwenxin 1 рік тому
батько
коміт
99dcf8516e

+ 10 - 10
src/views/auxiliaryFittings/home/index.vue

@@ -402,28 +402,28 @@
 					</div>
 				</div>
 			</div>
-			<div class="mode"  @click="gotopage('settleAccountWeixinPay','','')">
+			<div class="mode">
 				<div class="title">微信支付结算统计</div>
 				<div class="flex head">
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountWeixinPay','待结算','WAIT','2')">
 						<div class="text">
 							<div class="num">{{collectData.waitWechatNum}}</div>
 							<div class="title">待结算</div>
 						</div>
 					</div>
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountWeixinPay','可提现','WAIT_ING','2')">
 						<div class="text">
 							<div class="num">{{collectData.waitingWechatNum}}</div>
 							<div class="title">可提现</div>
 						</div>
 					</div>
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountWeixinPay','提现中','ING','2')">
 						<div class="text">
 							<div class="num">{{collectData.ingWechatNum}}</div>
 							<div class="title">提现中</div>
 						</div>
 					</div>
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountWeixinPay','已提现','OVER','2')">
 						<div class="text">
 							<div class="num">{{collectData.overWechatNum}}</div>
 							<div class="title">已提现</div>
@@ -433,16 +433,16 @@
 			</div>
 		</div>
     <div class="flex">
-			<div class="mode"  @click="gotopage('settleAccountOfflinePay','','')">
+			<div class="mode">
 				<div class="title">线下支付结算统计</div>
 				<div class="flex head">
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountOfflinePay','待结算','WAIT','2')">
 						<div class="text">
 							<div class="num">{{collectData.waitWechatLineNum}}</div>
 							<div class="title">待结算</div>
 						</div>
 					</div>
-					<div class="tab">
+					<div class="tab" @click="gotopage('settleAccountOfflinePay','已完成','OVER','2')">
 						<div class="text">
 							<div class="num">{{collectData.overWechatLineNum}}</div>
 							<div class="title">已完成</div>
@@ -630,13 +630,13 @@
           this.collectData = res.data
         })
       },
-      gotopage(name,pageName,pageCode){
+      gotopage(name, pageName, pageCode, pageType){
         if(pageCode){
           this.$router.push({
             name: name,
             params: {
               pageName: pageName,
-              pageType: '-',
+              pageType: pageType || '-',
               pageCode: pageCode,
             },
           })

+ 2 - 2
src/views/auxiliaryFittings/settleAccountManagement/settleAccountOfflinePay/index.vue

@@ -158,11 +158,11 @@ export default {
 		formDialogTitles: ["新增","编辑", "详情"],
 		formDialog: false,
 		formData: {},
-		status: '',
+		tabIndex: this?.$route?.params?.pageType || 1,
+		status: this?.$route?.params?.pageCode || '',
 		totalAmount: 0,
 		workerAmount: 0,
 		websitAmount: 0,
-		tabIndex: 1,
 		workerId: '',
 		websitId: '',
 		tabIndexShow: true,

+ 2 - 2
src/views/auxiliaryFittings/settleAccountManagement/settleAccountWeixinPay/index.vue

@@ -205,12 +205,12 @@ export default {
 			formDialogTitles: ["新增", "编辑", "详情"],
 			formDialog: false,
 			formData: {},
-			status: '',
+			tabIndex: this?.$route?.params?.pageType || 1,
+			status: this?.$route?.params?.pageCode || '',
 			totalAmount: 0,
 			workerAmount: 0,
 			websitAmount: 0,
 			commissionAmount: 0,
-			tabIndex: 1,
 			workerId: '',
 			websitId: '',
 			tabIndexShow: true,

+ 23 - 1
src/views/mallManagement/setActivity/index.vue

@@ -1,7 +1,7 @@
 <template>
   <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
     :table-events="tableEvents" :options-evens-group="optionsEvensGroup"
-    :column-parsing="columnParsing" :operation="operation()">
+    :column-parsing="columnParsing" :operation="operation()" :operationColumnWidth="200">
     <div class="cartographer">
       <el-dialog :title="formData.id?'详情':'新增'" width="100%" :modal="false" :visible.sync="formDialog"
         :before-close="formCancel">
@@ -492,6 +492,28 @@ export default {
             })
           }
         },
+        createActivity: {
+          click: ({ row, index, column }) => {
+            this.$router.push({
+              name: "activityOrder",
+              query: {
+                type: "detail",
+                id: row.id,
+              },
+            })
+          }
+        },
+        viewActivity: {
+          click: ({ row, index, column }) => {
+            this.$router.push({
+              name: "activityOrder",
+              query: {
+                type: "list",
+                id: row.id,
+              },
+            })
+          }
+        },
       })
     },
     // 新增