From 73f2e73d014434d143449e12ff512949c1f3c46b Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Tue, 19 May 2026 10:25:22 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260519-=E5=8F=91=E8=B5=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=97=B6=EF=BC=8C=E7=A1=AE=E8=AE=A4ddl=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=AF=E8=AF=A5?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=9A=84ddl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../semri/process/FlowScheduleStartModal.vue  | 37 +++++++++++++++++++
 .../bg/bgpartymatter/BgPartymatterList.vue    | 12 +++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 967832e..683a493 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -27,6 +27,16 @@
         />
       </a-form-item>
 
+      <a-form-item v-if="showDeadlineField" label="事项截止时间">
+        <a-date-picker
+          v-model:value="formData.deadline"
+          valueFormat="YYYY-MM-DD"
+          placeholder="请选择事项截止时间"
+          style="width: 100%"
+          :getPopupContainer="(node) => node?.parentNode"
+        />
+      </a-form-item>
+
       <template v-if="showSuoleaderFields">
         <a-form-item label="是否所办领导审批">
           <j-switch v-model:value="formData.isNeedAppro" />
@@ -96,6 +106,8 @@
     showSuoleaderFields?: boolean;
     isNeedAppro?: string | number;
     supDeptleaderid?: string | string[];
+    showDeadlineField?: boolean;
+    deadline?: string | Date;
   }
 
   interface DeptOption {
@@ -111,6 +123,7 @@
   const contextData = ref<Record<string, any>>({});
   const deptOptions = ref<DeptOption[]>([]);
   const showSuoleaderFields = ref(false);
+  const showDeadlineField = ref(false);
   const formData = reactive({
     triggerMode: 'immediate',
     intervalType: undefined as number | string | undefined,
@@ -119,6 +132,7 @@
     deptIds: [] as string[],
     isNeedAppro: '0',
     supDeptleaderid: '' as string | string[],
+    deadline: undefined as string | undefined,
   });
 
   function resetForm() {
@@ -129,8 +143,10 @@
     formData.deptIds = [];
     formData.isNeedAppro = '0';
     formData.supDeptleaderid = '';
+    formData.deadline = undefined;
     deptOptions.value = [];
     showSuoleaderFields.value = false;
+    showDeadlineField.value = false;
   }
 
   function normalizeDeptOptions(options: DeptOption[] = []) {
@@ -148,6 +164,19 @@
     return Array.from(optionMap.values());
   }
 
+  function normalizeDeadlineValue(value?: string | Date) {
+    if (!value) {
+      return undefined;
+    }
+    if (typeof value === 'string') {
+      return value.length >= 10 ? value.substring(0, 10) : value;
+    }
+    const year = value.getFullYear();
+    const month = String(value.getMonth() + 1).padStart(2, '0');
+    const day = String(value.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  }
+
   function open(data: ModalPayload = {}) {
     resetForm();
     title.value = data.title || '发起流程';
@@ -157,6 +186,8 @@
     showSuoleaderFields.value = !!data.showSuoleaderFields;
     formData.isNeedAppro = String(data.isNeedAppro ?? '0');
     formData.supDeptleaderid = data.supDeptleaderid || '';
+    showDeadlineField.value = !!data.showDeadlineField;
+    formData.deadline = normalizeDeadlineValue(data.deadline);
     if (String(formData.isNeedAppro) !== '1') {
       formData.supDeptleaderid = '';
     }
@@ -187,6 +218,11 @@
       return;
     }
 
+    if (showDeadlineField.value && !formData.deadline) {
+      createMessage.warning('请选择事项截止时间');
+      return;
+    }
+
     emit('confirm', {
       payload: contextData.value,
       options: {
@@ -198,6 +234,7 @@
         deptIds: [...formData.deptIds],
         isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
         supDeptleaderid: showSuoleaderFields.value ? (String(formData.isNeedAppro) === '1' ? formData.supDeptleaderid : '') : undefined,
+        deadline: showDeadlineField.value ? formData.deadline : undefined,
       },
     });
     handleCancel();
diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index 309bcfa..fbe5d6b 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -433,6 +433,8 @@
       showSuoleaderFields: true,
       isNeedAppro: record?.isNeedAppro,
       supDeptleaderid: record?.supDeptleaderid,
+      showDeadlineField: true,
+      deadline: record?.deadline,
     });
   }
 
@@ -474,12 +476,18 @@
     const formatDate = (value, format) => {
       return value ? dateUtil(value).format(format) : undefined;
     };
+    const formatDeadlineDateTime = (value) => {
+      const deadlineDate = formatDate(value, 'YYYY-MM-DD');
+      return deadlineDate ? `${deadlineDate} 00:00:00` : undefined;
+    };
     const nextSuperviseCount = getNextSuperviseCount(record.superviseCount);
+    const selectedDeadline = options.deadline || record.deadline;
     const flowJsonData = {
       ...record,
       isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
       supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
       superviseCount: nextSuperviseCount,
+      deadline: selectedDeadline,
     };
 
     const params = {
@@ -502,8 +510,8 @@
         urgencyLevel: record.urgencyLevel,
         deptId: options.deptId || record.responDeptid,
         deptLeaderId: record.responDeptid,
-        requireFinishDate: formatDate(record.deadline, 'YYYY-MM-DD'),
-        deadline: formatDate(record.deadline, 'YYYY-MM-DD HH:mm:ss'),
+        requireFinishDate: formatDate(selectedDeadline, 'YYYY-MM-DD'),
+        deadline: formatDeadlineDateTime(selectedDeadline),
       },
     };