From 6492c970722fd798e7920e13b0b56cfca90f8809 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 14 Jun 2022 17:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesList/archivesDetail.vue           | 38 ++++++------
 .../archivesManage/archivesList/index.vue     | 22 +++----
 src/views/components/category/PreviewForm.vue | 58 +++++++++++++++----
 3 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/src/views/archivesManage/archivesList/archivesDetail.vue b/src/views/archivesManage/archivesList/archivesDetail.vue
index 11c14d0..bb63fcd 100644
--- a/src/views/archivesManage/archivesList/archivesDetail.vue
+++ b/src/views/archivesManage/archivesList/archivesDetail.vue
@@ -18,7 +18,6 @@
         <template v-slot:rightButtonGroup>
           <div class="archives-handler-btn">
             <el-button class="packing-btn iconfont icon-weibiaoti-2" type="primary">装盒</el-button>
-            <el-button class="part-btn iconfont icon-weibiaoti-2" type="primary">分卷装盒</el-button>
             <el-button class="warehousing-btn iconfont icon-weibiaoti-2" type="primary">入库</el-button>
             <el-button class="lending-btn iconfont icon-weibiaoti-2" type="primary">借阅</el-button>
             <el-button class="binding-btn iconfont icon-weibiaoti-2" type="primary">绑定标签</el-button>
@@ -31,7 +30,7 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <PreviewForm :is-disabled="false" :this-fields="form" />
+        <PreviewForm :is-disabled="false" :this-fields="form" :form-preview-data="formPreviewData" />
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
@@ -194,38 +193,43 @@ export default {
       this.doLayout()
     }
   },
+  mounted() {
+  },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
       this.getTableDisplayFieldsLoading = true
-      // 请求数据
+      // 档案列表获取显示列
       getTableDisplayFields({ categoryId: this.selectedCategory.id }).then(data => {
         this.tableDisplayFields = data
         this.getTableDisplayFieldsLoading = false
         return true
       })
     },
+    // getData() {
     [CRUD.HOOK.beforeToCU]() {
       this.form.dictionaryConfigId = {}
+      // 档案预编辑获取字段
       getFormDisplayFields({ categoryId: this.selectedCategory.id }).then(data => {
         this.formPreviewData = data.showFiled.filter((fields) => { return fields.isInput })
-        this.formPreviewData.map(item => {
-          this.rules[item.fieldName] = [
-            {
-              required: item.isRequired,
-              message: (item.isInputClass === 'text' ? '请输入' : '请选择') + item.fieldCnName,
-              trigger: item.isInputClass === 'text' ? 'blur' : 'change'
-            }
-          ]
-          if (item.isDefaultValue) {
-            this.crud.defaultForm[item.fieldName] = item.isDefaultValue
-          } else {
-            this.crud.defaultForm[item.fieldName] = null
-          }
-        })
+        // this.formPreviewData.map(item => {
+        //   this.rules[item.fieldName] = [
+        //     {
+        //       required: item.isRequired,
+        //       message: (item.isInputClass === 'text' ? '请输入' : '请选择') + item.fieldCnName,
+        //       trigger: item.isInputClass === 'text' ? 'blur' : 'change'
+        //     }
+        //   ]
+        //   if (item.isDefaultValue) {
+        //     this.crud.defaultForm[item.fieldName] = item.isDefaultValue
+        //   } else {
+        //     this.crud.defaultForm[item.fieldName] = null
+        //   }
+        // })
         this.form.categoryId = this.selectedCategory.id
         return true
       })
     },
