From 965d1c096e77c950ccc113e02f09799c9e7580aa Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Fri, 24 May 2024 09:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BD=9C=E4=B8=BA=E5=AE=9E=E9=99=85=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                                   |  4 ++--
 .gitignore                                             |  1 +
 .../Gw/productionWorkOrder/ProductionWorkOrderForm.vue | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 6a422c5..9fce053 100644
--- a/.env
+++ b/.env
@@ -5,8 +5,8 @@ VITE_PORT=8090
 VITE_OPEN=true
 # 内部测试
 # VITE_BASE_URL='http://222.71.165.188:8102'
-VITE_BASE_URL='http://localhost:8102'
-# VITE_BASE_URL='http://192.168.30.3:8102'
+# VITE_BASE_URL='http://localhost:8102'
+VITE_BASE_URL='http://192.168.30.3:8102'
 # 外网测试
 # VITE_BASE_URL='http://60.190.91.78:8102'
 # 接口地址
diff --git a/.gitignore b/.gitignore
index 12539fa..bd6e634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ coverage
 .env
 dist.zip
 .env
+.env
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
index 8157cc9..730206d 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
@@ -131,7 +131,7 @@
                         </vxe-form-item>
                         <vxe-form-item title="实际完成日期" field="ActualFinishDate" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.ActualFinishDate" placeholder="请输入实际完成日期" clearable disabled
+                                <vxe-input v-model="params.data.ActualFinishDate" placeholder="以成品入库时间作为实际完成日期" clearable disabled
                                     style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
                             </template>
                         </vxe-form-item>
@@ -244,8 +244,8 @@ const formDataA: any = ref(
         "Unit": "台",
         "PlanStartDate": dayjs().format("YYYY-MM-DD"),
         "PlanFinishDate": dayjs().format("YYYY-MM-DD"),
-        "ActualStartDate": dayjs().format("YYYY-MM-DD"),
-        "ActualFinishDate": dayjs().format("YYYY-MM-DD"),
+        "ActualStartDate": '',
+        "ActualFinishDate": '',
         "WoStatus": "1",
         "EntityCode": "",
         "ProcessRouteNo": "",
@@ -521,8 +521,8 @@ const fnResetA = () => {
         "Unit": "台",
         "PlanStartDate": dayjs().format("YYYY-MM-DD"),
         "PlanFinishDate": dayjs().format("YYYY-MM-DD"),
-        "ActualStartDate": dayjs().format("YYYY-MM-DD"),
-        "ActualFinishDate": dayjs().format("YYYY-MM-DD"),
+        "ActualStartDate": '',
+        "ActualFinishDate": '',
         "WoStatus": 1,
         "EntityCode": "",
         "ProcessRouteNo": "",