fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/index.vue

@@ -121,12 +121,9 @@ import { get } from '@/utils/request';
 import { Delete, Plus } from "@element-plus/icons-vue"
 import { FormInstance } from 'element-plus';
 import { getFromValue } from '@/utils/tools';
-const props = defineProps<{
-  visible: boolean,
-  saveLoading: saveLoadingType,
-  editForm: Object
-}>()
-const emit = defineEmits(['closeModalVisible', 'submitForm'])
+import { Props, Emits, TASK_VALUE_TYPE, REPEAT_VALUE_TYPE, } from './type';
+const props = defineProps<Props>()
+const emits = defineEmits<Emits>();
 watch(() => props.saveLoading, (val) => {
   if (val == "3") {
     formRef.value?.resetFields();
@@ -177,7 +174,7 @@ const generateFormData = ref<any>(defaultGenerateFormData);
 const modalVisible = ref(false);
 function closeVisible() {
   generateFormData.value = defaultGenerateFormData;
-  emit('closeModalVisible')
+  emits('close')
 }
 function submitForm(formEl: FormInstance | undefined, isClose: boolean) {
   if (!formEl) return
@@ -192,8 +189,7 @@ function submitForm(formEl: FormInstance | undefined, isClose: boolean) {
         repeatDesignDay,
         ...res
       })
-      console.log("submitDAata", submitData);
-      emit('submitForm', submitData, isClose)
+      emits('submit', submitData, isClose)
     }).catch((err: any) => {
       console.log(err);
     })

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/type.d.ts

@@ -1,2 +1,29 @@
 type TASK_VALUE_TYPE = "0" | "1" | "2" | "3";
 type REPEAT_VALUE_TYPE = "0" | "1" | "2" | "3" | "4";
+export interface Props {
+  /**
+   *  弹窗是否显示
+   */
+  visible: boolean;
+  /**
+   *  保存按钮loading
+   */
+  saveLoading: saveLoadingType;
+  /**
+   * form表单的值
+   */
+  editForm: Object;
+}
+
+export interface Emits {
+  /**
+   *  关闭弹窗事件
+   */
+  (event: "close"): void;
+  /**
+   * 提交表单事件
+   * @param submitData 表单数据
+   * @param isClose 是否关闭弹窗
+   */
+  (event: "submit", submitData: Object, isClose: boolean): void;
+}

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/index.vue

@@ -2,7 +2,7 @@
   <div class="h-full flex">
     <div class="p-5 w-80 pr-0">
       <div class="bg-white w-full h-full shadow-md rounded-md flex flex-col">
-        <div class="flex-1 p-3 overflow-y-auto">
+        <div class="flex-1 p-3 overflow-y-auto scroll-bar">
           <el-form :model="searchForm">
             <el-form-item label="任务名称：" label-width="7em" prop="taskName">
               <el-input v-model="searchForm.taskName" placeholder="请输入" />
@@ -114,8 +114,8 @@
         </div>
       </div>
     </div>
-    <TaskModal :visible="taskModalVisible" :saveLoading="taskLoading" :edit-form="taskForm"
-      @close-modal-visible="closeModal()" @submitForm="submitForm" />
+    <TaskModal :visible="true" :saveLoading="taskLoading" :edit-form="taskForm" @close="closeModal()"
+      @submit="submitForm" />
   </div>
 </template>
 
@@ -139,7 +139,7 @@ function submitForm(data: any, isClose: boolean) {
   console.log("提交的数据水水水水", data, isClose);
   taskLoading.value = "2";
   setTimeout(() => {
-    taskLoading.value = "4";
+    taskLoading.value = "3";
     taskModalVisible.value = isClose;
   }, 2000)