From f744baa34ea233cf221b10df809036278c419342 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 21 Jan 2025 09:56:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(env):=20=E5=88=87=E6=8D=A2=E5=88=B0?=
=?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E9=97=A8=E5=BA=97=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将 VITE_NOW_TYPE 和 VITE_APP_BASE_URL 从测试环境切换到正式环境
- 在订单查询页面添加门店查询按钮和相关功能
---
.env.production | 8 ++++----
src/views/order/beforehand_order/index.vue | 10 ++++++++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.env.production b/.env.production
index 71fddffd6..e2a2eab9e 100644
--- a/.env.production
+++ b/.env.production
@@ -2,9 +2,9 @@ NODE_ENV = 'production'
# Base API
# 测试域名
-VITE_NOW_TYPE = 'dist/admin'
-VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
+# VITE_NOW_TYPE = 'dist/admin'
+# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
# 正式域名
-# VITE_NOW_TYPE = 'build/admin'
-# VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
\ No newline at end of file
+VITE_NOW_TYPE = 'build/admin'
+VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/index.vue b/src/views/order/beforehand_order/index.vue
index 91808cb27..9a516ab13 100644
--- a/src/views/order/beforehand_order/index.vue
+++ b/src/views/order/beforehand_order/index.vue
@@ -77,6 +77,7 @@
/>
</el-form-item>
<el-form-item>
+ <el-button type="primary" @click="storeOrderList"> 门店 </el-button>
<el-button type="primary" @click="get_lists">查询</el-button>
<el-button @click="getResetParams">重置</el-button>
<export-data
@@ -296,7 +297,7 @@ import {
apiBeforehandOrderSettle,
apiPurchaseOrderOrderOutbound,
apiPurchaseOrderOrderOutbound3,
- apiBeforehandOrderCopy,
+ apiBeforehandOrderCopy,
apiBeforehandOrderStatisticsCount
} from '@/api/beforehand_order'
import { apiSystemStoreLists } from '@/api/system_store'
@@ -356,9 +357,14 @@ const queryParams = reactive({
order_rk: '',
order_type: '',
warehouse_type: '',
- mark: ''
+ mark: '',
+ is_store: ''
})
+const storeOrderList = () => {
+ queryParams.is_store = 1
+ get_lists()
+}
// 选中数据
const selectData = ref<any[]>([])