优化

ghsApp/src/components/forward-options-popup.vue

@@ -0,0 +1,216 @@
+<!--
+  售后转冲销单-选项确认弹框
+  用途：pagesOrder/refund.vue（超管直接发起售后）、pagesOrder/refundDetail.vue（超管审核客户/花店提交的售后申请）
+  两个入口在检测到"该订单需转冲销单"场景时复用本弹框，只让用户选择：
+  退货方式(forwardStock)、返充到余额(returnBalance)、打印小票(needPrint)，
+  退款方式固定展示为原单支付渠道（不可选，由后端强制锁定，不信任前端传值）。
+  选好后点确认，由父组件负责调用 createForwardOrder 接口直接提交，不再跳转花材选择页重新走一遍流程。
+  ssh 冲销单功能
+-->
+<template>
+	<uni-popup ref="popupRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<view class="forward-popup">
+			<view class="forward-popup__title">冲销单确认</view>
+
+			<view class="forward-popup__row">
+				<view class="forward-popup__label">退款方式</view>
+				<view class="forward-popup__value forward-popup__value--locked">{{ payWayName || '原支付方式' }}（原单支付方式，不可修改）</view>
+			</view>
+
+			<view class="forward-popup__row">
+				<view class="forward-popup__label">退货方式</view>
+				<view class="forward-popup__value">
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="forwardStock === 0 ? 'blue' : 'default'"
+						@click="forwardStock = 0"
+					>库存退回</button>
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="forwardStock === 1 ? 'blue' : 'default'"
+						@click="forwardStock = 1"
+					>库存不退</button>
+				</view>
+			</view>
+
+			<view class="forward-popup__row">
+				<view class="forward-popup__label">返充到余额</view>
+				<view class="forward-popup__value">
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="returnBalance === 1 ? 'blue' : 'default'"
+						@click="returnBalance = 1"
+					>是</button>
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="returnBalance === 0 ? 'blue' : 'default'"
+						@click="returnBalance = 0"
+					>否</button>
+				</view>
+			</view>
+
+			<view class="forward-popup__row">
+				<view class="forward-popup__label">打印小票</view>
+				<view class="forward-popup__value">
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="needPrint === 1 ? 'blue' : 'default'"
+						@click="needPrint = 1"
+					>打印</button>
+					<button
+						class="admin-button-com middle forward-popup__btn"
+						:class="needPrint === 2 ? 'blue' : 'default'"
+						@click="needPrint = 2"
+					>不打印</button>
+				</view>
+			</view>
+
+			<view class="forward-popup__row forward-popup__row--amount">
+				<view class="forward-popup__label">冲销金额</view>
+				<view class="forward-popup__value forward-popup__amount">¥{{ amount }}</view>
+			</view>
+
+			<view class="forward-popup__btns">
+				<button class="admin-button-com big default forward-popup__submitBtn" @click="close">取消</button>
+				<button
+					class="admin-button-com big blue forward-popup__submitBtn"
+					:disabled="submitting"
+					@click="confirm"
+				>{{ submitting ? '提交中…' : '确认提交' }}</button>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+<script>
+export default {
+	name: 'forwardOptionsPopup',
+	props: {
+		//原单支付方式文字展示，只读，实际值由后端强制锁定
+		payWayName: {
+			type: String,
+			default: ''
+		},
+		//本次冲销金额，仅用于弹框内展示
+		amount: {
+			type: [Number, String],
+			default: 0
+		},
+		//提交中禁用确认按钮，防止重复提交
+		submitting: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			forwardStock: -1, // -1未选 0库存退回 1库存不退，与后端字段值一致
+			returnBalance: -1, // -1未选 1是 0否
+			needPrint: 1 // 1打印 2不打印
+		};
+	},
+	methods: {
+		open() {
+			this.forwardStock = -1;
+			this.returnBalance = -1;
+			this.needPrint = 1;
+			this.$refs.popupRef.open('center');
+		},
+		close() {
+			this.$refs.popupRef.close();
+		},
+		confirm() {
+			if (this.forwardStock === -1) {
+				this.$msg('请选择退货方式');
+				return;
+			}
+			if (this.returnBalance === -1) {
+				this.$msg('请选择是否返充到余额');
+				return;
+			}
+			this.$emit('confirm', {
+				forwardStock: this.forwardStock,
+				returnBalance: this.returnBalance,
+				needPrint: this.needPrint
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.forward-popup {
+	width: 580upx;
+	padding: 30upx;
+	box-sizing: border-box;
+
+	&__title {
+		font-size: 32upx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		margin-bottom: 20upx;
+	}
+
+	&__row {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 16upx 0;
+		border-bottom: 1upx solid #f0f2f5;
+
+		&--amount {
+			border-bottom: none;
+		}
+	}
+
+	&__label {
+		width: 160upx;
+		flex-shrink: 0;
+		font-size: 28upx;
+		color: #909399;
+	}
+
+	&__value {
+		flex: 1;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		font-size: 28upx;
+		color: #303133;
+
+		&--locked {
+			color: #3385ff;
+			font-weight: bold;
+		}
+	}
+
+	&__btn {
+		margin-right: 16upx;
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+
+	&__amount {
+		color: #fa3534;
+		font-weight: bold;
+		font-size: 32upx;
+	}
+
+	&__btns {
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		margin-top: 20upx;
+	}
+
+	&__submitBtn {
+		width: 45%;
+		margin: 0;
+
+		&:first-child {
+			margin-right: 24upx;
+		}
+	}
+}
+</style>

ghsApp/src/pagesOrder/refund.vue

@@ -218,11 +218,20 @@
 			<button class="action-btn confirm-btn" :disabled="forwardExhausted" @tap="confirmRefund">确定</button>
 		</view>
 
+		<!-- 售后转冲销单：直接在本页弹框确认剩余选项并提交，不再跳转花材选择页重新走一遍流程 -->
+		<forward-options-popup
+			ref="forwardPopup"
+			:pay-way-name="getPayWayName(orderInfo.payWay)"
+			:amount="refundPrice"
+			:submitting="forwardSubmitting"
+			@confirm="submitForwardOrder"
+		/>
 	</view>
 </template>
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
-import { getDetail,refund } from "@/api/order/index";
+import ForwardOptionsPopup from "@/components/forward-options-popup";
+import { getDetail,refund,createForwardOrder } from "@/api/order/index";
 import { ORDER_STATUS } from "@/utils/declare";
 import { getUnClear } from "@/api/clear"
 import { changeHalf } from "@/api/item"
@@ -230,7 +239,8 @@ import dayjs from 'dayjs'
 export default {
 	name: "orderDetail",
 	components: {
-		TuiListCell
+		TuiListCell,
+		ForwardOptionsPopup
 	},
 	data() {
 		return {
@@ -242,7 +252,9 @@ export default {
 			remark:'',
 			orderInfo:{},
 			couldRefundPrice:0,
-			unClear:[]
+			unClear:[],
+			//冲销单提交中，防止连点/重复请求
+			forwardSubmitting:false
 		};
 	},
 	onShow() {
@@ -331,8 +343,8 @@ export default {
 			return map[payWay] !== undefined ? map[payWay] : '--'
 		},
 		/**
-		 * 售后转冲销单：跳转到花材选择页(index2)，携带 forward=1 和 relateOrderId，
-		 * 由 index2 -> affirmForward 走冲销单确认与提交，退款方式在 affirmForward 锁定为原单支付渠道。
+		 * 售后转冲销单：本页已经选好退货商品(refundCount)，直接弹框选剩余选项(退货方式/返充余额/打印小票)，
+		 * 确认后调用 createForwardOrder 直接提交，不再跳转花材选择页(index2/affirmForward)重新选一遍商品。
 		 * ssh 冲销单功能
 		 */
 		goForwardOrder(){
@@ -341,22 +353,82 @@ export default {
 				uni.showToast({title:'请选择要退货的商品',icon:'none'})
 				return
 			}
-			const customId = this.orderInfo.customId || 0
-			const customName = this.orderInfo.customName || ''
-			const payWay = this.orderInfo.payWay
-			const payWayName = this.getPayWayName(payWay)
-			this.$util.pageTo({
-				url: '/admin/billing/index2',
-				type: 2,
-				query: {
-					customId: customId,
-					customName: customName,
-					forward: 1,
-					relateOrderId: this.option.id,
-					payWay: payWay,
-					payWayName: payWayName
+			this.$refs.forwardPopup.open()
+		},
+		/** 把本页已勾选的退货商品(refundCount)转换成 createForwardOrder 接口需要的 productId/bigNum/smallNum/price 结构 */
+		buildForwardProductList(){
+			return this.product
+				.filter(ele => Number(ele.refundCount) > 0)
+				.map(ele => {
+					const unitType = Number(ele.xhUnitType) === 1 ? 1 : 0
+					return {
+						productId: ele.productId,
+						bigNum: unitType === 0 ? Number(ele.refundCount) : 0,
+						smallNum: unitType === 1 ? Number(ele.refundCount) : 0,
+						//锁定为原单当时的成交单价，避免走今日实时价格
+						price: ele.xhUnitPrice
+					}
+				})
+		},
+		/** 冲销单弹框确认后的真正提交逻辑：直接调后端接口生成冲销单并关联原单 */
+		async submitForwardOrder({ forwardStock, returnBalance, needPrint }){
+			if(this.forwardSubmitting){
+				return
+			}
+			const productList = this.buildForwardProductList()
+			if(this.$util.isEmpty(productList)){
+				uni.showToast({title:'请选择要退货的商品',icon:'none'})
+				return
+			}
+			this.forwardSubmitting = true
+			let pendingMsg = ''
+			uni.showLoading({mask:true})
+			try{
+				const res = await createForwardOrder({
+					customId: this.orderInfo.customId,
+					product: JSON.stringify(productList),
+					remark: this.remark,
+					payWay: this.orderInfo.payWay,
+					forwardStock: forwardStock,
+					returnBalance: returnBalance,
+					needPrint: needPrint,
+					relateOrderId: this.option.id
+				},{hideError:true})
+				if(!res || typeof res !== 'object'){
+					pendingMsg = '提交失败，请重试'
+				}else if(res.code == 1 && res.data && res.data.id){
+					this.$refs.forwardPopup.close()
+					const { id, orderSn, actPrice, customBalance, customName } = res.data
+					if(returnBalance == 1){
+						this.$util.pageTo({
+							url: '/admin/billing/forwardResult',
+							type: 2,
+							query: {
+								orderId: id,
+								orderSn: orderSn,
+								actPrice: Math.abs(Number(actPrice)),
+								customId: this.orderInfo.customId,
+								customName: customName,
+								customBalance: customBalance
+							}
+						})
+					}else{
+						this.$util.pageTo({url: '/admin/billing/result', type: 2, query: { orderId: id, orderSn: orderSn, title: '冲销成功' }})
+					}
+				}else if(res.msg){
+					pendingMsg = res.msg
+				}else{
+					pendingMsg = '提交失败'
 				}
-			})
+			}catch(err){
+				pendingMsg = '提交失败，请重试'
+			}finally{
+				uni.hideLoading()
+				this.forwardSubmitting = false
+				if(pendingMsg){
+					this.$msg(pendingMsg)
+				}
+			}
 		},
 		confirmRefund(){
 			if(this.forwardExhausted){

ghsApp/src/pagesOrder/refundDetail.vue

@@ -4,6 +4,21 @@
 -->
 <template>
 	<view class="refund-page">
+		<!-- 该售后关联的原单非当天单/欠款已结清，通过后将按冲销单方式退款（提示，不影响驳回） -->
+		<view class="warning-tip forward-tip" v-if="info.status == 0 && isForwardEligible && !forwardExhausted">
+			<view class="warning-icon">ℹ</view>
+			<view class="warning-content">
+				<text class="warning-text">该售后将以冲销单方式通过</text>
+				<text class="warning-amount">点通过后弹框选择剩余选项，退款方式将锁定为原支付渠道</text>
+			</view>
+		</view>
+		<view class="warning-tip" v-if="info.status == 0 && isForwardEligible && forwardExhausted">
+			<view class="warning-icon">⚠</view>
+			<view class="warning-content">
+				<text class="warning-text">该订单已冲销完，无法再通过此售后</text>
+			</view>
+		</view>
+
 		<view class="refund-card">
 			<view class="refund-row">
 				<view class="refund-label">退款方式</view>
@@ -74,6 +89,12 @@
 				<view class="refund-value refund-value--multiline">{{ info.rejectReason || '' }}</view>
 			</view>
 
+			<!-- 该售后已被转成冲销单处理：说明退款不是走本条售后原路退回的，实际的退款/退货/返余额在冲销单里 -->
+			<view class="refund-row refund-row--top" v-if="isConvertedToForward">
+				<view class="refund-label">处理说明</view>
+				<view class="refund-value refund-value--multiline forward-remark">{{ info.hdRemark || '' }}</view>
+			</view>
+
 			<view class="refund-row refund-row--top" v-if="!$util.isEmpty(info.remark)">
 				<view class="refund-label">备注信息</view>
 				<view class="refund-value refund-value--multiline">{{ info.remark || '' }}</view>
@@ -103,7 +124,13 @@
 
 		<view class="refund-actions">
 			<button
-				v-if="info.status == 0"
+				v-if="info.status == 0 && isForwardEligible"
+				class="admin-button-com big refund-actions__btn refund-actions__btn--pass"
+				:disabled="forwardExhausted"
+				@click="openForwardPass()"
+			>通过（转冲销单）</button>
+			<button
+				v-if="info.status == 0 && !isForwardEligible"
 				class="admin-button-com big refund-actions__btn refund-actions__btn--pass"
 				@click="pass(0)"
 			>通过</button>
@@ -151,12 +178,27 @@
 				</view>
 			</view>
 		</uni-popup>
+
+		<!-- 售后转冲销单：点"通过（转冲销单）"直接弹框选剩余选项并提交，商品明细以本售后申请为准，后端自动取，不用再选一遍 -->
+		<forward-options-popup
+			ref="forwardPopup"
+			:pay-way-name="getPayWayName(info.orderInfo && info.orderInfo.payWay)"
+			:amount="refundPrice"
+			:submitting="forwardSubmitting"
+			@confirm="submitForwardOrder"
+		/>
 	</view>
 </template>
 <script>
 import { refundDetail, passRefund, rejectRefund, modifyCause, modifyAmount } from '@/api/refund'
+import { createForwardOrder } from '@/api/order/index'
+import ForwardOptionsPopup from '@/components/forward-options-popup'
+import dayjs from 'dayjs'
 
 export default {
+	components: {
+		ForwardOptionsPopup
+	},
 	data() {
 		return {
 			product: '',
@@ -167,10 +209,35 @@ export default {
 			rejectReason: '',
 			from: 0,
 			refundAmount: '',
-			showChoice: false
+			showChoice: false,
+			//冲销单提交中，防止连点/重复请求
+			forwardSubmitting: false
 		}
 	},
 	computed: {
+		/**
+		 * 是否走"售后转冲销单"：该售后关联的原单非当天单，或者原单曾有欠款且现已结清完毕。
+		 * 满足任一条件时，点"通过"不再走老的 passRefund 流程，改为直接弹框选项后生成冲销单。
+		 */
+		isForwardEligible() {
+			const orderInfo = this.info.orderInfo
+			if (this.$util.isEmpty(orderInfo) || this.$util.isEmpty(orderInfo.payTime)) {
+				return false
+			}
+			const notToday = dayjs(orderInfo.payTime).format('YYYY-MM-DD') !== dayjs().format('YYYY-MM-DD')
+			const debtCleared = Number(orderInfo.debtPrice) > 0 && Number(orderInfo.remainDebtPrice) == 0
+			return notToday || debtCleared
+		},
+		/** 累计冲销金额已达原单实付金额，不能再通过该售后 */
+		forwardExhausted() {
+			if (!this.isForwardEligible) {
+				return false
+			}
+			const orderInfo = this.info.orderInfo || {}
+			const actPrice = Number(orderInfo.actPrice) || 0
+			const forwardPrice = Number(orderInfo.forwardPrice) || 0
+			return actPrice <= forwardPrice
+		},
 		/** 申请原因文案 */
 		causeText() {
 			const causeMap = {
@@ -181,8 +248,18 @@ export default {
 			}
 			return causeMap[this.info.cause] || '其它'
 		},
+		/**
+		 * 该售后申请是否已被转成冲销单处理：以后端结构化字段 forwardOrderId(>0) 为准，
+		 * 区别于客户自己在花店端主动取消申请（那种情况 forwardOrderId 为0）。ssh 冲销单功能
+		 */
+		isConvertedToForward() {
+			return this.info.status == 3 && Number(this.info.forwardOrderId) > 0
+		},
 		/** 退款状态文案 */
 		statusText() {
+			if (this.isConvertedToForward) {
+				return '已转冲销单'
+			}
 			const statusMap = {
 				0: '待审核',
 				1: '已通过',
@@ -193,6 +270,9 @@ export default {
 		},
 		/** 退款状态样式 */
 		statusClass() {
+			if (this.isConvertedToForward) {
+				return 'refund-status refund-status--forward'
+			}
 			const classMap = {
 				0: 'refund-status refund-status--pending',
 				1: 'refund-status refund-status--pass',
@@ -249,6 +329,68 @@ export default {
 		goToOrder(info) {
 			this.$util.pageTo({ url: '/pagesOrder/detail?id=' + info.relateOrderId })
 		},
+		/** payWay数字编码转文字，用于冲销单确认弹框只读展示原单支付渠道 */
+		getPayWayName(payWay) {
+			const map = { 0: '微信', 1: '支付宝', 2: '余额', 3: '挂账', 4: '现金', 5: '银行卡' }
+			return map[payWay] !== undefined ? map[payWay] : '--'
+		},
+		/** 点"通过（转冲销单）"：弹框选剩余选项，商品明细以本售后申请为准，由后端自动取，不用再选一遍 */
+		openForwardPass() {
+			this.$refs.forwardPopup.open()
+		},
+		/** 冲销单弹框确认后提交：只传 refundOrderId，后端按该售后申请的商品明细自动生成冲销单并把本售后标记为已通过 */
+		async submitForwardOrder({ forwardStock, returnBalance, needPrint }) {
+			if (this.forwardSubmitting) {
+				return
+			}
+			this.forwardSubmitting = true
+			let pendingMsg = ''
+			uni.showLoading({ mask: true })
+			try {
+				const res = await createForwardOrder({
+					customId: this.info.customId,
+					refundOrderId: this.option.id,
+					remark: this.remark,
+					forwardStock: forwardStock,
+					returnBalance: returnBalance,
+					needPrint: needPrint
+				}, { hideError: true })
+				if (!res || typeof res !== 'object') {
+					pendingMsg = '提交失败，请重试'
+				} else if (res.code == 1 && res.data && res.data.id) {
+					this.$refs.forwardPopup.close()
+					const { id, orderSn, actPrice, customBalance, customName } = res.data
+					if (returnBalance == 1) {
+						this.$util.pageTo({
+							url: '/admin/billing/forwardResult',
+							type: 2,
+							query: {
+								orderId: id,
+								orderSn: orderSn,
+								actPrice: Math.abs(Number(actPrice)),
+								customId: this.info.customId,
+								customName: customName,
+								customBalance: customBalance
+							}
+						})
+					} else {
+						this.$util.pageTo({ url: '/admin/billing/result', type: 2, query: { orderId: id, orderSn: orderSn, title: '冲销成功' } })
+					}
+				} else if (res.msg) {
+					pendingMsg = res.msg
+				} else {
+					pendingMsg = '提交失败'
+				}
+			} catch (err) {
+				pendingMsg = '提交失败，请重试'
+			} finally {
+				uni.hideLoading()
+				this.forwardSubmitting = false
+				if (pendingMsg) {
+					this.$msg(pendingMsg)
+				}
+			}
+		},
 		cancelReject() {
 			this.$refs.rejectRef.close()
 		},
@@ -348,6 +490,56 @@ export default {
 	box-sizing: border-box;
 }
 
+// 冲销单提示条：与 pagesOrder/refund.vue 的 warning-tip/forward-tip 保持一致的视觉语言
+.warning-tip {
+	background: #fff2f0;
+	border: 1upx solid #ffccc7;
+	border-radius: 12upx;
+	margin-bottom: 20upx;
+	padding: 20upx;
+	display: flex;
+	align-items: center;
+
+	.warning-icon {
+		font-size: 40upx;
+		color: #ff4757;
+		font-weight: bold;
+		line-height: 1;
+		min-width: 50upx;
+	}
+
+	.warning-content {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.warning-text {
+		font-size: 28upx;
+		color: #ff4757;
+		font-weight: 600;
+	}
+
+	.warning-amount {
+		margin-top: 8upx;
+		font-size: 24upx;
+		color: #ff4757;
+	}
+
+	&.forward-tip {
+		background: rgba(51, 133, 255, 0.08);
+		border: 1upx solid rgba(51, 133, 255, 0.3);
+
+		.warning-icon,
+		.warning-text {
+			color: #3385ff;
+		}
+		.warning-amount {
+			color: #3385ff;
+		}
+	}
+}
+
 .refund-card {
 	background: #ffffff;
 	border-radius: 16upx;
@@ -437,6 +629,14 @@ export default {
 	&--cancel {
 		color: #909399;
 	}
+
+	&--forward {
+		color: #3385ff;
+	}
+}
+
+.forward-remark {
+	color: #3385ff;
 }
 
 .refund-section {