shish 4 месяцев назад
Родитель
Сommit
d66bc8e943

+ 5 - 5
hdApp/src/admin/billing/affirm.vue

@@ -354,7 +354,7 @@
             <button @click="form.needWork = 1;" class="admin-button-com middle" style="width:170upx;" :class="form.needWork == 1 ? 'blue' : 'default'">需要</button>
           </tui-list-cell>
 
-          <!-- 如果是扣除库存方式开单,不显示售后付款选项 -->
+          <!-- 如果是扣除库存方式开单,不显示红冲选项 -->
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="reduceStock == 0">
             <view class="tui-title">订单类型</view>
             <button @tap="form.forward = 0;" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">普通订单</button>
@@ -504,7 +504,7 @@
 		<uni-popup ref="remindForwardRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view class="forward-popup-content">
         <view class="popup-title">
-          确认售后付款单
+          确认红冲
         </view>
         
         <view class="option-group">
@@ -711,7 +711,7 @@ export default {
     }
 	  //#endif
 
-    //如果是扣除库存方式开单,不显示售后付款选项
+    //如果是扣除库存方式开单,不显示红冲选项
     this.reduceStock = this.option.reduceStock?this.option.reduceStock:0
     //如果扣除库存方法,付款方式默认选择挂账,这样方便提交
     if(this.reduceStock == 1){
@@ -1073,7 +1073,7 @@ export default {
       this.$refs.remindForwardRef.close()
     },
     confirmForward(){
-      //售后付款单,只能走线下模式
+      //红冲,只能走线下模式
       this.form.hasPay = 1
       this.form.payWay = this.forwardPayWay
       this.submitOrder()
@@ -1093,7 +1093,7 @@ export default {
       }else if(this.form.hasPay == 1){
         name = '确认线下付款?'
         if(this.form.forward == 1){
-          name = '确认开售后付款单?'
+          name = '确认开红冲单?'
         }
       }else if(this.form.hasPay == 2){
         name = '确认挂账?'

+ 1 - 1
hdApp/src/admin/custom/balanceChange.vue

@@ -23,7 +23,7 @@
                                 
                                 <view v-if="Number(item.settleAmount)>0 && Number(item.becomeBalance)>0">余额 {{item.becomeBalance}}元</view>
                                 
-                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">红冲单{{ item.shOrderSn }}</view>
 
                                 <view v-if="Number(item.refundOrderId)>0" @click.stop="goRefundOrder(item)">订单 {{ item.refundOrderSn }}</view>
 

+ 1 - 1
hdApp/src/admin/custom/balanceGiveChange.vue

@@ -23,7 +23,7 @@
                                 
                                 <view v-if="Number(item.settleAmount)>0 && Number(item.becomeBalance)>0">余额 {{item.becomeBalance}}元</view>
                                 
-                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">红冲单{{ item.shOrderSn }}</view>
 
                                 <view v-if="Number(item.refundOrderId)>0" @click.stop="goRefundOrder(item)">订单 {{ item.refundOrderSn }}</view>
 

+ 1 - 1
hdApp/src/admin/custom/balancePayChange.vue

@@ -23,7 +23,7 @@
                                 
                                 <view v-if="Number(item.settleAmount)>0 && Number(item.becomeBalance)>0">余额 {{item.becomeBalance}}元</view>
                                 
-                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">红冲单{{ item.shOrderSn }}</view>
 
                                 <view v-if="Number(item.refundOrderId)>0" @click.stop="goRefundOrder(item)">订单 {{ item.refundOrderSn }}</view>
 

+ 1 - 1
hdApp/src/admin/custom/rechargeChange.vue

@@ -24,7 +24,7 @@
                         </view>
                         <view class="table-row table-row-extra" v-if="!$util.isEmpty(item.remark)">
                             <view class="table-cell cell-extra">
-                                <view v-if="Number(item.shOrderId)>0" @click="goShOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+                                <view v-if="Number(item.shOrderId)>0" @click="goShOrder(item)">红冲单{{ item.shOrderSn }}</view>
                                 <view>{{ item.remark }}</view>
                             </view>
                         </view>

+ 3 - 3
hdApp/src/admin/order/detail.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
     <view class="page-det">
 
-      <!-- 售后付款单提示 -->
+      <!-- 红冲单提示 -->
       <view class="after-sale-tip" v-if="orderInfo.forward == 1" @click="goPreOrder(orderInfo)">
         <view class="tip-content">
           <text class="tip-text">红冲<block v-if="!$util.isEmpty(orderInfo.forwardMap)">,点击查看原单</block></text>
@@ -298,9 +298,9 @@
                 @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})">售后记录</button>
             </view>
 
-            <!-- 售后付款信息 -->
+            <!-- 红冲信息 -->
             <view v-if="!$util.isEmpty(orderInfo.shOrderMap)" style="color:#856404;font-size:26upx;">
-              本单有售后付款
+              本单有红冲
               <text 
                 v-for="(shItem, shIndex) in orderInfo.shOrderMap" 
                 :key="shIndex" 

+ 3 - 3
hdApp/src/admin/order/itemOrder.vue

@@ -18,7 +18,7 @@
             <view class="list-bottom" style="padding-top:0upx;">
               <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
                 <span v-if="item.sendCost > 0" class="freight-text">运费 ¥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
-                <span class="app-size-30 app-bold">{{item.forward==0?'':'售后付款 -'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
+                <span class="app-size-30 app-bold">{{item.forward==0?'':'红冲 -'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
               </view>
               <view class="list-button">
                   <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
@@ -95,7 +95,7 @@ export default {
 
     },
     batchFh(){
-      //注意要考虑售后付款单的情况!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      //注意要考虑红冲的情况!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       this.$msg('开发中')
       return false
       let that = this
@@ -114,7 +114,7 @@ export default {
       }
     },
     batchPrint(){
-      //注意要考虑售后付款单的情况!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      //注意要考虑红冲的情况!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       this.$msg('开发中')
       return false
       let that = this

+ 6 - 6
hdApp/src/admin/order/refund.vue

@@ -4,10 +4,10 @@
 		<!-- 红色提示信息 -->
 		<view class="warning-tip" v-if="shAddPay == 1">
 			<view class="warning-icon">⚠</view>
-			<text class="warning-text" v-if="shAddPayReason == 1">已过可售后时间,只能开售后付款单</text>
+			<text class="warning-text" v-if="shAddPayReason == 1">已过可售后时间,只能开红冲单</text>
 			<text class="warning-text" v-else>
-				<block v-if="Number(orderInfo.remainDebtPrice)<=0">订单已结账,只能开售后付款单</block>
-				<block v-else>订单已部分结账,只能开售后付款单</block>
+				<block v-if="Number(orderInfo.remainDebtPrice)<=0">订单已结账,只能开红冲单</block>
+				<block v-else>订单已部分结账,只能开红冲单</block>
 			</text>
 		</view>
 
@@ -216,7 +216,7 @@
 					</view>
 					<view class="confirm-text">
 						<text v-if="shAddPay == 0">确认要退款吗?</text>
-						<text v-else>确认开售后付款单吗?</text>
+						<text v-else>确认开红冲单吗?</text>
 					</view>
 				</view>
 				<view class="modal-actions">
@@ -245,7 +245,7 @@ export default {
 			orderInfo:{},
 			coundRefundPrice:0,
 			showRefundModal: false,
-			shAddPay:0,//0表示按正常流程售后,1表示开售后付款
+			shAddPay:0,//0表示按正常流程售后,1表示开红冲
 			shAddPayReason:0,//只能开付款单的几种情况:0、开的欠款单,并且已经全部或者部分结清,1、可售后时间到了
 		};
 	},
@@ -325,7 +325,7 @@ export default {
 		askRefund(){
 			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)>0 && Number(this.refundMoney) > Number(this.orderInfo.remainDebtPrice)){
 				if(this.refundType==2){
-					uni.showToast({title:'售后付款要选择商品',icon:'none'})
+					uni.showToast({title:'红冲要选择商品',icon:'none'})
 					return false
 				}
 				//如果退款金额大于剩余欠款,则提醒走开付款单方式退款