Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-naivevue

src/views/data/notice/edit.vue

@@ -24,7 +24,7 @@
           <n-form-item
             label="通知封面"
             path="cover"
-            :rules="{ required: true, message: '请上传通知封面', trigger: 'change' }"
+            :rule="{ required: true, message: '请上传通知封面', trigger: 'change' }"
           >
             <UploadImg
               @changeFileName="(name) => (formData.imageImgName = name)"
@@ -54,7 +54,7 @@
               class="flex-1"
               label="通知内容"
               path="content"
-              :rules="{ required: true, message: '请输入通知内容', trigger: 'blur' }"
+              :rule="{ required: true, message: '请输入通知内容', trigger: 'blur' }"
             >
               <Editor ref="editorRef" :height="fwbHeight" class="flex-1" name="notice" />
             </n-form-item>
@@ -176,11 +176,4 @@
       setFormData();
     }
   });
-
-  /**
-   * 定义函数
-   */
-  defineExpose({
-    openModal,
-  });
 </script>

src/views/data/notice/index.vue

@@ -186,9 +186,8 @@
    */
   const handleAdd = async () => {
     noticeId.value = 0;
-    editVisible.value = true;
     await nextTick();
-    createModalRef.value.openModal();
+    editVisible.value = true;
   };
 
   /**
@@ -196,9 +195,8 @@
    */
   async function handleEdit(record: Recordable) {
     noticeId.value = record.id;
-    editVisible.value = true;
     await nextTick();
-    createModalRef.value.openModal();
+    editVisible.value = true;
   }
 
   /**

src/views/file/emailTemplate/edit.vue

@@ -66,7 +66,7 @@
         <n-form-item
           label="模板文件"
           path="filePath"
-          :rules="{ required: true, message: '请上传模板文件', trigger: 'blur' }"
+          :rule="{ required: true, message: '请上传模板文件', trigger: 'blur' }"
         >
           <UploadFile
             @upload="fileUpload"

src/views/file/fileTemplate/edit.vue

@@ -43,7 +43,7 @@
         <n-form-item
           label="模板文件"
           path="filePath"
-          :rules="{ key: 'filePath', required: true, message: '请上传模板文件', trigger: 'blur' }"
+          :rule="{ key: 'filePath', required: true, message: '请上传模板文件', trigger: 'blur' }"
         >
           <UploadFile
             @upload="fileUpload"

src/views/file/messageTemplate/edit.vue

@@ -66,7 +66,7 @@
         <n-form-item
           label="模板内容"
           name="content"
-          :rules="{ required: true, message: '请输入模板内容', trigger: 'blur' }"
+          :rule="{ required: true, message: '请输入模板内容', trigger: 'blur' }"
         >
           <n-input
             type="textarea"

src/views/file/smsTemplate/edit.vue

@@ -66,7 +66,7 @@
         <n-form-item
           label="模板内容"
           path="content"
-          :rules="{ required: true, message: '请输入模板内容', trigger: 'blur' }"
+          :rule="{ required: true, message: '请输入模板内容', trigger: 'blur' }"
         >
           <n-input
             type="textarea"