diff --git a/src/locales/en.ts b/src/locales/en.ts
index 18e36632..2ef1ee19 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -62,7 +62,9 @@ export default {
     copyError: 'Copy Error',
     yes: 'Yes',
     no: 'No',
-    code: 'Auto-generate on Save'
+    code: 'Auto-generate on Save',
+    enabled: 'Enabled',
+    disabled: 'Disabled'
   },
   MesCustomer: {
     fields: {
@@ -2141,7 +2143,7 @@ export default {
       moldList: 'Mold List',
       dateRange: 'Date Range',
       operableUsers: 'Responsible Person',
-      taskTime: 'Job Start Time',
+      taskTime: 'Completion Time',
       createWorkOrder: 'Create Work Order',
       placeholderName: 'Please input name',
       placeholderTaskType: 'Please select type',
@@ -2182,7 +2184,7 @@ export default {
       configName: 'Plan Config Name',
       operatorName: 'Operator',
       taskTimeRange: 'Job Time',
-      taskTime: 'Job Start Time',
+      taskTime: 'Completion Time',
       taskEndTime: 'Job End Time',
       createTime: 'Create Time',
       index: 'No.',
@@ -2310,6 +2312,7 @@ export default {
       placeholderLineSubjectContent: 'Please input repair content',
       placeholderLineRemark: 'Please input remark',
       validatorRepairCodeRequired: 'Repair order no can not be empty',
+      validatorRepairNameRequired: 'Repair order name can not be empty',
       validatorMachineryIdRequired: 'Device ID can not be empty',
       validatorMachineryCodeRequired: 'Device code can not be empty',
       validatorMachineryNameRequired: 'Device name can not be empty',
@@ -3169,6 +3172,8 @@ export default {
       export: 'Export',
       reset: 'Reset',
       query: 'Query',
+      placeholderCode: 'Please input code',
+      placeholderName: 'Please input name',
       placeholderKeyword: 'Please input code/name/product model',
       placeholderStatus: 'Mold Status',
       placeholderProduct: 'Product Model',
@@ -3830,7 +3835,7 @@ export default {
       moldName: 'Mold Name',
       configName: 'Plan Config Name',
       operatorName: 'Operator',
-      taskTime: 'Job Time',
+      taskTime: 'Completion Time',
       taskEndTime: 'Planned End Time',
       taskTimeRange: 'Job Time',
       createTime: 'Create Time',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 4f0416ec..6ff743e2 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -62,7 +62,9 @@ export default {
     copyError: '复制失败',
     yes: '是',
     no: '否',
-    code: '编码保存后自动生成'
+    code: '编码保存后自动生成',
+    enabled: '启用',
+    disabled: '停用'
   },
   MesCustomer: {
     fields: {
@@ -2136,7 +2138,7 @@ export default {
       moldList: '模具列表',
       dateRange: '起止日期',
       operableUsers: '责任人',
-      taskTime: '作业开始时间',
+      taskTime: '作业完成时间',
       createWorkOrder: '新增工单',
       placeholderName: '请输入名称',
       placeholderTaskType: '请选择类型',
@@ -2178,7 +2180,7 @@ export default {
       configName: '计划配置名称',
       operatorName: '作业人',
       taskTimeRange: '作业时间',
-      taskTime: '作业开始时间',
+      taskTime: '作业完成时间',
       taskEndTime: '作业结束时间',
       createTime: '创建时间',
       index: '序号',
@@ -2304,6 +2306,7 @@ export default {
       placeholderLineSubjectContent: '请输入维修内容',
       placeholderLineRemark: '请输入备注',
       validatorRepairCodeRequired: '维修单编号不能为空',
+      validatorRepairNameRequired: '维修单名称不能为空',
       validatorMachineryIdRequired: '设备ID不能为空',
       validatorMachineryCodeRequired: '设备编码不能为空',
       validatorMachineryNameRequired: '设备名称不能为空',
@@ -2632,6 +2635,8 @@ export default {
       export: '导出',
       reset: '重置',
       query: '查询',
+      placeholderCode: '请输入编码',
+      placeholderName: '请输入名称',
       placeholderKeyword: '请输入编码/名称/产品型号',
       placeholderStatus: '模具状态',
       placeholderProduct: '产品型号',
@@ -3301,7 +3306,7 @@ export default {
       moldName: '模具名称',
       configName: '计划配置名称',
       operatorName: '作业人',
-      taskTime: '作业时间',
+      taskTime: '作业完成时间',
       taskEndTime: '计划结束作业时间',
       taskTimeRange: '作业时间',
       createTime: '创建时间',
diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue
index 632d85f7..1cdf6dfb 100644
--- a/src/views/mes/dvrepair/DvRepairForm.vue
+++ b/src/views/mes/dvrepair/DvRepairForm.vue
@@ -44,7 +44,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="t('EquipmentManagement.DvRepair.requireDate')" prop="requireDate" required>
+              <el-form-item :label="t('EquipmentManagement.DvRepair.requireDate')" prop="requireDate">
                 <el-date-picker
                   v-model="formData.requireDate"
                   type="date"
@@ -146,17 +146,22 @@
             </el-col>
             <el-col :span="8">
               <el-form-item :label="t('EquipmentManagement.DvRepair.device')" prop="deviceId">
-                <el-select
-                  v-model="formData.deviceId"
-                  filterable
+                <el-input
+                  :model-value="selectedDeviceText"
+                  readonly
                   clearable
-                  :loading="deviceLoading"
-                  :disabled="isBaseInfoReadonly"
                   :placeholder="t('EquipmentManagement.DvRepair.placeholderDevice')"
                   class="!w-full"
+                  :disabled="isBaseInfoReadonly"
+                  @clear="clearDeviceSelection"
                 >
-                  <el-option v-for="opt in deviceOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
-                </el-select>
+                  <template #append>
+                    <el-button @click="openDeviceDialog" :disabled="isBaseInfoReadonly">
+                      <Icon icon="ep:search" class="mr-5px" />
+                      {{ t('common.select') }}
+                    </el-button>
+                  </template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="showComponentSelect" :span="8">
@@ -389,11 +394,107 @@
       </el-button>
     </div>
   </div>
+
+  <Dialog
+    :title="t('EquipmentManagement.DvRepair.device') + t('common.select')"
+    v-model="deviceDialogVisible"
+    :appendToBody="true"
+    width="1080px"
+  >
+    <el-form
+      ref="deviceDialogQueryFormRef"
+      :model="deviceDialogQueryParams"
+      :inline="true"
+      class="-mb-15px"
+    >
+      <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceCode')" prop="deviceCode">
+        <el-input
+          v-model="deviceDialogQueryParams.deviceCode"
+          :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceCode')"
+          clearable
+          class="!w-220px"
+          @keyup.enter="handleDeviceDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceName')" prop="deviceName">
+        <el-input
+          v-model="deviceDialogQueryParams.deviceName"
+          :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceName')"
+          clearable
+          class="!w-220px"
+          @keyup.enter="handleDeviceDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleDeviceDialogQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetDeviceDialogQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="deviceDialogLoading"
+      :data="deviceDialogList"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      max-height="420"
+      @row-click="handleDeviceDialogRowClick"
+      @row-dblclick="confirmDeviceSelection"
+    >
+      <el-table-column width="55" align="center">
+        <template #default="{ row }">
+          <el-radio
+            :model-value="deviceDialogSelectedId"
+            :value="String(row.id)"
+            @click.stop
+            @change="handleDeviceDialogRadioChange(row)"
+          >
+            &nbsp;
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceCode')" prop="deviceCode" min-width="150" />
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceName')" prop="deviceName" min-width="150" />
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceType')" prop="deviceTypeName" min-width="120">
+        <template #default="{ row }">
+          {{ getDeviceTypeName(row.deviceTypeName ?? row.deviceType) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceStatus')" prop="deviceStatus" width="100">
+        <template #default="{ row }">
+          <dict-tag type="mes_tz_status" :value="row.deviceStatus ?? ''" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" prop="deviceBrand" min-width="120" />
+      <el-table-column :label="t('EquipmentManagement.EquipmentLedger.sn')" prop="sn" min-width="140" />
+    </el-table>
+
+    <div class="flex justify-end mt-15px">
+      <Pagination
+        :total="deviceDialogTotal"
+        v-model:page="deviceDialogQueryParams.pageNo"
+        v-model:limit="deviceDialogQueryParams.pageSize"
+        @pagination="getDeviceDialogList"
+      />
+    </div>
+
+    <template #footer>
+      <el-button type="primary" @click="confirmDeviceSelection">{{ t('common.ok') }}</el-button>
+      <el-button @click="deviceDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
 </template>
 
 <script setup lang="ts">
 import { DvRepairApi, DvRepairVO } from '@/api/mes/dvrepair'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
+import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype'
 import { RepairItemsApi } from '@/api/mes/repairItems'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
@@ -438,7 +539,7 @@ const createDefaultFormData = (): DvRepairFormData => ({
   machineryBrand: undefined,
   machinerySpec: undefined,
   machineryTypeId: 1,
-  requireDate: undefined,
+  requireDate: Date.now(),
   finishDate: undefined,
   confirmDate: undefined,
   repairResult: '',
@@ -456,7 +557,7 @@ const createDefaultFormData = (): DvRepairFormData => ({
   acceptedBy: undefined,
   confirmBy: undefined,
   faultLevel: undefined,
-  isShutdown: undefined,
+  isShutdown: false,
   status: undefined,
   remark: undefined,
   isCode: true
@@ -504,10 +605,31 @@ const statusLabel = computed(() => {
 
 const showComponentSelect = computed(() => formData.value.machineryTypeId === 2)
 
+const selectedDeviceText = computed(() => {
+  const deviceId = formData.value.deviceId
+  if (typeof deviceId !== 'number') return ''
+  const option = deviceOptions.value.find((item) => item.value === deviceId)
+  return option?.label || `ID:${deviceId}`
+})
+
 const deviceLoading = ref(false)
 const deviceOptions = ref<{ label: string; value: number; raw?: DeviceLedgerVO }[]>([])
 const deviceOptionsLoaded = ref(false)
 
+const deviceDialogVisible = ref(false)
+const deviceDialogLoading = ref(false)
+const deviceDialogList = ref<DeviceLedgerVO[]>([])
+const deviceDialogTotal = ref(0)
+const deviceDialogSelectedId = ref('')
+const deviceDialogSelectedRow = ref<DeviceLedgerVO>()
+const deviceDialogQueryFormRef = ref()
+const deviceDialogQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deviceCode: undefined as string | undefined,
+  deviceName: undefined as string | undefined
+})
+
 const componentLoading = ref(false)
 const componentOptions = ref<{ label: string; value: number }[]>([])
 
@@ -605,6 +727,108 @@ const ensureDeviceOptionsLoaded = async () => {
   }
 }
 
+const deviceTypeNameMap = ref<Record<number, string>>({})
+
+const buildDeviceTypeNameMap = (nodes: DeviceTypeTreeVO[]) => {
+  const map: Record<number, string> = {}
+  const walk = (list: DeviceTypeTreeVO[]) => {
+    list.forEach((node) => {
+      if (typeof node?.id === 'number') {
+        map[node.id] = node.name ?? ''
+      }
+      if (Array.isArray(node?.children)) walk(node.children)
+    })
+  }
+  walk(nodes)
+  deviceTypeNameMap.value = map
+}
+
+const getDeviceTypeName = (value: any) => {
+  const id = typeof value === 'number' ? value : Number(value)
+  if (!Number.isNaN(id) && deviceTypeNameMap.value[id]) return deviceTypeNameMap.value[id]
+  return value ?? '-'
+}
+
+// ---- 设备弹框方法 ----
+const getDeviceDialogList = async () => {
+  deviceDialogLoading.value = true
+  try {
+    const data = await DeviceLedgerApi.getDeviceLedgerPage(deviceDialogQueryParams)
+    const list = Array.isArray(data) ? data : data?.list ?? data?.data?.list ?? []
+    deviceDialogList.value = list as DeviceLedgerVO[]
+    deviceDialogTotal.value = Array.isArray(data) ? data.length : data?.total ?? data?.data?.total ?? list.length
+  } finally {
+    deviceDialogLoading.value = false
+  }
+}
+
+const openDeviceDialog = async () => {
+  deviceDialogVisible.value = true
+  deviceDialogSelectedId.value = formData.value.deviceId !== undefined && formData.value.deviceId !== null
+    ? String(formData.value.deviceId)
+    : ''
+  deviceDialogSelectedRow.value = undefined
+  deviceDialogQueryParams.pageNo = 1
+  deviceDialogQueryParams.deviceCode = undefined
+  deviceDialogQueryParams.deviceName = undefined
+  if (!Object.keys(deviceTypeNameMap.value).length) {
+    try {
+      const treeData = await DeviceTypeApi.getDeviceTypeTree({})
+      buildDeviceTypeNameMap(treeData ?? [])
+    } catch (e) {}
+  }
+  await getDeviceDialogList()
+}
+
+const handleDeviceDialogQuery = () => {
+  deviceDialogQueryParams.pageNo = 1
+  getDeviceDialogList()
+}
+
+const resetDeviceDialogQuery = () => {
+  deviceDialogQueryFormRef.value?.resetFields?.()
+  handleDeviceDialogQuery()
+}
+
+const handleDeviceDialogRowClick = (row: DeviceLedgerVO) => {
+  deviceDialogSelectedId.value = String(row.id)
+  deviceDialogSelectedRow.value = row
+}
+
+const handleDeviceDialogRadioChange = (row: DeviceLedgerVO) => {
+  deviceDialogSelectedRow.value = row
+}
+
+const confirmDeviceSelection = (row?: DeviceLedgerVO) => {
+  const selected = row?.id !== undefined && row?.id !== null
+    ? row
+    : deviceDialogSelectedRow.value ||
+      deviceDialogList.value.find((item) => String(item.id) === deviceDialogSelectedId.value)
+
+  if (!selected?.id) {
+    message.warning(t('EquipmentManagement.DvRepair.validatorMachineryIdRequired'))
+    return
+  }
+
+  const id = Number(selected.id)
+  const label = `${selected.deviceCode ?? ''} ${selected.deviceName ?? ''}`.trim()
+  deviceOptions.value = upsertDeviceOption(deviceOptions.value, { label, value: id, raw: selected })
+  formData.value.deviceId = id
+  deviceDialogVisible.value = false
+  formRef.value?.clearValidate?.('deviceId')
+}
+
+const clearDeviceSelection = () => {
+  formData.value.deviceId = undefined
+  formData.value.machineryCode = undefined
+  formData.value.machineryName = undefined
+  formData.value.machinerySpec = undefined
+  formData.value.machineryBrand = undefined
+  componentOptions.value = []
+  setLineRows([])
+  formRef.value?.clearValidate?.('deviceId')
+}
+
 watch(
   () => formData.value.machineryTypeId,
   () => {
@@ -722,14 +946,9 @@ const formRules = reactive({
   ],
   requireDate: [
     {
-      validator: (_: any, value: any, callback: any) => {
-        if (!value) {
-          callback(new Error(t('EquipmentManagement.DvRepair.validatorRequireDateRequired')))
-          return
-        }
-        callback()
-      },
-      trigger: 'change'
+      required: true,
+      message: t('EquipmentManagement.DvRepair.validatorRequireDateRequired'),
+      trigger: ['blur', 'change']
     }
   ],
   faultLevel: [
diff --git a/src/views/mes/workOrderManagement/index.vue b/src/views/mes/workOrderManagement/index.vue
index 4f32f172..7f07b66d 100644
--- a/src/views/mes/workOrderManagement/index.vue
+++ b/src/views/mes/workOrderManagement/index.vue
@@ -176,13 +176,6 @@
         :formatter="dateFormatter"
         width="180"
        sortable />
-      <el-table-column
-        :label="t('EquipmentManagement.WorkOrderManagement.taskEndTime')"
-        align="center"
-        prop="taskEndTime"
-        :formatter="dateFormatter"
-        width="180"
-       sortable />
       <el-table-column
         :label="t('EquipmentManagement.WorkOrderManagement.jobResult')"
         align="center"
diff --git a/src/views/mold/moldrepair/MoldRepairForm.vue b/src/views/mold/moldrepair/MoldRepairForm.vue
index 4d70a1ca..42ff02a1 100644
--- a/src/views/mold/moldrepair/MoldRepairForm.vue
+++ b/src/views/mold/moldrepair/MoldRepairForm.vue
@@ -44,7 +44,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="t('MoldManagement.MoldRepair.requireDate')" prop="requireDate" required>
+              <el-form-item :label="t('MoldManagement.MoldRepair.requireDate')" prop="requireDate">
                 <el-date-picker
                   v-model="formData.requireDate"
                   type="date"
@@ -136,14 +136,22 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item :label="t('MoldManagement.MoldRepair.mold')" prop="moldId">
-                <el-select
-                  v-model="formData.moldId" filterable clearable :loading="moldLoading"
-                  :disabled="isBaseInfoReadonly"
+                <el-input
+                  :model-value="selectedMoldText"
+                  readonly
+                  clearable
                   :placeholder="t('MoldManagement.MoldRepair.placeholderMold')"
                   class="!w-full"
+                  :disabled="isBaseInfoReadonly"
+                  @clear="clearMoldSelection"
                 >
-                  <el-option v-for="opt in moldOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
-                </el-select>
+                  <template #append>
+                    <el-button @click="openMoldDialog" :disabled="isBaseInfoReadonly">
+                      <Icon icon="ep:search" class="mr-5px" />
+                      {{ t('common.select') }}
+                    </el-button>
+                  </template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -351,6 +359,95 @@
       <el-button v-if="!isDetailMode" @click="submitForm" type="primary" :disabled="formLoading">{{ submitButtonText }}</el-button>
     </div>
   </div>
+
+  <Dialog
+    :title="t('MoldManagement.MoldRepair.mold') + t('common.select')"
+    v-model="moldDialogVisible"
+    :appendToBody="true"
+    width="1080px"
+  >
+    <el-form
+      ref="moldDialogQueryFormRef"
+      :model="moldDialogQueryParams"
+      :inline="true"
+      class="-mb-15px"
+    >
+      <el-form-item :label="t('MoldManagement.MoldBrandPage.code')" prop="code">
+        <el-input
+          v-model="moldDialogQueryParams.code"
+          :placeholder="t('MoldManagement.MoldBrandPage.placeholderCode')"
+          clearable
+          class="!w-220px"
+          @keyup.enter="handleMoldDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="t('MoldManagement.MoldBrandPage.name')" prop="name">
+        <el-input
+          v-model="moldDialogQueryParams.name"
+          :placeholder="t('MoldManagement.MoldBrandPage.placeholderName')"
+          clearable
+          class="!w-220px"
+          @keyup.enter="handleMoldDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleMoldDialogQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetMoldDialogQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="moldDialogLoading"
+      :data="moldDialogList"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      max-height="420"
+      @row-click="handleMoldDialogRowClick"
+      @row-dblclick="confirmMoldSelection"
+    >
+      <el-table-column width="55" align="center">
+        <template #default="{ row }">
+          <el-radio
+            :model-value="moldDialogSelectedId"
+            :value="String(row.id)"
+            @click.stop
+            @change="handleMoldDialogRadioChange(row)"
+          >
+            &nbsp;
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('MoldManagement.MoldBrandPage.code')" prop="code" min-width="150" />
+      <el-table-column :label="t('MoldManagement.MoldBrandPage.name')" prop="name" min-width="160" />
+      <el-table-column :label="t('MoldManagement.MoldBrandPage.productName')" prop="productName" min-width="140" />
+      <el-table-column :label="t('MoldManagement.MoldBrandPage.status')" prop="status" width="100">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="row.status" />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="flex justify-end mt-15px">
+      <Pagination
+        :total="moldDialogTotal"
+        v-model:page="moldDialogQueryParams.pageNo"
+        v-model:limit="moldDialogQueryParams.pageSize"
+        @pagination="getMoldDialogList"
+      />
+    </div>
+
+    <template #footer>
+      <el-button type="primary" @click="confirmMoldSelection">{{ t('common.ok') }}</el-button>
+      <el-button @click="moldDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
 </template>
 
 <script setup lang="ts">
@@ -390,7 +487,7 @@ const createDefaultFormData = (): MoldRepairFormData => ({
   moldName: undefined,
   machineryBrand: undefined,
   machinerySpec: undefined,
-  requireDate: undefined,
+  requireDate: Date.now(),
   finishDate: undefined,
   confirmDate: undefined,
   repairResult: '',
@@ -398,7 +495,7 @@ const createDefaultFormData = (): MoldRepairFormData => ({
   faultPhenomenon: undefined,
   faultDescription: undefined,
   faultLevel: undefined,
-  shutdown: undefined,
+  shutdown: false,
   faultImages: '',
   faultReason: undefined,
   repairReporter: undefined,
@@ -463,6 +560,27 @@ const moldLoading = ref(false)
 const moldOptions = ref<{ label: string; value: number; raw?: MoldVO }[]>([])
 const moldOptionsLoaded = ref(false)
 
+const selectedMoldText = computed(() => {
+  const moldId = formData.value.moldId
+  if (typeof moldId !== 'number') return ''
+  const option = moldOptions.value.find((o) => o.value === moldId)
+  return option?.label || `ID:${moldId}`
+})
+
+const moldDialogVisible = ref(false)
+const moldDialogLoading = ref(false)
+const moldDialogList = ref<MoldVO[]>([])
+const moldDialogTotal = ref(0)
+const moldDialogSelectedId = ref('')
+const moldDialogSelectedRow = ref<MoldVO>()
+const moldDialogQueryFormRef = ref()
+const moldDialogQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined as string | undefined,
+  name: undefined as string | undefined
+})
+
 const users = ref<UserVO[]>([])
 
 const ensureUsersLoaded = async () => {
@@ -508,6 +626,78 @@ const ensureMoldOptionsLoaded = async () => {
   }
 }
 
+// ---- 模具弹框方法 ----
+const getMoldDialogList = async () => {
+  moldDialogLoading.value = true
+  try {
+    const data = await MoldBrandApi.getMoldBrandPage(moldDialogQueryParams)
+    const pageResult = data?.pageResult ?? data ?? {}
+    moldDialogList.value = pageResult.list ?? []
+    moldDialogTotal.value = pageResult.total ?? 0
+  } finally {
+    moldDialogLoading.value = false
+  }
+}
+
+const openMoldDialog = async () => {
+  moldDialogVisible.value = true
+  moldDialogSelectedId.value = formData.value.moldId !== undefined && formData.value.moldId !== null
+    ? String(formData.value.moldId)
+    : ''
+  moldDialogSelectedRow.value = undefined
+  moldDialogQueryParams.pageNo = 1
+  moldDialogQueryParams.code = undefined
+  moldDialogQueryParams.name = undefined
+  await getMoldDialogList()
+}
+
+const handleMoldDialogQuery = () => {
+  moldDialogQueryParams.pageNo = 1
+  getMoldDialogList()
+}
+
+const resetMoldDialogQuery = () => {
+  moldDialogQueryFormRef.value?.resetFields?.()
+  handleMoldDialogQuery()
+}
+
+const handleMoldDialogRowClick = (row: MoldVO) => {
+  moldDialogSelectedId.value = String(row.id)
+  moldDialogSelectedRow.value = row
+}
+
+const handleMoldDialogRadioChange = (row: MoldVO) => {
+  moldDialogSelectedRow.value = row
+}
+
+const confirmMoldSelection = (row?: MoldVO) => {
+  const selected = row?.id !== undefined && row?.id !== null
+    ? row
+    : moldDialogSelectedRow.value ||
+      moldDialogList.value.find((item) => String(item.id) === moldDialogSelectedId.value)
+
+  if (!selected?.id) {
+    message.warning(t('MoldManagement.MoldRepair.validatorMoldRequired'))
+    return
+  }
+
+  const id = Number(selected.id)
+  const label = `${selected.code ?? ''} ${selected.name ?? ''}`.trim()
+  moldOptions.value = upsertMoldOption(moldOptions.value, { label, value: id, raw: selected })
+  formData.value.moldId = id
+  moldDialogVisible.value = false
+  formRef.value?.clearValidate?.('moldId')
+}
+
+const clearMoldSelection = () => {
+  formData.value.moldId = undefined
+  formData.value.moldCode = undefined
+  formData.value.moldName = undefined
+  formData.value.machinerySpec = undefined
+  formData.value.machineryBrand = undefined
+  formRef.value?.clearValidate?.('moldId')
+}
+
 watch(
   () => formData.value.moldId,
   (moldId) => {
@@ -557,15 +747,10 @@ const formRules = reactive({
   moldId: [{ required: true, message: t('MoldManagement.MoldRepair.validatorMoldRequired'), trigger: 'change' }],
   requireDate: [
     {
-      validator: (_: any, value: any, callback: any) => {
-        if (!value) {
-          callback(new Error(t('MoldManagement.MoldRepair.validatorRequireDateRequired')))
-          return
-        }
-        callback()
-      },
-      trigger: 'change',
-    },
+      required: true,
+      message: t('MoldManagement.MoldRepair.validatorRequireDateRequired'),
+      trigger: ['blur', 'change']
+    }
   ],
   finishDate: [
     {
diff --git a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
index 312f9780..8538a63a 100644
--- a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
+++ b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
@@ -44,12 +44,13 @@
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.TaskManagement.planEndDate')" prop="endDate">
+      <el-form-item :label="t('EquipmentManagement.TaskManagement.dateRange')" prop="dateRange">
         <el-date-picker
-          v-model="formData.endDate"
+          v-model="formData.dateRange"
           value-format="YYYY-MM-DD"
-          type="date"
-          :placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
+          type="daterange"
+          :start-placeholder="t('EquipmentManagement.TaskManagement.placeholderStartDate')"
+          :end-placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
           class="!w-320px"
         />
       </el-form-item>
@@ -410,7 +411,7 @@ const formData = ref({
   taskType: undefined as number | undefined,
   moldList: [] as string[],
   projectForm: undefined as number | undefined,
-  endDate: undefined as string | undefined,
+  dateRange: [] as string[],
   cronExpression: undefined as string | undefined,
   operableUsers: [] as string[],
   enabled: true as boolean
@@ -422,7 +423,7 @@ const formRules = reactive({
   enabled: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEnabled'), trigger: 'change' }],
   moldList: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDeviceList'), trigger: 'change' }],
   projectForm: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderProjectForm'), trigger: 'change' }],
-  endDate: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEndDate'), trigger: 'change' }]
+  dateRange: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDateRange'), trigger: 'change' }]
 })
 
 const resetForm = () => {
@@ -432,7 +433,7 @@ const resetForm = () => {
     taskType: undefined,
     moldList: [],
     projectForm: undefined,
-    endDate: undefined,
+    dateRange: [],
     cronExpression: undefined,
     operableUsers: [],
     enabled: true
@@ -477,7 +478,7 @@ const open = async (type: string, row?: TaskManagementVO) => {
       const firstId = mapped[0]
       formData.value.projectForm = typeof firstId === 'number' && Number.isFinite(firstId) ? firstId : undefined
     }
-    formData.value.endDate = row.endDate || undefined
+    formData.value.dateRange = [row.startDate, row.endDate].filter(Boolean) as string[]
     formData.value.cronExpression = row.cronExpression
     formData.value.operableUsers = parseIdsValue((row as any).operableUsers)
     if (typeof row.enabled === 'boolean') {
@@ -656,13 +657,15 @@ const submitForm = async () => {
   await formRef.value.validate()
   formLoading.value = true
   try {
+    const [startDate, endDate] = Array.isArray(formData.value.dateRange) ? formData.value.dateRange : []
     const payload: TaskManagementVO = {
       id: formData.value.id,
       name: formData.value.name,
       taskType: formData.value.taskType,
       moldList: toCommaSeparatedIds((formData.value as any).moldList),
       projectForm: formData.value.projectForm,
-      endDate: formData.value.endDate || undefined,
+      startDate: startDate || undefined,
+      endDate: endDate || undefined,
       cronExpression: formData.value.cronExpression,
       operableUsers: toCommaSeparatedIds((formData.value as any).operableUsers),
       enabled: formData.value.enabled
diff --git a/src/views/mold/taskConfiguration/index.vue b/src/views/mold/taskConfiguration/index.vue
index 426e44ea..3df0eef4 100644
--- a/src/views/mold/taskConfiguration/index.vue
+++ b/src/views/mold/taskConfiguration/index.vue
@@ -87,7 +87,8 @@
       </el-table-column>
       <el-table-column :label="t('EquipmentManagement.TaskManagement.projectForm')" align="center" prop="projectFormName" min-width="140"  sortable />
       <!-- <el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120"  sortable /> -->
-      <el-table-column :label="t('EquipmentManagement.TaskManagement.planEndDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="150"  sortable />
+      <el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120" sortable />
+      <el-table-column :label="t('EquipmentManagement.TaskManagement.endDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="120" sortable />
       <el-table-column :label="t('EquipmentManagement.TaskManagement.cronExpression')" align="center" prop="cronExpression" min-width="180" />
       <el-table-column :label="t('EquipmentManagement.TaskManagement.enabled')" align="center" prop="enabled" width="110">
         <template #default="scope">
diff --git a/src/views/mold/workOrderInquiry/index.vue b/src/views/mold/workOrderInquiry/index.vue
index 9ab5c258..8fc1eabb 100644
--- a/src/views/mold/workOrderInquiry/index.vue
+++ b/src/views/mold/workOrderInquiry/index.vue
@@ -118,7 +118,6 @@
       </el-table-column>
       <el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.operatorName')" align="center" prop="operatorName" min-width="160"  sortable />
       <el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.taskTime')" align="center" prop="taskTime" :formatter="dateFormatter" min-width="190"  sortable />
-      <el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.taskEndTime')" align="center" prop="taskEndTime" :formatter="dateFormatter" min-width="200"  sortable />
       <el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.jobResult')" align="center" prop="jobResult" min-width="110">
         <template #default="scope">
           <el-tag v-if="scope.row.jobResult == '1'" type="success">{{ t('MoldManagement.MoldWorkOrderInquiry.jobResultOk') }}</el-tag>