From 06766984a9a0af0884bfd9a50afc64bbc81ee417 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 3 Dec 2024 11:19:36 +0800
Subject: [PATCH] dev
---
.env.prod | 4 ++--
src/views/mes/producereport/AdminIndex.vue | 1 +
src/views/mes/producereport/DailyReportIndex.vue | 1 +
src/views/mes/producereport/ProduceReportForm.vue | 10 +++++++---
.../mes/producereport/components/AdminReplaceForm.vue | 11 +++++++----
src/views/mes/producereport/index.vue | 1 +
6 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.env.prod b/.env.prod
index c7e5c383..841fd104 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,12 +4,12 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径
-VITE_BASE_URL='http://47.106.185.127:48080'
+VITE_BASE_URL='http://47.106.185.127:48081'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
-VITE_UPLOAD_URL='http://47.106.185.127:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.106.185.127:48081/admin-api/infra/file/upload'
# 接口地址
VITE_API_URL=/admin-api
diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue
index 295e2497..a92d551c 100644
--- a/src/views/mes/producereport/AdminIndex.vue
+++ b/src/views/mes/producereport/AdminIndex.vue
@@ -127,6 +127,7 @@
+
diff --git a/src/views/mes/producereport/DailyReportIndex.vue b/src/views/mes/producereport/DailyReportIndex.vue
index 4170726e..f09045a2 100644
--- a/src/views/mes/producereport/DailyReportIndex.vue
+++ b/src/views/mes/producereport/DailyReportIndex.vue
@@ -180,6 +180,7 @@
+
diff --git a/src/views/mes/producereport/ProduceReportForm.vue b/src/views/mes/producereport/ProduceReportForm.vue
index 3f2d53f3..1692b5ce 100644
--- a/src/views/mes/producereport/ProduceReportForm.vue
+++ b/src/views/mes/producereport/ProduceReportForm.vue
@@ -77,10 +77,13 @@
-
- {{warningInfo}}
+
+
+
+
+ {{warningInfo}}
@@ -143,7 +146,8 @@ const formData = ref({
groupType: undefined,
reportType: undefined,
reportDateString: undefined,
- reportDate: undefined
+ reportDate: undefined,
+ plusTime: undefined
})
const formRules = reactive({
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
diff --git a/src/views/mes/producereport/components/AdminReplaceForm.vue b/src/views/mes/producereport/components/AdminReplaceForm.vue
index 0ebfbb33..e4eced28 100644
--- a/src/views/mes/producereport/components/AdminReplaceForm.vue
+++ b/src/views/mes/producereport/components/AdminReplaceForm.vue
@@ -92,11 +92,13 @@
-
-
- {{warningInfo}}
+
+
+
+
+ {{warningInfo}}
@@ -161,7 +163,8 @@ const formData = ref({
groupType: undefined,
reportType: undefined,
reportDateString: undefined,
- reportDate: undefined
+ reportDate: undefined,
+ plusTime: undefined
})
const formRules = reactive({
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue
index 72e04da8..54db8960 100644
--- a/src/views/mes/producereport/index.vue
+++ b/src/views/mes/producereport/index.vue
@@ -101,6 +101,7 @@
+