组成相册必填校验

src/views/other-file/image-view.vue

@@ -147,7 +147,7 @@
             </video>
         </hc-new-dialog>
         <!-- 组成相册 弹框 -->
-        <hc-new-dialog v-model="albumDialog" title="预览" widths="47rem" :loading="albumDialogLoading" @save="saveAlbum">
+        <hc-new-dialog v-model="albumDialog" title="组成相册" widths="47rem" :loading="albumDialogLoading" @save="saveAlbum">
             <el-form ref="albumFormRef" :model="albumForm" label-width="auto" :rules="albumRules">
                 <el-form-item label="相册文件题名" prop="imagesName">
                     <el-input v-model="albumForm.imagesName" />
@@ -158,7 +158,7 @@
                 <el-form-item label="分组号">
                     <el-input v-model="albumForm.groupNumber" />
                 </el-form-item>
-                <el-form-item label="拍摄起止日期">
+                <el-form-item label="拍摄起止日期" prop="dateValue">
                     <!-- <el-input v-model="albumForm.dateValue" /> -->
                     <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                 </el-form-item>
@@ -175,7 +175,7 @@ import WbsTree from './components/WbsTree.vue'
 import HcTreeData from './components/HcTreeData.vue'
 import imageApi from '~api/other-file/imageData'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
-import { arrToId, arrToKey, downloadBlob, getArrValue } from 'js-fast-way'
+import { arrToId, arrToKey, downloadBlob, formValidate, getArrValue } from 'js-fast-way'
 import { HcDelMsg } from 'hc-vue3-ui'
 import { toPdfPage } from '~uti/btn-auth'
 import website from '~src/config'
@@ -581,7 +581,10 @@ const albumRules = ref({
         { required: true, message: '请输入相册文件题名', trigger: 'blur' },
     ],
        photographer: [
-        { required: true, message: '请输入相册文件题名', trigger: 'blur' },
+        { required: true, message: '请输入主要拍摄人', trigger: 'blur' },
+    ],
+    dateValue: [
+        { required: true, message: '请选择拍摄起止日期', trigger: 'blur' },
     ],
 })
 
@@ -607,10 +610,7 @@ const combineAlbumClick = ()=>{
     betweenTime.value = []
     albumDialog.value = true
 const arr = getDateRangeFromShootTime(tableCheckedKeys.value)
-console.log(arr, 'arr')
-// albumForm.value.dateValue = arr
 betweenTime.value = arr
-
  albumForm.value.dateValue = arr.join('~')
 
                 
@@ -647,9 +647,9 @@ console.log('日期范围:', [startDate, endDate]) // 输出: ["2025-07-01", "20
 const albumDialogLoading = ref(false)
 const saveAlbum = async () => {
     const rows = tableCheckedKeys.value
-        const margePdfUrls = arrToKey(rows, 'margePdfUrl', ',')
-        console.log(margePdfUrls, 'margePdfUrls')
-        
+    const margePdfUrls = arrToKey(rows, 'margePdfUrl', ',')
+    const validate = await formValidate(albumFormRef.value)
+    if (!validate) return
     albumDialogLoading.value = true
     const { error, code, msg } = await albumApi.save(
        { ...albumForm.value,