|
|
@@ -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)
|