From 6ca2e31211dddcb688f55f1bb2a78063fc2983e2 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 22 Sep 2023 15:12:37 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=92=8C=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E6=A0=91=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=8A=A0=E7=A8=BD=E6=9F=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard/EnterpriseStandardList.vue       | 12 ++---
 .../standard/modules/CheckContentModal.vue    | 37 +++++++++++++--
 .../modules/EnterpriseStandardModal.vue       | 19 ++++++--
 .../internalWorkGroup/WorkingGroupList.vue    | 46 +++++++++----------
 4 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
index 0acac972..934c2978 100644
--- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
+++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
@@ -26,21 +26,21 @@
                   </template>
                   <span class="tree-node-custom-title">{{ record.title }}</span>
                 </a-tooltip>
-                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': record.key !== mouseInNodeKey}">
-                  <!--              新增-->
+                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': record.key !== mouseInNodeKey || record.key === 'myCollect'}">
+                  <!--  新增  -->
                   <a-button icon="plus" class="tree-operate-node-btn" v-has="'enterpriseStandard:tree:add'"
                             @click="handleTreeAdd(record)"></a-button>
-                  <!--              编辑-->
+                  <!--  编辑  -->
                   <a-button v-if="record.nodeType !== StandardSystemTreeNodeType.ROOT_NODE.value"
                             v-has="'enterpriseStandard:tree:edit'"
                             class="tree-operate-node-btn" @click="handleTreeEdit(record)">
-                    <i class="iconfont icon-bianji" style="color: #D52C26"></i>
+                    <i class="iconfont icon-bianji"></i>
                   </a-button>
-                  <!--              删除-->
+                  <!--  删除  -->
                   <a-button v-if="record.nodeType !== StandardSystemTreeNodeType.ROOT_NODE.value"
                             v-has="'enterpriseStandard:tree:delete'"
                             class="tree-operate-node-btn" @click="handleTreeDelete(record.id)">
-                    <i class="iconfont icon-shanchu_" style="color: #D52C26"></i>
+                    <i class="iconfont icon-shanchu_"></i>
                   </a-button>
                 </div>
               </div>
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue
index 31cbbf8b..95431508 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue
@@ -11,7 +11,7 @@
     <div class="content">
       <!--  左侧文件预览  -->
       <div class="content-left">
-        <iframe></iframe>
+        <iframe :src="iframeSrc" width="100%" frameborder="0"></iframe>
       </div>
       <!--  右侧表单区域  -->
       <div class="content-right">
@@ -37,6 +37,8 @@
 
 <script>
 import pick from 'lodash.pick'
+import { getFileInfo } from '@/api/api'
+import { previewPdf } from '@/utils/previewPdf'
 
 export default {
   name: 'CheckContentModal',
@@ -69,15 +71,22 @@ export default {
           validateTrigger: 'blur'
         }
       },
