shish 13 ساعت پیش
والد
کامیت
74a254c849

+ 33 - 2
ghs/src/views/in/refund-list.vue

@@ -1,3 +1,6 @@
+<!--
+  PC 采购售后记录列表:售后类型后展示「售后时间」(当天/隔天),对齐小程序 pagesPurchase/refundList。
+-->
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
@@ -12,6 +15,13 @@
 				{{ scope.row.refundType==1?'退货并退款':'仅退款' }}
 			</template>
 
+			<!-- sameDay=0 隔天售后,否则当天售后 -->
+			<template #table-column-sameDay="{scope}">
+				<span :style="Number(scope.row.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+					{{ Number(scope.row.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+				</span>
+			</template>
+
             <template #table-column-status="{scope}">
 				{{ scope.row.status==0?'审核中': scope.row.status==1? '已完成' : '其它' }}
 			</template>
@@ -48,6 +58,11 @@
 				<el-select size="mini" v-model="currentStaffName" 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>
+				<!-- 售后时间:当天 sameDay=1 / 隔天 sameDay=0;清空为全部 -->
+				<el-select size="mini" v-model="sameDayFilter" placeholder="售后时间" style="width:110px;margin-left:8px;" @change="onSameDayChange" :clearable="true">
+					<el-option label="当天售后" :value="1"></el-option>
+					<el-option label="隔天售后" :value="0"></el-option>
+				</el-select>
 				<span style="margin-left:9px;font-size:16px;">采购单日期:</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;">
