提交

web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue

@@ -908,7 +908,7 @@
                           <el-option label="已退费" value="ytf" />
                         </el-select>
                       </el-form-item>
-                      <el-form-item v-if="formData.payMode === 'fq'" label="应缴费时间">
+                      <el-form-item label="应缴费时间">
                         <el-date-picker
                           v-model="detail.installmentDueDate"
                           type="date"
@@ -1426,7 +1426,7 @@
     if (detail.payStatus) {
       parts.push(payStatusLabel(String(detail.payStatus)))
     }
-    if (formData.payMode === 'fq' && detail.installmentDueDate) {
+    if (detail.installmentDueDate) {
       parts.push(`应缴日 ${formatPaymentDateYmd(String(detail.installmentDueDate))}`)
     }
     const attCount = Array.isArray(detail.attachments) ? detail.attachments.length : 0
@@ -1682,13 +1682,15 @@
     const pad = (n: number) => String(n).padStart(2, '0')
     const defaultTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
     const isFirst = formData.paymentDetails.length === 0
+    // 趸交模式下应缴费时间默认等于趸交截止时间
+    const defaultDueDate = formData.payMode === 'dj' ? formData.lumpSumDeadline : ''
     formData.paymentDetails.push({
       transferType: '',
       dueAmount: null,
       transferAmount: null,
       transferTime: defaultTime,
       payStatus: 'dfj',
-      installmentDueDate: '',
+      installmentDueDate: defaultDueDate,
       _expanded: isFirst,
       attachments: [] as Array<{
         id?: string
@@ -1754,10 +1756,21 @@
     if (val === 'fq') {
       tryGenerateInstallmentDetails()
     } else {
+      // 趸交模式：将趸交截止时间同步到所有明细的应缴费时间
       syncPaymentDueAmounts()
+      syncLumpSumDueDate()
     }
   }
 
+  /** 趸交模式：将趸交截止时间同步到所有缴费明细的应缴费时间 */
+  function syncLumpSumDueDate() {
+    if (formData.payMode !== 'dj') return
+    const deadline = formData.lumpSumDeadline || ''
+    formData.paymentDetails.forEach((d) => {
+      d.installmentDueDate = deadline
+    })
+  }
+
   function handleOpenForAdd() {
     isEdit.value = false
     dialogTitle.value = '新增协议单'
@@ -2621,6 +2634,16 @@
     () => calcBirthFromIdCard()
   )
 
+  /* ====== 趸交截止时间联动 ====== */
+  watch(
+    () => formData.lumpSumDeadline,
+    () => {
+      if (formData.payMode === 'dj') {
+        syncLumpSumDueDate()
+      }
+    }
+  )
+
   /* ====== 附件上传 ====== */
   const attachmentUploadRef = ref()