+    // },
     /* 重新渲染table组件 防止table-fixed 错位 配合watch-table数据 */
     doLayout() {
       this.$nextTick(() => {
diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue
index 2a77374..cbcf649 100644
--- a/src/views/archivesManage/archivesList/index.vue
+++ b/src/views/archivesManage/archivesList/index.vue
@@ -94,17 +94,19 @@ export default {
           currentKey = this.crud.data[0]
         }
       }
-      // 设置某个节点的当前选中状态
-      this.$refs.archivesTree.setCurrentKey(currentKey.id)
-      this.$nextTick(() => {
+      if (currentKey.id) {
+        // 设置某个节点的当前选中状态
+        this.$refs.archivesTree.setCurrentKey(currentKey.id)
+        this.$nextTick(() => {
         // 设置某个节点的父级展开
-        const selectedKey = this.$refs.archivesTree.getCurrentNode()
-        if (this.$refs.archivesTree.getNode(selectedKey) && this.$refs.archivesTree.getNode(selectedKey).parent) {
-          this.expandParents(this.$refs.archivesTree.getNode(selectedKey).parent)
-        }
-        // 选中节点的门类详情
-        this.handleNodeClick(selectedKey)
-      })
+          const selectedKey = this.$refs.archivesTree.getCurrentNode()
+          if (this.$refs.archivesTree.getNode(selectedKey) && this.$refs.archivesTree.getNode(selectedKey).parent) {
+            this.expandParents(this.$refs.archivesTree.getNode(selectedKey).parent)
+          }
+          // 选中节点的门类详情
+          this.handleNodeClick(selectedKey)
+        })
+      }
     },
     // 选中字典后，设置字典详情数据
     handleNodeClick(val) {
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 1bf185b..200ea8b 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="preview-content right-preview">
     <el-row :gutter="4">
-      <el-form ref="addOrUpdateForm" :model="addOrUpdateForm" :rules="rules" label-width="100px">
+      <el-form ref="addOrUpdateForm" :model="addOrUpdateForm" :rules="rules" label-width="120px">
         <draggable v-bind="{draggable:'.drag-item',animation:500}" :disabled="!isDisabled" @update="datadragEnd">
           <el-col v-for="(item,index) in formPreviewData" :key="index" class="drag-item" :span="item.isLine ? 24 : 12">
             <el-form-item :label="item.fieldCnName" :prop="item.fieldName">
               <!-- select  -->
+              <!-- :load-options="loadOptions" -->
               <treeselect
                 v-if="item.isInputClass === 'select'"
                 v-model="addOrUpdateForm[item.fieldName]"
+                :load-options="loadOptions"
                 :options="item.options"
                 :normalizer="normalizer"
                 placeholder=""
@@ -74,10 +76,12 @@
 </template>
 
 <script>
-import formData from './data.json'
+// import formPreviewData from './data.json'
+// import CRUD from '@crud/crud'
 import draggable from 'vuedraggable'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import { FetchFindAllSubsetById } from '@/api/archivesConfig/dictDetail'
 export default {
   name: 'PreviewForm',
@@ -86,16 +90,20 @@ export default {
     isDisabled: {
       type: Boolean,
       required: true
+    },
+    formPreviewData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
-      formPreviewData: [],
+      // formPreviewData: [],
+      formData: [],
       addOrUpdateForm: {},
       rules: {},
       tableData: [],
       popoverVisible: false,
-      options: [],
       normalizer(node) {
         if (node.childMenus == null || node.childMenus === 'null') {
           delete node.childMenus
@@ -108,17 +116,25 @@ export default {
       }
     }
   },
+  watch: {
+    formPreviewData: function(newValue, oldValue) {
+      // console.log(newValue)
+      // this.formData = newValue
+      if (newValue) {
+        this.editFormRow()
+        this.getAllSubset()
+      }
+    }
+  },
   mounted() {
-    this.formPreviewData = formData.data
-    this.editFormRow()
-    this.getAllSubset()
   },
   methods: {
     // 获取对应字典子集数据
     getAllSubset() {
       this.formPreviewData.map(item => {
-        if (item.sysDictionaryId) {
-          FetchFindAllSubsetById({ id: item.sysDictionaryId }).then(res => {
+        if (item.dictionaryConfigId) {
+          // item.options = []
+          FetchFindAllSubsetById({ id: item.dictionaryConfigId.id }).then(res => {
             if (item.isInputClass === 'select') {
               item.options = res
             } else if (item.isInputClass === 'popover') {
@@ -128,6 +144,26 @@ export default {
         }
       })
     },
+    // 获取弹窗内部门数据
+    loadOptions({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        this.formPreviewData.map(item => {
+          if (item.dictionaryConfigId) {
+            FetchFindAllSubsetById({ id: item.dictionaryConfigId.id }).then(res => {
+              parentNode.children = res.content.map(function(obj) {
+                if (obj.hasChildren) {
+                  obj.children = null
+                }
+                return obj
+              })
+              setTimeout(() => {
+                callback()
+              }, 100)
+            })
+          }
+        })
+      }
+    },
     // popover - table 单选
     clickRowHandler(row) {
       this.$refs.table.clearSelection()
@@ -150,7 +186,7 @@ export default {
       this.formPreviewData.map(item => {
         this.rules[item.fieldName] = [
           {
-            required: item.isRequired === 1,
+            required: !!item.isRequired,
             message: (item.isInputClass === 'text' ? '请输入' : '请选择') + item.fieldCnName,
             trigger: item.isInputClass === 'text' ? 'blur' : 'change'
           }
@@ -188,7 +224,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .preview-content{
-  width: 630px !important;
+  width: 840px !important;
   min-height: calc(100vh - 312px);
   padding: 20px 15px 20px 0 !important;
   margin-top: 0 !important;