1

src/views/project/list/set-input.vue

@@ -123,9 +123,9 @@ const formModel = ref({
 const formRules = {
     name: { required: true, trigger: 'blur', message: '请先获取元素坐标' },
     textId: { required: true, trigger: 'blur', message: '请选择文本格式' },
-    date: { required: true, trigger: 'blur', message: '请选择日期格式' },
+    //date: { required: true, trigger: 'blur', message: '请选择日期格式' },
     divide_y: { required: true, trigger: 'blur', message: '请选择日期分割' },
-    time: { required: true, trigger: 'blur', message: '请选择时间格式' },
+    //time: { required: true, trigger: 'blur', message: '请选择时间格式' },
     divide_h: { required: true, trigger: 'blur', message: '请选择时间分割' },
     divide_c: { required: true, trigger: 'blur', message: '请选择中间分隔符' },
 }
@@ -155,6 +155,10 @@ const dialogSubmit = async () => {
     const form = deepClone(formModel.value)
     //如果日期存在
     if (form.textId === 'date' || form.textId === 'daterange') {
+        if (form.date.length <= 0 && form.time.length <= 0) {
+            window.$message.warning('日期或时间，至少要选择一个')
+            return
+        }
         let dateFormat = []
         if (!isNullES(form.date) && form.date.length > 0) {
             if (form.date.indexOf('YYYY') !== -1) {
@@ -195,9 +199,12 @@ const dialogSubmit = async () => {
     }
     //下拉框等数组数据
     if (['select', 'radio', 'checkbox', 'selectBox'].indexOf(form.textId) !== -1) {
+        if (tableData.value.length <= 0) {
+            window.$message.warning('请先新增要选择的数据')
+            return
+        }
         form.textInfo = tableData.value
     }
-    console.log(form)
     /*submitLoading.value = true
     const { isRes } = await mainApi.submitExcelElement(formModel.value)
     submitLoading.value = false