From d86bac3a7ebbb491442f4d08139327b5c64f8326 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Fri, 26 Aug 2022 15:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=80=89=E9=A1=B9=E5=8D=A1,?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=A8=E7=B1=BB=E5=A4=B1=E8=B4=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/category/form.vue                   | 36 ++++++++++---------
 src/views/category/index.vue                  |  1 +
 src/views/components/category/PreviewForm.vue |  4 ---
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/views/category/form.vue b/src/views/category/form.vue
index b7c7bce..b7b6d90 100644
--- a/src/views/category/form.vue
+++ b/src/views/category/form.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { getCategoryTree, getCategoryType } from '@/api/category/category'
-import CRUD, { form } from '@crud/crud'
+import { form } from '@crud/crud'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -67,31 +67,35 @@ export default {
   },
   methods: {
     // 新建时，判断当前节点类型，“门类类型” option区分可选
-    [CRUD.HOOK.beforeToAdd]() {
+    beforeToAdd() {
       this.form.isType = null
-      this.selectOptions.forEach(item => {
-        if (this.selectedCategory.isType === 1) {
+      if (this.selectedCategory.isType === 1) {
+        this.selectOptions.forEach(item => {
           if (item.value === 4) {
             item.typeState = true
+          } else {
+            item.typeState = false
           }
-        } else if (this.selectedCategory.isType === 2) {
+        })
+      } else if (this.selectedCategory.isType === 2) {
+        this.selectOptions.forEach(item => {
           if (item.value !== 3) {
             item.typeState = true
+          } else {
+            item.typeState = false
           }
-          this.form.isType = 3
-        } else if (this.selectedCategory.isType === 3) {
+        })
+        this.form.isType = 3
+      } else if (this.selectedCategory.isType === 3) {
+        this.selectOptions.forEach(item => {
           if (item.value !== 4) {
             item.typeState = true
+          } else {
+            item.typeState = false
           }
-          this.form.isType = 4
-        }
-      })
-    },
-    // 表单取消之后，“门类类型”可选状态恢复默认
-    [CRUD.HOOK.beforeAddCancel]() {
-      this.selectOptions.forEach(item => {
-        item.typeState = false
-      })
+        })
+        this.form.isType = 4
+      }
     },
     changeType() {
       if (this.form.isType === 6) {
diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index 0ba13d2..b7c0f85 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -215,6 +215,7 @@ export default {
         })
         return false
       }
+      this.$refs.eform.beforeToAdd()
     },
     treeNodeSort(data) {
       this.$refs.tree.updateKeyChildren(data[0].pid, JSON.parse(JSON.stringify(data)))
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index a5ec75b..7c848ab 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -71,7 +71,6 @@
 </template>
 
 <script>
-import { form } from '@crud/crud'
 import { edit, FetchDoeditIsRepeat } from '@/api/archivesManage/archivesList'
 import { getNoFormatField } from '@/api/category/fileNoFormat'
 import draggable from 'vuedraggable'
@@ -83,9 +82,6 @@ import { parseTime } from '@/utils/index.js'
 export default {
   name: 'PreviewForm',
   components: { draggable, Treeselect },
-  mixins: [
-    form({})
-  ],
   props: {
     isDisabled: {
       type: Boolean,