-      index: undefined // 编辑的表格的下标
+      index: undefined, // 编辑的表格的下标
+      iframeSrc: '' // 左侧预览的路径
     }
   },
   methods: {
-    add () {
+    add (publishOriginal) {
+      this.getFileInfo(publishOriginal).then(res => {
+        this.handlePreview(res)
+      })
       this.visible = true
       this.form.resetFields()
     },
-    edit (record, index) {
+    edit (publishOriginal, record, index) {
+      this.getFileInfo(publishOriginal).then(res => {
+        this.handlePreview(res)
+      })
       this.visible = true
       this.index = index
       this.form.resetFields()
@@ -86,6 +95,23 @@ export default {
         this.form.setFieldsValue(pick(this.model, 'subjectToClause', 'standardContentOrRequirements'))
       })
     },
+    getFileInfo (fileId) {
+      return new Promise(resolve => {
+        let fileInfo
+        getFileInfo({ id: fileId }).then(res => {
+          if (res.success) {
+            fileInfo = res.result
+          }
+        }).finally(() => {
+          resolve(fileInfo)
+        })
+      })
+    },
+    handlePreview (file) {
+      // pdf预览
+      const url = previewPdf(file.id)
+      this.iframeSrc = url
+    },
     close () {
       this.visible = false
       this.model = {}
@@ -119,6 +145,9 @@ export default {
     width: 60%;
     height: 100%;
     overflow-y: scroll;
+    iframe {
+      height: calc(100% - 20px) !important;
+    }
   }
   .content-right {
     width: 40%;
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
index 48fbdae9..55860f07 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
@@ -129,14 +129,23 @@ export default {
     },
     // 稽查内容的添加
     handleAdd () {
+      const value = this.$refs.addForm.formInline
+      let publishOriginal = ''
+      if (value.publish_of_original) {
+        publishOriginal = value.publish_of_original
+      }
       this.$refs.checkContentModal.title = this.$t('newlyAdded')
-      this.$refs.checkContentModal.add()
+      this.$refs.checkContentModal.add(publishOriginal)
     },
     // 稽查内容的编辑
     handleEdit (record, index) {
-      console.log(record, index)
+      const value = this.$refs.addForm.formInline
+      let publishOriginal = ''
+      if (value.publish_of_original) {
+        publishOriginal = value.publish_of_original
+      }
       this.$refs.checkContentModal.title = this.$t('edit')
-      this.$refs.checkContentModal.edit(record, index)
+      this.$refs.checkContentModal.edit(publishOriginal, record, index)
     },
     // 稽查内容的删除
     handleDelete (index) {
@@ -165,7 +174,9 @@ export default {
       } else {
         url = this.url.add
       }
-      postAction(url, formInline).then((res) => {
+      const param = Object.assign({}, formInline)
+      param.checkList = this.dataSource
+      postAction(url, param).then((res) => {
         if (res.success) {
           this.$message.success(this.$t('operationSuccessful'))
           this.$emit('ok')
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
index b1120d53..00684b5e 100644
--- a/src/views/system/internalWorkGroup/WorkingGroupList.vue
+++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue
@@ -15,43 +15,41 @@
             :replaceFields="{children: 'subset', title: 'name', key: 'id'}"
             :default-expand-all="defaultExpandAll"
             @select="treeSelect">
-
-            <a-icon type="folder" slot="folder" class="tree-icon" />
-            <a-icon type="file" slot="file" class="tree-icon" />
-
             <!--   没有删除  -->
-            <template #customNoDelete="{name, id}">
-              <div class="tree-operate-node" @mouseenter="handleTreeMouseover(id)" @mouseleave="handleTreeMouseout(id)">
+            <template #customNoDelete="record">
+              <div class="tree-operate-node" @mouseenter="handleTreeMouseover(record.id)" @mouseleave="handleTreeMouseout(record.id)">
+                <a-icon class="parent-node-icon" type="folder" v-if="record.subset && record.subset.length > 0" />
                 <a-tooltip>
                   <template #title>
-                    {{ name }}
+                    {{ record.name }}
                   </template>
-                  <span class="tree-node-custom-title">{{ name }}</span>
+                  <span class="tree-node-custom-title">{{ record.name }}</span>
                 </a-tooltip>
-                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': id !== mouseInNodeKey}">
+                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}">
                   <!--              新增-->
                   <a-button icon="plus" class="tree-operate-node-btn" @click="handleTreeAdd" v-has="'sys:innerWorkingGroup:tree:add'"></a-button>
                   <!--              编辑-->
-                  <a-button class="tree-operate-node-btn" @click="handleTreeEdit(name)" v-has="'sys:innerWorkingGroup:tree:edit'">
+                  <a-button class="tree-operate-node-btn" @click="handleTreeEdit(record.name)" v-has="'sys:innerWorkingGroup:tree:edit'">
                     <i class="iconfont icon-bianji" style="color: #D52C26"></i>
                   </a-button>
                 </div>
               </div>
             </template>
 
-            <template #custom="{name, id}">
-              <div class="tree-operate-node" @mouseenter="handleTreeMouseover(id)" @mouseleave="handleTreeMouseout(id)">
+            <template #custom="record">
+              <div class="tree-operate-node" @mouseenter="handleTreeMouseover(record.id)" @mouseleave="handleTreeMouseout(record.id)">
+                <a-icon class="parent-node-icon" type="folder" v-if="record.subset && record.subset.length > 0" />
                 <a-tooltip>
                   <template #title>
-                    {{ name }}
+                    {{ record.name }}
                   </template>
-                  <span class="tree-node-custom-title">{{ name }}</span>
+                  <span class="tree-node-custom-title">{{ record.name }}</span>
                 </a-tooltip>
-                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': id !== mouseInNodeKey}">
+                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}">
                   <!--              新增-->
                   <a-button icon="plus" class="tree-operate-node-btn" @click="handleTreeAdd" v-has="'sys:innerWorkingGroup:tree:add'"></a-button>
                   <!--              编辑-->
-                  <a-button class="tree-operate-node-btn" @click="handleTreeEdit(name)" v-has="'sys:innerWorkingGroup:tree:edit'">
+                  <a-button class="tree-operate-node-btn" @click="handleTreeEdit(record.name)" v-has="'sys:innerWorkingGroup:tree:edit'">
                     <i class="iconfont icon-bianji" style="color: #D52C26"></i>
                   </a-button>
                   <!--              删除-->
@@ -235,6 +233,7 @@ export default {
       getWorkGroupTreeList(params).then(res => {
         if (res.success) {
           this.treeData = this.dealTreeData(res.result)
+          this.treeData[0].scopedSlots = { title: 'customNoDelete' }
         } else {
           this.treeData = []
         }
@@ -249,12 +248,8 @@ export default {
     dealTreeData (treeData) {
       return treeData.map(item => {
         if (item.subset && item.subset.length > 0) {
-          item.scopedSlots = { icon: 'folder', title: 'custom' }
+          item.scopedSlots = { title: 'custom' }
           item.subset = this.dealTreeData(item.subset)
-        } else if (item.level === 1) {
-          item.scopedSlots = { icon: 'folder', title: 'customNoDelete' }
-        } else {
-          item.scopedSlots = { icon: 'file', title: 'custom' }
         }
         return item
       })
@@ -393,12 +388,13 @@ export default {
 </script>
 
 <style scoped lang="less">
-
-.tree-icon {
+/deep/ .ant-tree li span.ant-tree-switcher.ant-tree-switcher-noop {
   color: #1D2129;
 }
 
-/deep/ .ant-tree li span.ant-tree-switcher.ant-tree-switcher-noop {
-  display: none;
+.parent-node-icon {
+  color: #1D2129;
+  font-size: 16px;
+  margin-right: 10px;
 }
 </style>