From bcd041ef1503b1da3152d6180266499aee46ae9d Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Tue, 26 Apr 2022 14:12:22 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 147 ++++++++++++++---
 .../views/parameter/parameterlist/index.vue   | 156 +++++++++++-------
 2 files changed, 222 insertions(+), 81 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 4896c3522..d7bea327f 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -14,28 +14,34 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.paramsTemplateName"
-                         :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
+              <a-form-model-item class="itemModel" prop="projectName">
+                <a-select :placeholder="$t('PleaseSelect')+$t('entryName')"
+                          @change="projectNameChange"
+                          v-model="formInline.projectNameId">
+                  <a-select-option v-for="(item, key) in projectNameList"
+                                   :key="key"
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </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('status')">{{$t('status')}}</span>
+                <span class="title-text-text" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="state">
-                <j-dict-select-tag class="box-input" v-model="formInline.state"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('status')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'params_template_state'"/>
+              <a-form-model-item class="itemModel" prop="targetMarket">
+                <j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
+                                    :disabled="disabled"
+                                    :placeholder="$t('PleaseSelect')+$t('targetMarket')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'region'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -44,30 +50,123 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+                <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="region">
-                <j-dict-select-tag class="box-input" v-model="formInline.region"
+              <a-form-model-item class="itemModel" prop="projectStatus">
+                <j-dict-select-tag class="box-input" v-model="formInline.projectStatus"
                                    :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                   @input="handleInput('projectStatus')"