@@ -139,6 +154,8 @@ export default {
 			refundSearchTime:'',
 			currentRefundDateList:[],
 			status:'-1',
+			/** 售后时间筛选:null=全部,1=当天,0=隔天 */
+			sameDayFilter: null,
 			totalRefundPrice:0,
 			currentGhsName:'',
 			currentGhsId:0,
@@ -178,6 +195,14 @@ export default {
 			this.currentStaffId = e
       		this.refreshData()
 		},
+		/** 切换售后时间筛选后刷新列表 */
+		onSameDayChange(){
+			this.refreshData()
+		},
+		/** 请求参数 sameDay:-1全部 / 1当天 / 0隔天 */
+		sameDayQuery(){
+			return (this.sameDayFilter === 0 || this.sameDayFilter === 1) ? this.sameDayFilter : -1
+		},
 		getSearchDate(){
 			if (this.$util.isEmpty(this.currentDateList)) {
 				this.searchTime = ''
@@ -204,11 +229,11 @@ export default {
 		},
 		refreshData(){
       		this.app.refresh({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,ghsId:this.currentGhsId})
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,ghsId:this.currentGhsId,sameDay:this.sameDayQuery()})
     	},
 		exportData(){
 			this.$service.cgRefund.getList({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,ghsId:this.currentGhsId}).then(res => {
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,ghsId:this.currentGhsId,sameDay:this.sameDayQuery()}).then(res => {
 				if(res.file){
 					window.location.href = res.file
 				}
@@ -293,6 +318,12 @@ export default {
 							align: 'center',
 							width: 110
 						},
+						{
+							prop: 'sameDay',
+							label: '售后时间',
+							align: 'center',
+							width: 100
+						},
 						{
 							prop: 'shopAdminName',
 							label: '操作人',

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

@@ -1,3 +1,6 @@
+<!--
+  PC 销售售后记录列表:展示售后类型后增加「售后时间」(当天/隔天),对齐小程序 refundList。
+-->
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
@@ -12,6 +15,13 @@
 				{{ scope.row.refundType==1?'退货并退款':'仅退款' }}
 			</template>
 
+			<!-- sameDay=0 隔天售后,否则当天售后 -->
+			<template #table-column-sameDay="{scope}">
+				<span :style="Number(scope.row.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+					{{ Number(scope.row.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+				</span>
+			</template>
+
 			<template #table-column-cause="{scope}">
 				{{ scope.row.cause==0?'质量问题' : scope.row.cause==1 ?'多开错开': scope.row.cause==2 ? '打包原因' : scope.row.cause==3 ? '物流原因' : '其它'}}
 			</template>
@@ -56,6 +66,11 @@
 				<el-select size="mini" v-model="currentStaffName" 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>
+				<!-- 售后时间:当天 sameDay=1 / 隔天 sameDay=0;清空为全部 -->
+				<el-select size="mini" v-model="sameDayFilter" placeholder="售后时间" style="width:110px;margin-left:8px;" @change="onSameDayChange" :clearable="true">
+					<el-option label="当天售后" :value="1"></el-option>
+					<el-option label="隔天售后" :value="0"></el-option>
+				</el-select>
 				<span style="margin-left:9px;font-size:18px;">订单日期:</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;">
@@ -157,6 +172,8 @@ export default {
 			refundSearchTime:'',
 			currentRefundDateList:[],
 			status:'-1',
+			/** 售后时间筛选:null=全部,1=当天,0=隔天 */
+			sameDayFilter: null,
 			totalRefundPrice:0,
 			currentCustomName:'',
 			currentCustomId:0,
@@ -205,6 +222,14 @@ export default {
 			this.currentStaffId = e
       		this.refreshData()
 		},
+		/** 切换售后时间筛选后刷新列表 */
+		onSameDayChange(){
+			this.refreshData()
+		},
+		/** 请求参数 sameDay:-1全部 / 1当天 / 0隔天 */
+		sameDayQuery(){
+			return (this.sameDayFilter === 0 || this.sameDayFilter === 1) ? this.sameDayFilter : -1
+		},
 		getSearchDate(){
 			if (this.$util.isEmpty(this.currentDateList)) {
 				this.searchTime = ''
@@ -231,11 +256,11 @@ export default {
 		},
 		refreshData(){
       		this.app.refresh({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,customId:this.currentCustomId})
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,customId:this.currentCustomId,sameDay:this.sameDayQuery()})
     	},
 		exportData(){
 			this.$service.refund.getRefundList({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,customId:this.currentCustomId}).then(res => {
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,customId:this.currentCustomId,sameDay:this.sameDayQuery()}).then(res => {
 				if(res.file){
 					window.location.href = res.file
 				}
@@ -314,6 +339,12 @@ export default {
 							align: 'center',
 							width: 120
 						},
+						{
+							prop: 'sameDay',
+							label: '售后时间',
+							align: 'center',
+							width: 100
+						},
 						{
 							prop: 'book',
 							label: '类型',

+ 1 - 4
ghsApp/src/admin/stat/cgItem.vue

@@ -21,11 +21,8 @@
 						<t-th><view @click="rankByFn('num')">总数量<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						<t-th><view @click="rankByFn('amount')">总金额<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							数量、金额已按售后扣减(隔天售后记在通过日,可为负)。入库日不含隔天退货量。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减:¥{{ nextDayDeduct }}
+							隔天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="itemList && !$util.isEmpty(itemList)">
 							<view v-for="(item, index) in itemList" :key="index">

+ 1 - 4
ghsApp/src/admin/stat/cgStat.vue

@@ -20,11 +20,8 @@
 						<view style="font-size:30upx;margin:10upx 0 10upx 10upx;">总金额:
 							<text :style="totalActPrice < 0 ? 'color:#e74c3c;font-weight:bold;' : ''">{{ totalActPrice }}</text>
 						</view>
-						<view style="color:#1c89e0;font-size:24upx;margin:0 10upx 10upx 10upx;line-height:1.5;">
-							金额已按售后扣减(隔天售后记在通过日,可为负;订单数不减)。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减:¥{{ nextDayDeduct }}
+							隔天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						<view v-for="(item, index) in displayList" :key="index">
 							<t-tr>

+ 1 - 4
ghsApp/src/admin/stat/cgYj.vue

@@ -21,11 +21,8 @@
 						<t-th>订单数</t-th>
 						<t-th>金额</t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							金额已按售后扣减(隔天售后记在通过日,可为负;订单数不减)。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减:¥{{ nextDayDeduct }}
+							隔天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="staffList && !$util.isEmpty(staffList)">
 							<view v-for="(cgItem, index) in staffList" :key="index">

+ 1 - 6
ghsApp/src/admin/stat/customSale.vue

@@ -27,7 +27,7 @@
 							<t-th>利润</t-th>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减:¥{{ nextDayDeduct }}
+							隔天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">
@@ -53,11 +53,6 @@
 								{{profile.totalNum||0}}笔¥{{formatNum(profile.totalAmount)}} 成本¥{{ formatNum(profile.totalCost) }} 利润¥{{ formatNum(profile.totalProfit) }}
 							</view>
 						</t-td></t-tr>
-						<t-tr><t-td>
-							<view style="color:#1c89e0;font-size:28upx;">
-								从2025年11月20号起是准确数据,之前的数据不准确
-							</view>
-						</t-td></t-tr>
 					</t-table>
 				</block>
 			</view>

+ 1 - 1
ghsApp/src/admin/stat/productSale.vue

@@ -28,7 +28,7 @@
 							</t-td>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减:¥{{ nextDayDeduct }}
+							隔天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">