From 64607dcf61c12c57c6a8ad947cadf4e8ca0caa5d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 11 Mar 2025 10:59:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(inventory=5Ftransfer):=20=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=92=8C=E6=97=A5=E6=9C=9F?=
=?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在库存调拨页面添加订单号输入框和日期范围选择器
- 实现根据订单号和日期筛选调拨记录的功能
- 优化表格列，添加订单号列
- 修复.env.development文件中的API地址
---
.env.development | 2 +-
src/views/inventory_transfer/index.vue | 47 +++++++++++++++++++++++-
src/views/order/beforehand_order/add.vue | 42 +++++++++++++++------
3 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/.env.development b/.env.development
index 522e48fce..8745ed0de 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist'
# VITE_APP_BASE_URL='http://192.168.1.10:8546'
# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
# VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
-VITE_APP_BASE_URL='http://192.168.1.22:8545'
+VITE_APP_BASE_URL='http://192.168.1.102:8545'
# VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn'
diff --git a/src/views/inventory_transfer/index.vue b/src/views/inventory_transfer/index.vue
index e65179c90..0f47ed53a 100644
--- a/src/views/inventory_transfer/index.vue
+++ b/src/views/inventory_transfer/index.vue
@@ -10,9 +10,34 @@
placeholder="请输入商品"
/>
+
+
+
+
+
+
查询
重置
+
@@ -26,6 +51,7 @@
+
@@ -76,6 +102,7 @@ import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
// import EditPopup from './edit.vue'
import EditPopup from './warehousing.vue'
+import moment from 'moment'
const editRef = shallowRef>()
// 是否显示编辑框
@@ -83,9 +110,23 @@ const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
- store_name: ''
+ store_name: '',
+ start_time: '',
+ end_time: '',
+ order_id: '',
+ timeScope: []
})
+const changeStartEndTime = () => {
+ if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
+ queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
+ queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
+ } else {
+ queryParams.start_time = ''
+ queryParams.end_time = ''
+ }
+ getLists()
+}
// 选中数据
const selectData = ref([])
@@ -125,5 +166,7 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
-getLists()
+onMounted(() => {
+ getLists()
+})
diff --git a/src/views/order/beforehand_order/add.vue b/src/views/order/beforehand_order/add.vue
index 47c364472..10c0aa226 100644
--- a/src/views/order/beforehand_order/add.vue
+++ b/src/views/order/beforehand_order/add.vue
@@ -74,7 +74,7 @@
v-model="formData.store_id"
placeholder="请选择门店"
size="large"
- @change="resetUserId"
+ @change="resetUserId"
>
-
+
-
-
+
+
@@ -398,7 +412,7 @@ const formData = reactive({
warehouse_id: '',
is_buyer: -1,
buyer_id: '',
- is_arrears: 1,
+ is_arrears: 1,
supplier_id: '',
code: '',
total_price: 0,
@@ -423,7 +437,11 @@ const formData = reactive({
address: ''
})
const enterProduct = async (e: any) => {
- const data = await apiStoreProductDetail({ id: e.id, user_id: formData.uid, store_id: formData.store_id })
+ const data = await apiStoreProductDetail({
+ id: e.id,
+ user_id: formData.uid,
+ store_id: formData.store_id
+ })
setData(e, data)
}
@@ -483,9 +501,9 @@ function handleOrderType(row) {
} else {
formData.is_buyer = -1
}
- if (formData.order_type == 7 && delivery_list.value.length == 0) {
- getDeliveryList()
- }
+ if (formData.order_type == 7 && delivery_list.value.length == 0) {
+ getDeliveryList()
+ }
}
const router = useRouter()
// 提交按钮
@@ -534,11 +552,11 @@ const dialogProductData = ref()
const enterStoreName = (e: any) => {
apiStoreProductLists({
store_name: e.store_name,
- product_type: [0, 6],
+ product_type: [0, 6, 7],
is_warehouse: 1,
order_type: formData.order_type,
user_id: formData.uid,
- store_id: formData.store_id
+ store_id: formData.store_id
// is_show: 1
}).then((res) => {
if (res.count == 1) {