From 6ab824e24bc3126c3d43b318ec244f895ecb9e3d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 七月 2024 14:35:37 +0800
Subject: [PATCH] 修改发货的时间保存
---
north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js | 6 +++++-
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 14 ++++++++------
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 12 +++++++-----
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js b/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
index 48aee97..a052b13 100644
--- a/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
+++ b/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
@@ -6,7 +6,9 @@
state: () => ({
orderId:null,
reviewList:[],
- selectDate:ref(["",""])
+ selectDate:ref(["",""]),
+ selectDeliveryDate:ref(["",""]),
+ selectOrderListDate:ref(["",""])
}),
actions: {
@@ -24,6 +26,8 @@
},
clearSelectDate(){
this.selectDate=["",""]
+ this.selectDeliveryDate=["",""]
+ this.selectOrderListDate=["",""]
}
},
persist: true
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 41f2ee0..ff0c720 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -13,9 +13,11 @@
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
//璇█鑾峰彇
const { t } = useI18n()
+const orderInfo = useOrderInfoStore()
const router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -89,13 +91,13 @@
})
//绗竴娆¤皟鐢�
-request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ orderInfo.selectDeliveryDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -129,7 +131,7 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
@@ -147,7 +149,7 @@
const selectOrderList = ()=>{
- request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
if(res.code==200){
if (res.data.total!=null){
@@ -333,7 +335,7 @@
<template>
<div style="width: 100%;height: 100%">
<el-date-picker
- v-model="selectDate"
+ v-model="orderInfo.selectDeliveryDate"
type="daterange"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index 44f5408..e794bc6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -8,9 +8,11 @@
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
//璇█鑾峰彇
const { t } = useI18n()
+const orderInfo = useOrderInfoStore()
const router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -68,12 +70,12 @@
//绗竴娆¤皟鐢�
-request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ orderInfo.selectOrderListDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -103,12 +105,12 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ orderInfo.selectOrderListDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -121,7 +123,7 @@
}
const selectOrderList = ()=>{
- request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
if(res.code==200){
if (res.data.total!=null){
@@ -305,7 +307,7 @@
<template>
<div style="width: 100%;height: 100%">
<el-date-picker
- v-model="selectDate"
+ v-model="orderInfo.selectOrderListDate"
type="daterange"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
--
Gitblit v1.8.0