shish 1 год назад
Родитель
Сommit
675ee8fd64

+ 2 - 2
ghs/src/views/custom/yj.vue

@@ -2,7 +2,7 @@
 	<div class="shop-list">
 		<x-crud @load="onLoad">
 			<template #slot-date-select>
-                <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
+                账单时间:<el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
                 end-placeholder="结束日期" :picker-options="pickerOptions" size="mini"> </el-date-picker>
 			</template>
 
@@ -103,7 +103,7 @@ export default {
 			this.$router.push({ path: '/order/list', query });
 		},
 		getTkDetail(info){
-			let query = {customId:info.id,customName:info.name,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime};
+			let query = {customId:info.id,customName:info.name,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,status:1};
 			this.$router.push({ path: '/order/refund-list', query });
 		},
 		exportDue(){

+ 2 - 2
ghs/src/views/order/list.vue

@@ -150,7 +150,7 @@
 				<el-select size="mini" v-model="currentKdStaffName" placeholder="开单人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
-        <span style="margin-left:9px;font-size:18px;">付款:</span>
+        <span style="margin-left:9px;font-size:17px;">账单时间:</span>
         <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
           class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:8px;">
         </el-date-picker>
@@ -830,7 +830,7 @@ export default {
               },
               {
                 prop: 'payTime',
-                label: '付款时间',
+                label: '账单时间',
                 align: 'center',
                 width: 90
               },

+ 4 - 1
ghs/src/views/order/refund-list.vue

@@ -76,7 +76,7 @@
 			</template>
 
             <template #slot-total-amount>
-				<span style="font-size:15px;font-weight:bold;margin-left:15px;">售后总金额:{{ totalRefundPrice }}</span>
+				<span style="font-size:15px;font-weight:bold;margin-left:15px;">总金额:{{ totalRefundPrice }}</span>
 			</template>
 
 		</x-crud>
@@ -263,6 +263,9 @@ export default {
 				if(this.startTime!='' && this.endTime !=''){
 					this.currentDateList =[this.startTime,this.endTime]
 				}
+				if(this.$route.query.status){
+					this.status = this.$route.query.status
+				}
 			}
 
 			ctx.service(this.$service.refund)