Răsfoiți Sursa

发货时间

shish 1 zi în urmă
părinte
comite
0f4bf49db9

+ 5 - 3
ghsApp/src/admin/billing/affirm.vue

@@ -415,8 +415,9 @@
                 <view class="uni-input" v-else @click="changeStaff()" style="width: 400upx; font-size: 32upx">{{ form.getStaffName ? form.getStaffName : '请选择' }}</view>
               </tui-list-cell>
 
+              <!-- 发货日期:可选手动补录过去日期;提交后写入销售单并同步 xhCg.sendTimeWant -->
               <tui-list-cell class="line-cell" :hover="false" :arrow="true">
-                <view class="tui-title">货日期</view>
+                <view class="tui-title">货日期</view>
                 <view class="uni-input" v-if="form.sendTimeWant == ''" style="color: #cccccc; width: 400upx; font-size: 32upx" @click="bindDateChange" >默认当天</view >
                 <view class="uni-input" @click="bindDateChange" v-else style="width: 400upx; font-size: 32upx">{{ form.sendTimeWant }}</view>
               </tui-list-cell>
@@ -924,14 +925,15 @@ export default {
     getMyFinance() {
       this.showFinance = this.showFinance == 1 ? 0 : 1;
     },
-    // 账单日期入口已下线,日期选择器仅用于送货日期
+    // 发货日期可选手动补录过去日期;提交后写入销售单并同步 xhCg.sendTimeWant
     bindDateChange() {
       this.pickerType = 'sendDate';
       this.showPicker = true;
     },
     confirmPicker(e) {
       if (this.pickerType === 'sendDate') {
-        this.form.sendTimeWant = e.value;
+        // 统一成 Y-m-d,后端按日期字符串写入销售单和 xhCg.sendTimeWant
+        this.form.sendTimeWant = String(e.value || '').replace(/\//g, '-');
       }
       this.showPicker = false;
     },

+ 8 - 0
ghsApp/src/api/order/index.js

@@ -16,6 +16,14 @@ export const modifyOrderConfirmTimeFn = data => {
 	return https.get("/order/modify-order-confirm-time", data)
 }
 
+/**
+ * 供货商 App:修改订单发货日期;同步 xhGhsOrder.sendTimeWant 与 xhCg.sendTimeWant。
+ * 对应 OrderController::actionModifySendTimeWant,允许补录过去日期。
+ */
+export const modifySendTimeWantFn = data => {
+	return https.get("/order/modify-send-time-want", data)
+}
+
 export const cancelBookOrderInfo = data => {
 	return https.get("/order/cancel-book-order", data)
 }

+ 35 - 7
ghsApp/src/pagesOrder/detail.vue

@@ -72,11 +72,19 @@
 				<view>创建日期:</view>
 				<view>{{ formatDateDisplay(detailInfo.addTime) }}</view>
 			</view>
-			<view class="order-info_box" v-if="detailInfo.payStatus == 1">
-				<view>账单日期:</view>
-				<view>
-					{{ formatDateDisplay(detailInfo.payTime) }}
+				<view class="order-info_box" v-if="detailInfo.payStatus == 1">
+					<view>账单日期:</view>
+					<view>
+						{{ formatDateDisplay(detailInfo.payTime) }}
+					</view>
 				</view>
+				<!-- 发货时间:客户要求发货日,可改过去日期;同步 xhGhsOrder 与 xhCg.sendTimeWant -->
+				<view class="order-info_box">
+					<view>发货时间:</view>
+					<view>{{ detailInfo.sendTimeWant || '当天' }}</view>
+					<view class="price">
+						<button @click="openSendTimePicker" class="admin-button-com default">修改</button>
+					</view>
 				</view>
 				<view class="order-info_box">
 					<view>客户单号:</view>
@@ -690,7 +698,7 @@
 <script>
 import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
-import { getDetail,debtPay,hasPay, freeShipping,confirmFinish,cancel,modifyRemarkFn,orderFh,modifyOrderConfirmTimeFn,printWlLabel} from "@/api/order";
+import { getDetail,debtPay,hasPay, freeShipping,confirmFinish,cancel,modifyRemarkFn,orderFh,modifyOrderConfirmTimeFn,modifySendTimeWantFn,printWlLabel} from "@/api/order";
 import { getOrderProduct,giveItem,printItemWlLabel } from "@/api/order-item";
 import productMins from "@/mixins/product";
 import { ORDER_STATUS } from "@/utils/declare";
@@ -719,6 +727,7 @@ export default {
 		return {
 			defaultPickerDate:'',
 			showPicker: false,
+			pickerType: '', // payDate=账单日期;sendDate=发货时间
 			ORDER_STATUS,
 			orderId:'',
 			selectJobType: "order_change",
@@ -1181,13 +1190,32 @@ export default {
 			this.$util.pageTo({url: '/pagesOrder/bookChange?orderId='+this.detailInfo.id})
 		},
 		openPicker(){
+			this.pickerType = 'payDate'
+			this.showPicker = true
+		},
+		// 打开发货日期选择器;允许选过去日期,确认后同步采购单 xhCg
+		openSendTimePicker(){
+			this.pickerType = 'sendDate'
+			this.defaultPickerDate = this.detailInfo.sendTimeWant || ''
 			this.showPicker = true
 		},
 		confirmPicker(e) {
 			let that = this
-			this.payDate = e.value
+			const date = String(e.value || '').replace(/\//g, '-')
+			this.showPicker = false
+			if (this.pickerType === 'sendDate') {
+				that.$util.confirmModal({content:'确认修改发货时间?'},() => {
+					modifySendTimeWantFn({id:that.detailInfo.id,date:date}).then(res=>{
+						if(res.code == 1){
+							that.$msg(res.msg)
+							that.init()
+						}
+					})
+				})
+				return
+			}
+			this.payDate = date
 			that.$util.confirmModal({content:'确认修改?'},() => {
-				that.showPicker = false
 				modifyOrderConfirmTimeFn({id:that.detailInfo.id,date:that.payDate}).then(res=>{
 					if(res.code == 1){
 						that.$msg(res.msg)