+                                   :placeholder="$t('PleaseSelect')+$t('projectStatus')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'region'"/>
+                                   :triggerChange="false" :dictCode="'project_status'"/>
+              </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('StudioEngineer')">{{$t('StudioEngineer')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'studioEngineerName'">
+                <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    :disabled="disabled"
+                                    v-model="formInline.studioEngineerName"/>
               </a-form-model-item>
             </div>
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <a-col :span="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <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"
+                  :disabled="disabled"
+                  v-model="formInline.certificationEngineerName"/>
+              </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('IPDInformation')">{{$t('IPDInformation')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="ipdInfo">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.ipdInfo"
+                         :placeholder="$t('PleaseEnter')+$t('IPDInformation')"/>
+              </a-form-model-item>
+            </div>
+            <!--            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$
+            -->
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="vehiclePlatform">
+                <j-dict-select-tag class="box-input" v-model="formInline.vehiclePlatform"
+                                   :disabled="disabled"
+                                   @input="handleInput('vehiclePlatform')"
+                                   :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'vehicle_platform'"/>
+              </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('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'digitalPlatform'">
+                <j-dict-select-tag class="box-input" v-model="formInline.digitalPlatform"
+                                   :disabled="disabled"
+                                   @input="handleInput('digitalPlatform')"
+                                   :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'digital_platform'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="title-text-text"
-                      :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
+                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="description">
+              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
                 <a-input class="box-input"
                          :disabled="disabled"
-                         v-model="formInline.description"
-                         :placeholder="$t('PleaseEnter')+$t('contentDescription')"/>
+                         v-model="formInline.vehicleDevelopmentPlan"
+                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
+              </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('certificationProgram')">{{$t('certificationProgram')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="attestationPlan">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.attestationPlan"
+                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index ce4623137..e143ce4b1 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -4,39 +4,91 @@
       <a-row :gutter="24">
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('zoneOfApplication')">
-              <span>{{$t('zoneOfApplication')}}</span>
+            <div class="title-text" :title="$t('NiONumber')">
+              <span>{{$t('NiONumber')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.region"
-                               :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                               :type="'select'"
-                               :triggerChange="false" :dictCode="'region'"/>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
+                     v-model="queryParam.projectName"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('parameterTemplate')">
-              <span>{{$t('parameterTemplate')}}</span>
+            <div class="title-text" :title="$t('ParameterName')">
+              <span>{{$t('ParameterName')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
-                     v-model="queryParam.description"></a-input>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                     v-model="queryParam.projectName"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('status')">
-              <span>{{$t('status')}}</span>
+            <div class="title-text" :title="$t('projectStatus')">
+              <span>{{$t('projectStatus')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.state"
-                               :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+            <j-dict-select-tag class="box-input" v-model="queryParam.projectStatus"
+                               :placeholder="$t('PleaseSelect')+$t('projectStatus')"
                                :type="'select'"
-                               :triggerChange="false" :dictCode="'params_template_state'"/>
+                               :triggerChange="false" :dictCode="'project_status'"/>
           </div>
         </a-col>
+        <template v-if="toggleSearchStatus">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('StudioEngineer')">
+                <span>{{$t('StudioEngineer')}}</span>
+              </div>
+              <PersonnelSelection class="box-input"
+                                  :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
+                                  :isInput="true"
+                                  :personneQuery="queryParam"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="queryParam.studioEngineerName"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('certifiedEngineer')">
+                <span>{{$t('certifiedEngineer')}}</span>
+              </div>
+              <PersonnelSelection :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
+                                  :isInput="true"
+                                  class="box-input"
+                                  :personneQuery="queryParam"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="queryParam.certificationEngineerName"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ModelPlatform')">
+                <span>{{$t('ModelPlatform')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"
+                                 :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'vehicle_platform'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('DigitalPlatform')">
+                <span>{{$t('DigitalPlatform')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"
+                                 :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'digital_platform'"/>
+            </div>
+          </a-col>
+        </template>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
                </a-col>
       </span>
       </a-row>
@@ -46,10 +98,6 @@
         <a-icon type="plus"/>
         {{$t('add')}}
       </div>
-      <div @click="handlecody" class="operator-text" v-has="'document:getInfoById'">
-        <a-icon type="copy"/>
-        {{$t('copy')}}
-      </div>
       <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
@@ -73,6 +121,7 @@
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
             <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+          <!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
         </span>
       </a-table>
     </div>
@@ -94,11 +143,13 @@
 <script>
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
 import addModel from './components/addModel'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
 
 export default {
   name: 'index',
   components: {
     addModel,
+    PersonnelSelection
   },
   data() {
     return {
@@ -111,11 +162,11 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
-        list: 'params/template/page',
-        add: 'params/template/add',
-        edit: 'params/template/edit',
-        deleteBatch: 'params/template/delete',
-        deleteAll: 'params/template/deleteBatch'
+        list: 'project/projectLibraryBase/page',
+        add: 'project/projectLibraryBase/add',
+        edit: 'project/projectLibraryBase/edit',
+        deleteBatch: 'project/projectLibraryBase/delete',
+        deleteAll: 'project/projectLibraryBase/deleteBatch'
       },
       total: 0,
       pageSize: 10,
@@ -123,38 +174,40 @@ export default {
       title: '新增',
       columns: [
         {
-          title: this.$t('zoneOfApplication'),
+          title: this.$t('entryName'),
           align: 'center',
-          width: '10%',
-          dataIndex: 'region_dictText',
-        },
-        {
-          title: this.$t('parameterTemplate'),
-          align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'projectName',
           scopedSlots: { customRender: 'projectName' }
         },
         {
-          title: this.$t('contentDescription'),
+          title: this.$t('targetMarket'),
           align: 'center',
-          dataIndex: 'description'
+          dataIndex: 'targetMarket_dictText'
         },
         {
-          title: this.$t('status'),
+          title: this.$t('projectStatus'),
           align: 'center',
-          dataIndex: 'state_dictText'
+          dataIndex: 'projectStatus_dictText'
         },
         {
-          title: this.$t('createTime'),
+          title: this.$t('StudioEngineer'),
           align: 'center',
-          width: '10%',
-          dataIndex: 'createTime'
+          dataIndex: 'studioEngineerName'
         },
         {
-          title: this.$t('updateTime'),
+          title: this.$t('certifiedEngineer'),
           align: 'center',
-          width: '10%',
-          dataIndex: 'updateTime'
+          dataIndex: 'certificationEngineerName'
+        },
+        {
+          title: this.$t('ModelPlatform'),
+          align: 'center',
+          dataIndex: 'vehiclePlatform_dictText'
+        },
+        {
+          title: this.$t('DigitalPlatform'),
+          align: 'center',
+          dataIndex: 'digitalPlatform_dictText'
         },
         {
           title: this.$t('operation'),
@@ -180,10 +233,6 @@ export default {
     //添加
     handleAdd() {
       this.$refs.addModelRef.addModel()
-    },
-    // 复制
-    handlecody(){
-
     },
     //批量删除
     handleDel() {
@@ -193,7 +242,7 @@ export default {
           content: _this.$t('ConfirmBatchDeletion'),
           onOk() {
             let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-            postAction(_this.url.deleteAll, { ids: idList.join(',') }).then((res) => {
+            deleteAction(_this.url.deleteAll, { ids: idList.join(',') }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.selectedRowKeys = []
@@ -218,7 +267,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+          deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()
@@ -231,14 +280,8 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
-      // console.log(item,'itemitem')
-      // this.$router.push({
-      //   path: '/parameter/parameter/index',
-      //   query: item.id
-      // })
-
       let newUrl = this.$router.resolve({
-        path: '/parameter',
+        path: '/ProjectDetails',
         query: item
       })
       window.open(newUrl.href, '_blank')
@@ -276,7 +319,7 @@ export default {
         ...this.queryParam
       }
       this.loading = true
-      getAction(this.url.list, query).then((res) => {
+      postAction(this.url.list, query).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
             this.pageNo = res.result.current - 1
@@ -284,7 +327,6 @@ export default {
             return
           }
           this.dataSource = res.result.records || []
-
           this.total = res.result.total
           this.loading = false
         } else {