Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -33,6 +33,8 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String id;
 
     /**项目名称*/
+    private java.lang.String projectNameId;
+    @TableField(exist = false)
     private java.lang.String projectName;
 
     /**目标市场*/

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
         <id column="id" property="id" />
 
-        <result column="project_name" property="projectName" />
+        <result column="project_name_id" property="projectNameId" />
         <result column="target_market" property="targetMarket" />
         <result column="project_status" property="projectStatus" />
         <result column="studio_engineer" property="studioEngineer" />
@@ -24,6 +24,7 @@
     <sql id="select_item">
         select
             plb.id,
+            plb.project_name_id,
             pni.project_name as project_name,
             plb.target_market,
             plb.project_status,
@@ -41,7 +42,7 @@
             plb.update_by,
             plb.update_time
         from project_library_base as plb
-        left join project_name_info as pni on  plb.project_name=pni.id
+        left join project_name_info as pni on  plb.project_name_id=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
     </sql>
 

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/documentTools/virtualList/components/virtualListDetails.vue

@@ -571,7 +571,8 @@
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
           ...this.queryParam,
-          id: selectedRowKeys.join(',')
+          name:this.$route.query.name,
+          ids: selectedRowKeys.join(',')
         }
         downloadFile(this.url.exportData, '虚拟清单名称.zip', query, this.Deselect)
       },

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

@@ -25,11 +25,8 @@
         <span class="text-field-right"
         >{{queryForm.projectStatus_dictText}}</span>
       </div>
-      <div class="text-field">
+    </div>
-        <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
+    <div class="content-text">
-        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.ipdInfo)"
-        >{{queryForm.ipdInfo}}</span>
-      </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
         <span class="text-field-right"
@@ -40,6 +37,8 @@
         <span class="text-field-right"
         >{{queryForm.vehiclePlatform_dictText}}</span>
       </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
         <span class="text-field-right"
@@ -50,16 +49,25 @@
         <span class="text-field-right"
         >{{queryForm.certificationEngineerName}}</span>
       </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
-        <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+        <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
-        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.vehicleDevelopmentPlan)"
+        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.ipdInfo)"
-        >{{queryForm.vehicleDevelopmentPlan}}</span>
+        >{{queryForm.ipdInfo}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
         <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.attestationPlan)"
         >{{queryForm.attestationPlan}}</span>
       </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.vehicleDevelopmentPlan)"
+        >{{queryForm.vehicleDevelopmentPlan}}</span>
+      </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
         <span class="text-field-right"
@@ -76,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">
@@ -163,6 +171,7 @@
     </a-tabs>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <settingList :url="url" ref="settingListRef"/>
   </div>
 </template>
 
@@ -171,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 {
@@ -184,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: {
@@ -202,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({
@@ -235,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">
+      <!--      <div class="page">-->
-        <a-pagination
+      <!--        <a-pagination-->
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-          show-quick-jumper
+      <!--          show-quick-jumper-->
-          show-size-changer
+      <!--          show-size-changer-->
-          :page-size.sync="pageSize"
+      <!--          :page-size.sync="pageSize"-->
-          :total="total"
+      <!--          :total="total"-->
-          @change="pageOnChange"
+      <!--          @change="pageOnChange"-->
-          @showSizeChange="SizeChange"
+      <!--          @showSizeChange="SizeChange"-->
-        />
+      <!--        />-->
-      </div>
+      <!--      </div>-->
     </a-modal>
     <a-modal
       :title="$t('ListOfRelevantPersonnel')"
@@ -239,12 +239,13 @@
             }
           ]
         },
-        total: 0,
+        // total: 0,
-        pageSize: 10,
+        // pageSize: 10,
-        pageNo: 1,
+        // pageNo: 1,
         url: {
-          page: '/project/projectRelatedPersonnel/page',
+          list: '/project/projectRelatedPersonnel/list',
-          edit: '/project/projectRelatedPersonnel/edit'
+          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) {
+      // pageOnChange(page, pageSize) {
-        this.pageNo = page
+      //   this.pageNo = page
-        this.getList()
+      //   this.getList()
-      },
+      // },
-      SizeChange(page, pageSize) {
+      // SizeChange(page, pageSize) {
-        this.pageNo = 1
+      //   this.pageNo = 1
-        this.pageSize = pageSize
+      //   this.pageSize = pageSize
-        this.getList()
+      //   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.dataSource = res.result || []
-            this.total = res.result.total
+            // 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() {
 

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

@@ -0,0 +1,287 @@
+<template>
+  <a-modal
+    :title="$t('setting')"
+    :width="1100"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('confirmationOfRegulationsList')">
+                {{$t('confirmationOfRegulationsList')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')"
+                             @change="dateChange({db_field_name:'listConfirmation'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.listConfirmation"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('regulatoryTaskConfirmation')">
+                {{$t('regulatoryTaskConfirmation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')"
+                             @change="dateChange({db_field_name:'legalTaskConfirmation'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.legalTaskConfirmation"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('confirmationOfDesignConformity')">
+                {{$t('confirmationOfDesignConformity')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')"
+                             @change="dateChange({db_field_name:'designDeadline'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.designDeadline"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('PrehomoConfirmation')">
+                {{$t('PrehomoConfirmation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('PrehomoConfirmation')"
+                             @change="dateChange({db_field_name:'prehomoDeadline'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.prehomoDeadline"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationStart')">
+                {{$t('certificationStart')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('certificationStart')"
+                             @change="dateChange({db_field_name:'attestationStartTime'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.attestationStartTime"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationEnd')">
+                {{$t('certificationEnd')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('certificationEnd')"
+                             @change="dateChange({db_field_name:'attestationEndTime'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.attestationEndTime"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('deadlineForConfirmationOfDesignCompliance')">
+                {{$t('deadlineForConfirmationOfDesignCompliance')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationOfDesignCompliance')"
+                             @change="dateChange({db_field_name:'verifyDeadline'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.verifyDeadline"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'settingList',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+        })
+      },
+      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) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        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') : ''
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: calc(100% - 130px);
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 174px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>