From 02ba88a454bf2ff6d6208080462d99bdde09d39e Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 14:09:32 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E6=8E=92=E4=BA=A7-=E6=96=B0=E5=A2=9E-=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E3=80=81=E8=AE=A1=E5=88=92=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E6=99=9A=E5=BC=80=E5=B7=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/PlanForm.vue              | 20 +++-----------------
 src/views/mes/plan/components/PlanDetail.vue |  4 ++--
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 61433502..7f1ab8c4 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -99,24 +99,13 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanNumberLabel')" prop="planNumber">
         <el-input v-model="formData.planNumber"  />
       </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
-        <el-radio-group v-model="formData.isPreProduction">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- <el-form-item label="热压数量" prop="reyaNumber">
         <el-input v-model="formData.reyaNumber" />
       </el-form-item> -->
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanStartLabel')" prop="planStartTime">
         <el-date-picker
           v-model="formData.planStartTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :placeholder="t('ProductionPlan.Plan.dialogPlanStartPlaceholder')"
           class="!w-full"
@@ -126,7 +115,7 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanEndLabel')" prop="planEndTime">
         <el-date-picker
           v-model="formData.planEndTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :placeholder="t('ProductionPlan.Plan.dialogPlanEndPlaceholder')"
           class="!w-full"
@@ -136,7 +125,7 @@
       <el-form-item label="最晚开工时间" prop="latestStartTime">
         <el-date-picker
           v-model="formData.latestStartTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :disabled-date="latestStartDisabledDate"
           placeholder="请选择最晚开工时间"
@@ -180,7 +169,6 @@ import { PlanApi, PlanVO } from '@/api/mes/plan'
 import { TaskApi, TaskDetailVO, TaskVO } from '@/api/mes/task'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
-import { DICT_TYPE, getIntDictOptions } from "@/utils/dict";
 
 /** 生产计划 表单 */
 defineOptions({ name: 'PlanForm' })
@@ -218,7 +206,6 @@ const formData = ref({
   deviceId: undefined,
   deviceName: undefined,
   workerId: undefined,
-  isPreProduction: undefined,
   isCode: undefined,
   latestStartTime: undefined,
   finishDate: undefined,
@@ -356,7 +343,6 @@ const formRules = reactive({
     { validator: validatePlanEndTime, trigger: 'change' }
   ],
   deviceId: [{ required: true, message: '请选择设备', trigger: 'change' }],
-  isPreProduction: [{ required: true, message: t('ProductionPlan.Plan.validatorPreProductionRequired'), trigger: 'blur' }],
   latestStartTime: [
     { required: true, message: '请选择最晚开工时间', trigger: 'blur' },
     { validator: validateLatestStartTime, trigger: 'change' }
diff --git a/src/views/mes/plan/components/PlanDetail.vue b/src/views/mes/plan/components/PlanDetail.vue
index a54004ce..173256d3 100644
--- a/src/views/mes/plan/components/PlanDetail.vue
+++ b/src/views/mes/plan/components/PlanDetail.vue
@@ -55,7 +55,7 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanNumberLabel')" prop="planNumber">
         <el-input disabled v-model="formData.planNumber" />
       </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
+      <!-- <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
         <el-radio-group disabled v-model="formData.isPreProduction">
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
@@ -65,7 +65,7 @@
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanStartLabel')" prop="planStartTime">
         <el-date-picker
           disabled