Merge branch 'master' into feature/20260519

src/components/semri/process/FlowScheduleStartModal.vue

@@ -20,6 +20,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" />
@@ -79,6 +89,8 @@
     showSuoleaderFields?: boolean;
     isNeedAppro?: string | number;
     supDeptleaderid?: string | string[];
+    showDeadlineField?: boolean;
+    deadline?: string | Date;
   }
 
   interface DeptOption {
@@ -94,6 +106,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,
@@ -102,6 +115,7 @@
     deptIds: [] as string[],
     isNeedAppro: '0',
     supDeptleaderid: '' as string | string[],
+    deadline: undefined as string | undefined,
   });
 
   function resetForm() {
@@ -112,8 +126,10 @@
     formData.deptIds = [];
     formData.isNeedAppro = '0';
     formData.supDeptleaderid = '';
+    formData.deadline = undefined;
     deptOptions.value = [];
     showSuoleaderFields.value = false;
+    showDeadlineField.value = false;
   }
 
   function normalizeDeptOptions(options: DeptOption[] = []) {
@@ -131,6 +147,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 || '发起流程';
@@ -140,6 +169,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 = '';
     }
@@ -170,6 +201,11 @@
       return;
     }
 
+    if (showDeadlineField.value && !formData.deadline) {
+      createMessage.warning('请选择事项截止时间');
+      return;
+    }
+
     emit('confirm', {
       payload: contextData.value,
       options: {
@@ -181,6 +217,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();