Merge branch 'wyz' into 'test'

修复入账检核新增

See merge request !151

src/components/SearchForm/SearchForm.vue

@@ -554,6 +554,9 @@ function syncExtraFieldsForProp(prop, value) {
     }
     }
     if (needUpdate) {
     if (needUpdate) {
       localModel.value = newModel
       localModel.value = newModel
+      console.log('====================================')
+      console.log('localModel.value', localModel.value)
+      console.log('====================================')
       return true
       return true
     }
     }
   }
   }
@@ -1002,7 +1005,17 @@ function handleNumberInput(value, item) {
     localModel.value = { ...localModel.value, [prop]: result }
     localModel.value = { ...localModel.value, [prop]: result }
   }
   }
 }
 }
-
+// 同步所有 select 的 extra 字段
+function syncAllExtraFields() {
+  for (const item of internalConfig.value) {
+    if (item.type === 'select' && item.onChangeExtraFields) {
+      const currentVal = localModel.value[item.prop]
+      if (currentVal !== undefined && currentVal !== null && currentVal !== '') {
+        syncExtraFieldsForProp(item.prop, currentVal)
+      }
+    }
+  }
+}
 // ==================== 初始化 ====================
 // ==================== 初始化 ====================
 onMounted(async () => {
 onMounted(async () => {
   internalConfig.value = deepCloneConfig(props.config)
   internalConfig.value = deepCloneConfig(props.config)
@@ -1081,8 +1094,27 @@ defineExpose({
       }
       }
     })
     })
     localModel.value = { ...resetData }
     localModel.value = { ...resetData }
-    nextTick(() => formRef.value?.clearValidate())
+    // 关键：重置后重新同步额外字段
+    nextTick(() => {
+      syncAllExtraFields()
+      formRef.value?.clearValidate()
+    })
   },
   },
+  // resetForm() {
+  //   const resetData = {}
+  //   internalConfig.value.forEach(item => {
+  //     const key = item.prop
+  //     if (['checkbox-group', 'daterange', 'monthrange'].includes(item.type) || item.multiple) {
+  //       resetData[key] = item.defaultValue ?? []
+  //     } else if (item.type === 'upload') {
+  //       resetData[key] = item.defaultValue ?? []
+  //     } else {
+  //       resetData[key] = item.defaultValue ?? ''
+  //     }
+  //   })
+  //   localModel.value = { ...resetData }
+  //   nextTick(() => formRef.value?.clearValidate())
+  // },
   // async refreshRemoteOptions(targetProp) {
   // async refreshRemoteOptions(targetProp) {
   //   const item = internalConfig.value.find(i => i.prop === targetProp)
   //   const item = internalConfig.value.find(i => i.prop === targetProp)
   //   if (!item) {
   //   if (!item) {

src/views/financialCenter/financialIncome.vue

@@ -346,7 +346,6 @@
       @close="closeDialog()"
       @close="closeDialog()"
       @confirm="handleAddCheckRecord()"
       @confirm="handleAddCheckRecord()"
     >
     >
-      {{}}
       <el-row>
       <el-row>
         <el-col :xs="24" :sm="24" :md="24" :lg="24">
         <el-col :xs="24" :sm="24" :md="24" :lg="24">
           <SearchForm
           <SearchForm
@@ -1134,6 +1133,7 @@ const handleAddCheckList = () => {
   //   }
   //   }
   //   return item
   //   return item
   // })
   // })
+  
   addReceivablesFormModel.value = { ...selectedRow.value }
   addReceivablesFormModel.value = { ...selectedRow.value }
   addCheckRecordDialogFlag.value = true
   addCheckRecordDialogFlag.value = true
   clearForm('addReceivablesFormModel')
   clearForm('addReceivablesFormModel')