From 122ecc6ffaffc264cba38909b1dfa79890b45bc7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 21 Apr 2022 17:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/ImportFile/index.vue         | 12 ++++++++----
 jero-web/src/views/documentManage/library/index.vue  |  2 +-
 .../virtualList/components/virtualListDetails.vue    |  7 +++++--
 .../projectManagement/components/ProjectDetails.vue  |  9 +++++++--
 .../components/TaskParameterCollection.vue           |  5 ++++-
 .../components/listOfRegulations.vue                 |  5 ++++-
 .../components/listOfRelevantPersonnel.vue           |  9 +++++----
 .../projectManagement/components/settingList.vue     | 12 ++----------
 8 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 6dff278bb..fb7d3cd1d 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -4,8 +4,8 @@
               class="upload-text"
               :multiple="false" :headers="tokenHeader"
               :action="importUrl+'?cut='+cut"
-              @change="handleImportZip"
-              accept=".zip">
+              @change="handleImport"
+              :accept="accept">
       <a-icon type="import" :rotate="270"/>
       {{$t('import')}}
     </a-upload>
@@ -28,7 +28,11 @@
       isTrue:{
         type: Boolean,
         default: false
-      }
+      },
+      accept:{
+        type: String,
+        default: ''
+      },
     },
     data() {
       return {
@@ -47,7 +51,7 @@
       }
     },
     methods: {
-      handleImportZip(info) {
+      handleImport(info) {
         this.spinning = true
         if (info.file.status !== 'uploading') {
           console.log(info.file, info.fileList)
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 5bda5e60b..c6e4c4b0d 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -25,7 +25,7 @@
         {{$t('templateDownload')}}
       </div>
       <div class="operator-text" v-has="'document:importZip'">
-        <ImportFile :url="url"/>
+        <ImportFile :url="url" :isTrue="false" :accept="'.zip'"/>
       </div>
       <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
         <a-icon type="plus"/>
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 986ad9608..399543c6b 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -88,7 +88,7 @@
               {{$t('DocumentStandard')}}
             </div>
             <div class="operator-text" v-has="'document:importZip'" v-if="isTrue">
-              <ImportFile :url="url"/>
+              <ImportFile :url="url" :isTrue="true" @getList="getPersonnelList" :accept="'.zip'"/>
             </div>
             <!--            模板下载-->
             <div @click="handleModule" class="operator-text" v-if="isTrue">
@@ -304,7 +304,7 @@
             title: this.$t('correspondingStandard'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'correspondingStandard_dictText'
+            dataIndex: 'correspondingStandardName'
           },
           {
             title: this.$t('zoneOfApplication'),
@@ -622,6 +622,9 @@
           }
         })
       },
+      getPersonnelList(){
+         this.getList()
+      },
       batSettingList() {
         this.getList()
       },
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 9e7013fde..421540153 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -123,7 +123,7 @@
     </a-tabs>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
-    <settingList :url="url" ref="settingListRef"/>
+    <settingList :url="url" ref="settingListRef" @settingListForm="settingListForm"/>
   </div>
 </template>
 
@@ -148,7 +148,9 @@
           queryById: 'project/projectLibraryBase/queryById',
           add: 'project/projectLibraryBase/add',
           edit: 'project/projectLibraryBase/edit',
-          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId'
+          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId',
+          addSettingUrl:'project/projectTaskPlanning/add',
+          editSettingUrl:'project/projectTaskPlanning/edit',
         },
         regulatoryCertificationTaskPlanList: []
       }
@@ -177,6 +179,9 @@
           }
         })
       },
+      settingListForm(){
+         this.getSetting()
+      },
       mainEcharts() {
         var myChart = echarts.init(document.getElementById('main'))
         myChart.setOption({
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 57b5574e0..3c61dbeb6 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -29,7 +29,7 @@
         {{$t('templateDownload')}}
       </div>
       <div class="operator-text" v-has="'document:importZip'">
-        <ImportFile :url="url"/>
+        <ImportFile :url="url" :isTrue="true" @getList="getPersonnelList" :accept="'.zip'"/>
       </div>
       <div @click="handleDel" class="operator-text">
         <a-icon type="delete"/>
@@ -145,6 +145,9 @@
       },
       handleDel(){
 
+      },
+      getPersonnelList(){
+
       },
     },
   }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 01754cf33..e363f6ae0 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -65,7 +65,7 @@
       </div>
       <div style="float: right;margin-top: 1px" v-if="isDisplay">
         <div class="operator-text" v-has="'document:importZip'">
-          <ImportFile :url="url"/>
+          <ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
         </div>
         <div @click="handleModule" class="operator-text">
           <a-icon type="download"/>
@@ -701,6 +701,9 @@ export default {
         }
       })
     },
+    getPersonnelList(){
+       this.getList()
+    },
     initiateListConfirmationcClick() {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 3d7e39d46..2e3a46ebf 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -18,7 +18,7 @@
           {{$t('export')}}
         </div>
         <div class="operator-text">
-          <ImportFile :url="url" :isTrue="true" @getList="getPersonnelList"/>
+          <ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
         </div>
       </div>
       <a-table
@@ -245,7 +245,8 @@
         url: {
           list: '/project/projectRelatedPersonnel/list',
           edit: '/project/projectRelatedPersonnel/edit',
-          exportData: '/project/projectRelatedPersonnel/exportXls'
+          exportData: '/project/projectRelatedPersonnel/exportXls',
+          importZipUrl:'project/projectRelatedPersonnel/importExcel',
         },
         selectedRowKeys: []
       }
@@ -331,8 +332,8 @@
       handleExport() {
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
-          ids: selectedRowKeys.join(','),
-          projectId: this.$route.query.id
+          id: selectedRowKeys.join(','),
+          // projectId: this.$route.query.id
         }
         downloadFile(this.url.exportData, this.$t('ListOfRelevantPersonnel') + '.xls', query, this.Deselect)
       },
diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue
index d75cf3621..6584d4d82 100644
--- a/jero-web/src/views/projectManagement/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/components/settingList.vue
@@ -161,18 +161,16 @@
         })
       },
       handleOk() {
-        let ids = JSON.parse(JSON.stringify(this.ids))
         let query = {
-          ids: ids.join(','),
           ...this.formInline
         }
         this.confirmLoading = true
-        postAction(this.url.setBatch, query).then((res) => {
+        postAction(this.url.editSettingUrl, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.visible = false
             this.confirmLoading = false
-            this.$emit('batSettingList')
+            this.$emit('settingListForm')
           } else {
             this.$message.warning(this.$t('operationFailed'))
             this.confirmLoading = false
@@ -183,12 +181,6 @@
         this.formInline = {}
         this.visible = false
       },
-      handleInput(value) {
-        this.$nextTick(() => {
-          this.formInline = { ...this.formInline }
-          this.$refs.ruleForm.validateField([value])
-        })
-      },
       dateChange(item) {
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
       }