From 9ef9e4837ceafe0c4709334dd1a57b65ddae5bc6 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 26 Jun 2024 09:36:46 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=BA=93=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryComplianceAssessmentDatabase.js |  5 +++-
 .../en.js                                     |  3 ++-
 .../zh.js                                     |  3 ++-
 .../nonmatchItem/NonmatchItemList.vue         | 25 +++++++++++--------
 .../modules/NonmatchItemCloseModal.vue        | 18 +++++++++----
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/api/regulatoryComplianceAssessmentDatabase.js b/src/api/regulatoryComplianceAssessmentDatabase.js
index 4053037..4bd8ee6 100644
--- a/src/api/regulatoryComplianceAssessmentDatabase.js
+++ b/src/api/regulatoryComplianceAssessmentDatabase.js
@@ -2,7 +2,10 @@ import { getAction, postAction } from './manage'
 
 // 不符合项库-关闭
 const nonmatchItemClose = (params) => postAction('', params)
+// 不符合项库-批量关闭
+const nonmatchItemBatchClose = (params) => postAction('/assessment/lawsEvaluationNotMet/batchClose', params)
 
 export {
-  nonmatchItemClose
+  nonmatchItemClose,
+  nonmatchItemBatchClose
 }
diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
index f585f55..6f07b7e 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
@@ -36,6 +36,7 @@ module.exports = {
     rectificationCost: 'Rectification cost',
     sharedWithOtherProjects: 'Shared with other projects',
     costOfThisItemAfterSharing: 'Cost of this item after sharing',
-    isHaveClosed: 'Select the data whose rectification status is to be rectified and close it'
+    isHaveClosed: 'Select the data whose rectification status is to be rectified and close it',
+    exportName: 'non match item library table'
   }
 }
diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
index 986191b..aa2cb60 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
@@ -36,6 +36,7 @@ module.exports = {
     rectificationCost: '整改费用',
     sharedWithOtherProjects: '与其他项目共用性',
     costOfThisItemAfterSharing: '共用后本项目所需费用',
-    isHaveClosed: '请选择整改状态为待整改的数据进行关闭'
+    isHaveClosed: '请选择整改状态为待整改的数据进行关闭',
+    exportName: '不符合项库表'
   }
 }
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index 0dc0ed5..bf1c516 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -37,18 +37,16 @@
               <a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-tree-select
                   tree-node-filter-prop="title"
-                  v-model="queryParam.responsibleDepartment"
+                  v-model="queryParam.authDept"
                   :maxTagCount="1"
                   allowClear
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
                   :tree-data="categoryTreeList"
-                  :placeholder="$t('pleaseSelect') + $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment')"
-                  treeCheckable
-                  treeCheckStrictly
                   show-search
                   :filterTreeNode="filterTreeOption"
+                  :placeholder="$t('pleaseSelect') + $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment')"
                 />
               </a-form-item>
             </a-col>
@@ -87,11 +85,12 @@
 
     <div class="table-operator">
       <!--  导出  -->
-      <a-button icon="upload" type="primary" ghost @click="handleExportXls($t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.exportName'))">
+      <a-button icon="upload" type="primary" ghost v-has="'lawsEvaluationNotMet:export'"
+                @click="handleExportXls($t('regulatoryComplianceAssessmentDatabase.nonmatchItem.exportName'))">
         {{ $t('export') }}
       </a-button>
       <!--  批量关闭 -->
-      <a-button icon="close" type="primary" ghost @click="batchClose">{{ $t('batchClose') }}</a-button>
+      <a-button icon="close" type="primary" ghost @click="batchClose" v-has="'lawsEvaluationNotMet:batchClose'">{{ $t('batchClose') }}</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -285,7 +284,8 @@ export default {
         }
       ],
       url: {
-        list: '/assessment/lawsEvaluationNotMet/page'
+        list: '/assessment/lawsEvaluationNotMet/page',
+        exportXlsUrl: '/assessment/lawsEvaluationNotMet/exportXls'
       },
       image: false,
       imageUrl: ''
@@ -350,7 +350,7 @@ export default {
         this.$message.warning(this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.isHaveClosed'))
         return
       }
-      this.$refs.nonmatchItemCloseModal.open(this.selectedRowKeys)
+      this.$refs.nonmatchItemCloseModal.open({ ids: this.selectedRowKeys.join(',') })
     },
     previewFile (record) {
       // 截取文件后缀名
@@ -390,13 +390,16 @@ export default {
     },
     // 查看
     handleLook (record) {
-      console.log('----', record)
       this.$refs.nonmatchItemLookModal.open(record)
     },
     // 关闭
     handleClose (record) {
-      this.$refs.nonmatchItemCloseModal.open(record.id)
-    }
+      this.$refs.nonmatchItemCloseModal.open({ id: record.id })
+    },
+    filterTreeOption (input, option) {
+      const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label
+      return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
   }
 }
 </script>
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
index ddfb784..d793e9b 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { nonmatchItemClose } from '@/api/regulatoryComplianceAssessmentDatabase'
+import { nonmatchItemClose, nonmatchItemBatchClose } from '@/api/regulatoryComplianceAssessmentDatabase'
 
 export default {
   name: 'NonmatchItemCloseModal',
@@ -86,10 +86,11 @@ export default {
     }
   },
   methods: {
-    open (ids) {
+    open (object) {
       this.visible = true
       this.form.resetFields()
-      this.model.ids = ids
+      this.model.ids = object.ids
+      this.model.id = object.id
     },
     handleCancel () {
       this.close()
@@ -100,8 +101,15 @@ export default {
         if (!err) {
           this.confirmLoading = true
           const param = Object.assign({}, values)
-          param.ids = this.model.ids
-          nonmatchItemClose(param).then(res => {
+          let func
+          if (this.model.ids) {
+            func = nonmatchItemBatchClose
+            param.ids = this.model.ids
+          } else if (this.model.id) {
+            func = nonmatchItemClose
+            param.id = this.model.id
+          }
+          func(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
               this.$emit('ok')