布局设定

2.修改相关人员名单列表不对齐
3.对接认证任务计划接口

jero-web/src/common/lang/en-us.js

@@ -695,4 +695,8 @@ module.exports = {
   incorrectsubmitted:'The data status is incorrect; Only data with status to be confirmed can be submitted',
   date:'date',
   time:'time',
+  confirmationOfRegulationsList:'Confirmation of regulations list',
+  regulatoryTaskConfirmation:'Regulatory task confirmation',
+  certificationStart:'Certification start',
+  certificationEnd:'Certification end',
 }

jero-web/src/common/lang/zh-cn.js

@@ -595,7 +595,7 @@ module.exports = {
   confirmationOfDesignConformity: '设计符合性确认',
   Deliverables: '交付物',
   personLiable: '责任人',
-  PrehomoConfirmation: 'Prehomo确认',
+  PrehomoConfirmation: 'PreHomo确认',
   verificationAndConformityconfirmation: '验证符合性确认',
   StandardImplementationDate: '标准实施日期',
   regulatoryEngineer: '法规工程师',
@@ -698,5 +698,9 @@ module.exports = {
   finalizationTime:'定版时间',
   setting:'设定',
   date:'日期',
-  time:'时间'
+  time:'时间',
+  confirmationOfRegulationsList:'法规清单确认',
+  regulatoryTaskConfirmation:'法规任务确认',
+  certificationStart:'认证开始',
+  certificationEnd:'认证结束',
 }

jero-web/src/components/ImportFile/index.vue

@@ -23,6 +23,11 @@
       url: {
         type: Object,
         default: {}
+      },
+      //判断当前文档库还是其余的页面
+      isTrue:{
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -71,7 +76,11 @@
               )
             })
             } else {
-              eventBUs.$emit('searchReset')
+              if (this.isTrue){
+                this.$emit('getList')
+              }else{
+                eventBUs.$emit('searchReset')
+              }
               this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
             }
             this.spinning = false

jero-web/src/views/projectManagement/components/ProjectDetails.vue

@@ -84,7 +84,7 @@
         {{$t('regulatoryCertificationTaskPlan')}}
       </div>
       <div class="header-tight">
-        <a-button class="box-button" style="line-height: 32px">{{$t('setting')}}</a-button>
+        <a-button class="box-button" style="line-height: 32px" @click="settingClick">{{$t('setting')}}</a-button>
       </div>
     </div>
     <div class="process-content">
@@ -171,6 +171,7 @@
     </a-tabs>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <settingList :url="url" ref="settingListRef"/>
   </div>
 </template>
 
@@ -179,12 +180,14 @@
   import listOfRelevantPersonnel from './listOfRelevantPersonnel'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import addModel from './addModel'
+  import settingList from './settingList'
 
   export default {
     name: 'ProjectDetails',
     components: {
       listOfRelevantPersonnel,
-      addModel
+      addModel,
+      settingList
     },
     data() {
       return {
@@ -192,12 +195,14 @@
         url: {
           queryById: 'project/projectLibraryBase/queryById',
           add: 'project/projectLibraryBase/add',
-          edit: 'project/projectLibraryBase/edit'
+          edit: 'project/projectLibraryBase/edit',
+          queryByprojectId:'project/projectTaskPlanning/queryByprojectId',
         }
       }
     },
     mounted() {
       this.getForm()
+      this.getSetting()
       this.mainEcharts()
     },
     methods: {
@@ -210,6 +215,15 @@
           }
         })
       },
+      getSetting(){
+        getAction(this.url.queryByprojectId, { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            console.log(res)
+          } else {
+
+          }
+        })
+      },
       mainEcharts() {
         var myChart = echarts.init(document.getElementById('main'))
         myChart.setOption({
@@ -243,7 +257,10 @@
       },
       addModelList() {
         this.getForm()
-      }
+      },
+      settingClick(){
+         this.$refs.settingListRef.edit()
+      },
     }
   }
 </script>

jero-web/src/views/projectManagement/components/addModel.vue

@@ -19,7 +19,7 @@
               <a-form-model-item class="itemModel" prop="projectName">
                 <a-select :placeholder="$t('PleaseSelect')+$t('entryName')"
                           @change="projectNameChange"
-                          v-model="formInline.projectName">
+                          v-model="formInline.projectNameId">
                   <a-select-option v-for="(item, key) in projectNameList"
                                    :key="key"
                                    :value="item.id">

jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue

@@ -18,7 +18,7 @@
           {{$t('export')}}
         </div>
         <div class="operator-text">
-          <ImportFile :url="url"/>
+          <ImportFile :url="url" :isTrue="true" @getList="getPersonnelList"/>
         </div>
       </div>
       <a-table
@@ -27,7 +27,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x:true,y: 400}"
+        :scroll="{x:800,y: 400}"
         :data-source="dataSource"
         :loading="loading"
       >
@@ -37,17 +37,17 @@
           </a>
         </span>
       </a-table>
-      <div class="page">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          @change="pageOnChange"
-          @showSizeChange="SizeChange"
-        />
-      </div>
+      <!--      <div class="page">-->
+      <!--        <a-pagination-->
+      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+      <!--          show-quick-jumper-->
+      <!--          show-size-changer-->
+      <!--          :page-size.sync="pageSize"-->
+      <!--          :total="total"-->
+      <!--          @change="pageOnChange"-->
+      <!--          @showSizeChange="SizeChange"-->
+      <!--        />-->
+      <!--      </div>-->
     </a-modal>
     <a-modal
       :title="$t('ListOfRelevantPersonnel')"
@@ -239,12 +239,13 @@
             }
           ]
         },
-        total: 0,
-        pageSize: 10,
-        pageNo: 1,
+        // total: 0,
+        // pageSize: 10,
+        // pageNo: 1,
         url: {
-          page: '/project/projectRelatedPersonnel/page',
-          edit: '/project/projectRelatedPersonnel/edit'
+          list: '/project/projectRelatedPersonnel/list',
+          edit: '/project/projectRelatedPersonnel/edit',
+          exportData: '/project/projectRelatedPersonnel/exportXls'
         },
         selectedRowKeys: []
       }
@@ -269,6 +270,9 @@
         this.visible = true
         this.getList()
       },
+      getPersonnelList(){
+          this.getList()
+      },
       editOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -297,29 +301,27 @@
         this.formInline[value] = id
         this.formInline = { ...this.formInline }
       },
-      pageOnChange(page, pageSize) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
+      // pageOnChange(page, pageSize) {
+      //   this.pageNo = page
+      //   this.getList()
+      // },
+      // SizeChange(page, pageSize) {
+      //   this.pageNo = 1
+      //   this.pageSize = pageSize
+      //   this.getList()
+      // },
       onSelectChange(value) {
         this.selectedRowKeys = value
       },
       getList() {
         let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
           projectId: this.$route.query.id
         }
         this.loading = true
-        postAction(this.url.page, query).then((res) => {
+        getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
+            this.dataSource = res.result || []
+            // this.total = res.result.total
             this.loading = false
           } else {
             this.loading = false
@@ -327,7 +329,15 @@
         })
       },
       handleExport() {
-
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ids: selectedRowKeys.join(','),
+          projectId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$t('ListOfRelevantPersonnel') + '.xls', query, this.Deselect)
+      },
+      Deselect() {
+        this.selectedRowKeys = []
       },
       handleModule() {