From 133ab4d9949baea2af0954ea323841447f517164 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 19 Apr 2022 11:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/ProjectDetails.vue             |  79 ++--
 .../components/listEditModel.vue              |  37 +-
 .../components/listOfRelevantPersonnel.vue    | 374 ++++++++++++++++++
 5 files changed, 445 insertions(+), 49 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 3e45529e1..65a40432d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -672,4 +672,6 @@ module.exports = {
   confirmOverrule:'confirm Overrule',
   The:'The',
   submitted:'Data has been submitted and cannot be submitted again',
+  basicInformationOfParameters:'Basic information of parameters',
+  regulatoryCertificationTaskPlan:'Regulatory / certification task plan',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e9361ebfd..923a0fed4 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -676,4 +676,6 @@ module.exports = {
   confirmOverrule:'确认驳回？',
   The:'第',
   submitted:'条数据已提交不能重复提交',
+  basicInformationOfParameters:'参数基本信息',
+  regulatoryCertificationTaskPlan:'法规/认证任务计划',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index b25a56a62..59c98ca75 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -1,67 +1,72 @@
 <template>
   <div class="box">
     <div class="header-text">
-      参数基本信息
+      {{$t('basicInformationOfParameters')}}
     </div>
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
         <span class="text-field-right text-field-right-color"
-        >lakdjaslkdjkslad离开对方角度上考虑</span>
+        >{{queryForm.projectName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
         <span class="text-field-right text-field-right-color"
-        >lakdjaslkdjkslad离开对方角度上考虑</span>
+        >{{queryForm.targetMarket_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
         <span class="text-field-right text-field-right-color"
-        >lakdjaslkdjkslad离开对方角度上考虑</span>
+        >{{queryForm.projectStatus_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
         <span class="text-field-right text-field-right-color"
-        >lakdjaslkdjkslad离开对方角度上考虑</span>
+        >{{queryForm.ipdInfo}}</span>
       </div>
       <div class="text-field">
-        <span class="text-field-left">Gate</span>
+        <span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
         <span class="text-field-right text-field-right-color"
-        >lakdjaslkdjkslad离开对方角度上考虑</span>
-      </div>
-      <div class="text-field">
-        <span class="text-field-left" :title="$t('certificationProgramTime')">{{$t('certificationProgramTime')}}</span>
-        <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
-      </div>
-      <div class="text-field">
-        <span class="text-field-left" :title="$t('ArchitecturePlatform')">{{$t('ArchitecturePlatform')}}</span>
-        <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
+        >{{queryForm.digitalPlatform_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
         <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
-      </div>
-      <div class="text-field">
-        <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
-        <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
+        >{{queryForm.vehiclePlatform_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
         <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
+        >{{queryForm.studioEngineerName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
         <span class="text-field-right text-field-right-color"
-        >2020-12-12</span>
+        >{{queryForm.certificationEngineerName}}</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"
+        >{{queryForm.vehicleDevelopmentPlan}}</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"
+        >{{queryForm.attestationPlan}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
+        <span class="text-field-right text-field-right-color"
+        >
+          <a-button type="primary" class="button-text"
+                    @click="ListOfRelevantPersonnelClick">
+                  {{$t('ListOfRelevantPersonnel')}}
+          </a-button>
+        </span>
       </div>
     </div>
     <div class="header-text">
-      法规/认证任务计划
+      {{$t('regulatoryCertificationTaskPlan')}}
     </div>
     <div class="process-content">
 
@@ -145,20 +150,25 @@
         Tab 4
       </a-tab-pane>
     </a-tabs>
+    <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
   </div>
-
-
 </template>
 
 <script>
   import * as echarts from 'echarts'
-
+  import listOfRelevantPersonnel from './listOfRelevantPersonnel'
   export default {
     name: 'ProjectDetails',
+    components:{
+      listOfRelevantPersonnel,
+    },
     data() {
-      return {}
+      return {
+        queryForm: {},
+      }
     },
     mounted() {
+      this.queryForm = this.$route.query
       this.mainEcharts()
     },
     methods: {
@@ -181,7 +191,10 @@
             }
           ]
         })
-      }
+      },
+      ListOfRelevantPersonnelClick(){
+          this.$refs.listOfRelevantPersonnelRef.getData()
+      },
     }
   }
 </script>
@@ -243,7 +256,7 @@
 
     .process-content-content {
       background: #fff;
-      z-index: 1000000;
+      z-index: 1000;
       padding: 0 20px;
 
       .process-content-left {
@@ -317,7 +330,7 @@
   @media screen and (min-width: 600px) and (max-width: 1600px) {
 
     .process-content-right-top {
-      max-width: 70px!important;
+      max-width: 70px !important;
     }
 
   }
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index e6b09a168..1e939dfed 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -679,24 +679,29 @@
         this.visible = false
       },
       handleSubmit() {
-        let formInline = JSON.parse(JSON.stringify(this.formInline))
-        Object.keys(formInline).forEach(res => {
-          if (formInline[res] && formInline[res] instanceof Array) {
-            formInline[res] = formInline[res].join(',')
-          }
-        })
-        this.confirmLoading = true
-        putAction(this.url.editModel, formInline).then((res) => {
-          if (res.success) {
-            this.$message.success(this.$t('OperationSuccessful'))
-            this.visible = false
-            this.confirmLoading = false
-            this.$emit('editModelList')
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
-            this.confirmLoading = false
+        this.$refs.ruleForm.validate(valid => {
+          if (valid){
+            let formInline = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] && formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            this.confirmLoading = true
+            putAction(this.url.editModel, formInline).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('editModelList')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
           }
         })
+
       },
       handleInput(value) {
         this.$nextTick(() => {
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
new file mode 100644
index 000000000..232942db7
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -0,0 +1,374 @@
+<template>
+  <div>
+    <a-modal
+      :title="$t('ListOfRelevantPersonnel')"
+      :width="1000"
+      :visible="visible"
+      :maskClosable="false"
+      @ok="visible = false"
+      @cancel="visible = false"
+    >
+      <div class="table-operator">
+        <div @click="handleModule" class="operator-text">
+          <a-icon type="download"/>
+          {{$t('templateDownload')}}
+        </div>
+        <div @click="handleExport" class="operator-text">
+          <a-icon type="export" :rotate="-90"/>
+          {{$t('export')}}
+        </div>
+        <div class="operator-text">
+          <ImportFile :url="url"/>
+        </div>
+      </div>
+      <a-table
+        class="table"
+        :columns="columns"
+        rowKey="id"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :pagination="false"
+        :scroll="{x:1000,y: 400}"
+        :data-source="dataSource"
+        :loading="loading"
+      >
+        <span slot="operation" slot-scope="record">
+          <a class="text" @click="edit(record)">
+                {{$t('edit')}}
+          </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>
+    </a-modal>
+    <a-modal
+      :title="$t('ListOfRelevantPersonnel')"
+      :width="600"
+      :visible="editVisible"
+      :maskClosable="false"
+      @ok="editOk"
+      @cancel="editVisible = false"
+    >
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
+                  <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                      :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                      :type="'select'"
+                                      :triggerChange="false" :dictCode="'duty_territory'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="'lawEngineerName'">
+                  <PersonnelSelection
+                    :query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
+                    :personneQuery="formInline"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.lawEngineerName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="'engineeringInterfacePersonName'">
+                  <PersonnelSelection
+                    :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                    :personneQuery="formInline"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.engineeringInterfacePersonName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
+                  <PersonnelSelection
+                    :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
+                    :personneQuery="formInline"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.certificationEngineerName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <a-form-model-item class="itemModel">
+                  <a-textarea
+                    :placeholder="$t('PleaseEnter')+$t('remarks')"
+                    :disabled="false"
+                    v-model="formInline.remark" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import ImportFile from '@/components/ImportFile/index'
+
+  export default {
+    name: 'listOfRelevantPersonnel',
+    components: {
+      PersonnelSelection,
+      ImportFile
+    },
+    data() {
+      return {
+        visible: false,
+        columns: [
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'center',
+            dataIndex: 'dutyTerritory_dictText',
+            ellipsis: true
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            align: 'center',
+            dataIndex: 'lawEngineerName',
+            ellipsis: true
+          },
+          {
+            title: this.$t('engineeringInterfacePerson'),
+            align: 'center',
+            dataIndex: 'engineeringInterfacePersonName',
+            ellipsis: true
+          },
+          {
+            title: this.$t('certifiedEngineer'),
+            align: 'center',
+            dataIndex: 'certificationEngineerName',
+            ellipsis: true
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            dataIndex: 'remark',
+            ellipsis: true
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            width: 80,
+            fixed: 'right',
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataSource: [],
+        loading: false,
+        editVisible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {
+          certificationEngineerName: [
+            {
+              required: true,
+              message: this.$t('certifiedEngineer') + this.$t('certifiedEngineer'),
+              trigger: 'change'
+            }
+          ],
+          dutyTerritory: [
+            {
+              required: true,
+              message: this.$t('certifiedEngineer') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
+          ],
+          lawEngineerName: [
+            {
+              required: true,
+              message: this.$t('certifiedEngineer') + this.$t('regulatoryEngineer'),
+              trigger: 'change'
+            }
+          ],
+          engineeringInterfacePersonName: [
+            {
+              required: true,
+              message: this.$t('certifiedEngineer') + this.$t('engineeringInterfacePerson'),
+              trigger: 'change'
+            }
+          ]
+        },
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        url: {
+          page: '/project/projectRelatedPersonnel/page',
+          edit: '/project/projectRelatedPersonnel/edit'
+        },
+        selectedRowKeys: []
+      }
+    },
+    methods: {
+      getData() {
+        this.visible = true
+        this.getList()
+      },
+      editOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.confirmLoading = true
+            putAction(this.url.edit, this.formInline).then((res) => {
+              if (res.success) {
+                this.editVisible = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.getList()
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      edit(item) {
+        this.editVisible = true
+        this.$nextTick(() => {
+          this.formInline = JSON.parse(JSON.stringify(item))
+        })
+      },
+      PersonnelSelectionChange(value, id) {
+        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()
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+        this.loading = true
+        postAction(this.url.page, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      handleExport() {
+
+      },
+      handleModule() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    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: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .table-operator {
+    text-align: right;
+    margin-bottom: 20px;
+  }
+</style>
\ No newline at end of file