From d02f13ce1497631fc616199f0fabce2d7bde7bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Tue, 21 Mar 2023 11:02:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=8D=87=E7=BA=A7=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   9 +-
 jero-web/src/common/lang/zh-cn.js             |   8 +
 .../components/basicInformation.vue           | 949 ++++--------------
 .../components/safetyPrecautions.vue          |   2 +-
 .../components/upgradeRequirements.vue        | 510 +++++-----
 .../vehicleinformation/index.vue              |  14 +-
 6 files changed, 463 insertions(+), 1029 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bcbef9056..9365f51f5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1671,5 +1671,12 @@ module.exports = {
   thePersonResponsibleForDesignCannotBeBlank:'The person responsible for designing the compliance process cannot be empty',
   recordmaintenance:'Record maintenance',
   module:'module',
-
+  selectTheVehicleTemplate:'Select the vehicle template',
+  theNameOfFirm:'The name of firm',
+  productClass:'Product class',
+  communicationTerminal:'Communication terminal (optional)',
+  otaUpgradeManagementSystem:'OTA upgrade management system',
+  pleaseStateTheDistribution:'Please describe the integration and distribution of the management system and electronic controller',
+  next:'Next',
+  last:'Last',
 }
\ 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 67efb250f..88b8c6091 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1769,6 +1769,14 @@ module.exports = {
   theDeadlineComplianceProcessCannotEmpty:'验证符合性流程的截止时间不能为空',
   theDeadlineForTheDesignCannotBeEmpty:'设计符合性流程的截止时间不能为空',
   thePersonResponsibleForDesignCannotBeBlank:'设计符合性流程的责任人不能为空',
+  selectTheVehicleTemplate:'选择车型模板',
+  theNameOfFirm:'企业名称',
+  productClass:'产品类别',
+  communicationTerminal:'通信终端（可多选）',
+  otaUpgradeManagementSystem:'车端OTA升级管理系统',
+  pleaseStateTheDistribution:'请说明管理系统与电子控制器的集成与分布情况',
+  next:'下一步',
+  last:'上一步',
   recordmaintenance:'备案维护',
   module:'模块',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index ccc9f6f9e..05f836c76 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -1,698 +1,211 @@
 <template>
   <div class="box">
-    <a-table
-      ref="table"
-      size="middle"
-      :components="drag(columns,'columns')"
-      :loading="loading"
-      :pagination="false"
-      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="id"
-      :data-source="dataSource"
-      :columns="columns"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-    >
-      <!--         -->
-      <span slot="endTime" slot-scope="text,record">
-          <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
-      </span>
-      <span slot="operation" slot-scope="text,record">
-          <a class="text-operation"
-             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
-      </span>
-      <span slot="taskStatus" slot-scope="text,record">
-          <span>{{text ? text : '--'}}</span>
-      </span>
-    </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
     </div>
-    <a-drawer
-      :title="title"
-      :maskClosable="false"
-      :width="948"
-      placement="right"
-      :closable="true"
-      @close="handleCancel"
-      :visible="visible"
-      style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <div style="margin-bottom: 40px">
-        <div class="header-text">
-          {{$t('basicInformation')}}
-        </div>
-        <div class="content-text">
-          <div class="text-field" v-for="(item,index) in projectInformationList" :key="index">
-            <span class="text-field-left" :title="item.title">{{item.title}}</span>
-            <span class="text-field-right text-field-right-url"
-                  :title="queryForm[item.value]"
-                  v-if="item.type == 1"
-            >{{queryForm[item.value]}}</span>
-            <span class="text-field-right text-field-right-url"
-                  v-else-if="item.type == '4'" :title="queryForm[item.value]"
-            >{{queryForm[item.value]}}</span>
-            <span class="text-field-right" v-else :title="queryForm[item.value]"
-            >{{queryForm[item.value]}}</span>
-          </div>
-        </div>
-      </div>
-      <div style="margin-bottom: 40px">
-        <div class="header-text">
-          {{$t('TaskRequirements')}}
-        </div>
-        <div class="content-text">
-          <div class="text-field" :class="{'text-content-button-one':item.type == 4 ? true :false}"
-               v-for="(item,index) in standardContentList" :key="index">
-            <span class="text-field-left" :title="item.title">{{item.title}}</span>
-            <span class="text-field-right text-field-right-url"
-                  v-if="item.type == 1"
-            ></span>
-            <span class="text-field-right text-field-right-url"
-                  v-else-if="item.type == '5'"
-            ></span>
-            <span class="text-field-right text-field-right-url"
-                  v-else-if="item.type == 2"
-            >{{ $t('viewFile') }}</span>
-            <span class="text-field-right" v-else
-            ></span>
-          </div>
-        </div>
-      </div>
-      <div style="margin-bottom: 40px">
-        <div class="header-text">
-          {{$t('personLiableConfirm')}}
-        </div>
-        <div class="box-title-text">
-          <div class="title-text">
-            <span class="Required">*</span>
-            <span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
-          </div>
-          <a-form-model-item class="itemModel">
-            <a-radio-group>
-              <a-radio value="Compliance">
-                {{$t('accord')}}
-              </a-radio>
-              <a-radio value="Non-Compliance">
-                {{$t('nonConformity')}}
-              </a-radio>
-              <a-radio value="To be tracked">
-                {{$t('Tracked')}}
-              </a-radio>
-              <a-radio value="NA">
-                {{$t('notInvolved')}}
-              </a-radio>
-              <a-radio>
-                {{$t('turnToDo')}}
-              </a-radio>
-            </a-radio-group>
-          </a-form-model-item>
-        </div>
-        <div class="box-title-text">
-          <div class="title-text">
-            <span class="Required">*</span>
-            <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
-          </div>
-          <a-form-model-item class="itemModel">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
-                        rows="4"/>
-          </a-form-model-item>
-        </div>
-        <div class="box-title-text">
-          <div class="title-text">
-            <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
-          </div>
-          <a-form-model-item class="itemModel">
-            <a-button type="primary" class="button-text">{{$t('uploadattachment')}}</a-button>
-          </a-form-model-item>
-        </div>
-      </div>
-      <div style="margin-bottom: 40px">
-        <div class="header-text">
-          {{$t('circulationHistory')}}
-        </div>
-        <div class="process-content">
-          <div style="display: flex;justify-content: space-between">
-            <div class="process-content-content">
-              <img src="../../../../assets/wancheng.png" class="process-content-left" alt="">
-              <img src="../../../../assets/shijian.png" class="process-content-left" alt="">
-              <img src="../../../../assets/xian.png" class="process-content-left" alt="">
-              <div class="process-content-right">
-                <div class="process-content-right-top"></div>
+    <a-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('theNameOfFirm')">{{$t('theNameOfFirm')}}</span>
+              </div>
+              <div class="title-text-add-input">
+                <span class="title-text-text">中文</span>
               </div>
             </div>
-          </div>
-          <div class="process-content-right-xian"></div>
-        </div>
-        <a-table
-          :pagination="false"
-          :scroll="{x: '100%'}"
-          rowKey="id"
-          :columns="Historycolumns"
-        >
-
-        </a-table>
-      </div>
-      <div class="drawer-bootom-button">
-        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-        <a-button style="margin-right: .8rem" type="danger">{{$t('sendBack')}}</a-button>
-        <a-button type="primary">{{$t('adopt')}}</a-button>
-      </div>
-    </a-drawer>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('registrationnumber')">{{$t('registrationnumber')}}</span>
+              </div>
+              <div class="title-text-add-input">
+                <span class="title-text-text">中文</span>
+              </div>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('productClass')">{{$t('productClass')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('noticebatch')">{{$t('noticebatch')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('otaUpgradeManagementSystem')">{{$t('otaUpgradeManagementSystem')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-textarea
+                  :placeholder="$t('pleaseStateTheDistribution')"
+                  :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" @click='next'>{{$t('next')}}</a-button>
+    </div>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
-    name: 'dealtWith',
+    name: 'basicInformation',
     components:{
     },
-    mixins:[ResizeHeader, ResizeColumnProvide,],
     data() {
       return {
-        visible: false,
-        title:'',
-        queryForm: {},
-        dataSource: [],
-        loading: false,
-        projectInformationList: [
-          {
-            title: this.$t('entryName'),
-            value: 'projectName'
-          },
-          {
-            title: this.$t('regulationNo'),
-            value: 'targetMarket_dictText'
-          },
-          {
-            title: this.$t('title'),
-            value: 'subtitle'
-          },
-          {
-            title: this.$t('subtitle'),
-            value: 'serialNumber',
-            type: '4'
-          },
-          {
-            title: this.$t('applicableSupplement'),
-            value: 'title'
-          },
-        ],
-        standardContentList: [
-          {
-            title: this.$t('Sponsor'),
-            value: this.$route.query.Sponsor
-          },
-          {
-            title: this.$t('personLiable'),
-            value: this.$route.query.personLiable
-          },
-          {
-            title: this.$t('closingDate'),
-            value: this.$route.query.DueDate
-          },
-          {
-            title: this.$t('typeOfDeliverables'),
-            value: this.$route.query.typeOfDeliverables
-          },
-          {
-            title: this.$t('deliverableTemplate'),
-            value: this.$route.query.deliverableTemplate,
-            type: 2
-          },
-          {},
-          {
-            title: this.$t('descriptionDeliverables'),
-            value: this.$route.query.remarks
-          }
-        ],
-        columns: [
-          {
-            title: this.$t('RelatedItems'),
-            align: 'left',
-            dataIndex: 'projectName',
-            ellipsis: true,
-            scopedSlots: { customRender: 'RelatedItems' },
-            width: 170
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'left',
-            dataIndex: 'standardInfo',
-            ellipsis: true,
-            scopedSlots: { customRender: 'standardInformation' },
-            width: 170
-          },
-          {
-            title: this.$t('taskType'),
-            align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('Tasknode'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('typeOfDeliverables'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            dataIndex: 'createBy',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('TaskCutOffTime'),
-            align: 'left',
-            dataIndex: 'endTime',
-            ellipsis: true,
-            width: 170,
-            scopedSlots: { customRender: 'endTime' }
-          },
-          // {
-          //   title: this.$t('taskStatus'),
-          //   align: 'left',
-          //   dataIndex: 'statusShow',
-          //   ellipsis: true,
-          //   width: 170,
-          //   scopedSlots: { customRender: 'taskStatus' }
-          // },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 120,
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        Historycolumns: [
-          {
-            title: this.$t('Operator'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('Tasknode'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('OperationTime'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('resultofhandling'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('OperationContent'),
-            align: 'left',
-            dataIndex: '',
-            ellipsis: true,
-            width: 210
-          },
-        ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        url: {
-          list: '/todoCenter/projectProcess/todoTaskList',
-          urlFrom: 'project/projectLibraryBase/queryById',
-        },
-        queryParam: {},
-        regulatoryCertificationTaskPlanList: []
+        confirmLoading: false,
+        disabled: false,
       }
     },
     mounted() {
-      if(this.$route.query.projectName){
-        this.queryParam.projectName = this.$route.query.projectName
-      }
-      this.getList()
+
     },
     methods: {
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-        console.log(this.selectedRowKeys)
-      },
-      RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/ProjectDetails',
-          query: {
-            id: item.projectLibraryId,
-            projectName: item.projectName,
-            projectNameId: item.projectNameId,
-            targetMarket: item.targetMarket,
-            studioEngineer: item.studioEngineer
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      standardInformationClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.bussDocumentLibraryId
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      ProcessingClick(row) {
-        let query = {}
-        row.router = this.$route.path
-        if (row.flowType == '1') {
-          query = {
-            taskDefinitionKey: row.taskDefinitionKey,
-            taskIds: row.taskId,
-            prcType: row.flowType,
-            prcNum: row.prcNum,
-            isTrue: true
-          }
-          let newUrl = this.$router.resolve({
-            path: '/handshakeProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '10') {
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer: row.studioEngineer,
-              type: '102'
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        }else if (row.flowType == '21') {
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer: row.studioEngineer,
-              type: '106'
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '2') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            projectLibraryId: row.projectLibraryId,
-            id: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            isDisplay: true,
-            flowType: 2,
-            Sponsor: 'designInitiatorName',
-            personLiable: 'designDutyName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          // let newUrl = this.$router.resolve({
-          //   path: '/taskListProcess',
-          //   query: query
-          // })
-          // window.open(newUrl.href, '_blank')
-          this.visible = true
-          this.title = this.$t('designComplianceReview')
-          this.getQueryForm()
-
-        } else if (row.flowType == '3') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            studioEngineer: row.studioEngineer,
-            projectLibraryId: row.projectLibraryId,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 3,
-            isDisplay: true,
-            id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
-            personLiable: 'prehomoDutyName',
-            typeOfDeliverables: 'prehomoDeliverableTypeName',
-            deliverableTemplate: 'prehomoDeliverableTemplate',
-            DueDate: 'prehomoDueDate',
-            remarks: 'prehomoRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '4') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            id: row.projectLibraryId,
-            projectLibraryId: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 4,
-            isDisplay: true,
-            Sponsor: 'verifyInitiatorName',
-            personLiable: 'verifyDutyName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          // let newUrl = this.$router.resolve({
-          //   path: '/taskListProcess',
-          //   query: query
-          // })
-          // window.open(newUrl.href, '_blank')
-          this.visible = true
-          this.title = this.$t('verificationComplianceReview')
-        }
-      },
-      searchQuery(value) {
-        this.queryParam = value
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = 1
-              this.getList()
-              return
-            }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      },
-      handleCancel() {
-        this.visible = false
-      },
-      getQueryForm() {
-        getAction(this.url.urlFrom).then((res) => {
-          if (res.success) {
-            this.queryForm = res.result[0] || {}
-            if (this.queryProject) {
-              this.queryForm = { ...this.queryForm, ...this.queryProject }
-              console.log(this.queryForm)
-            }
-          } else {
-            this.queryForm = {}
-          }
-        })
+      next(){
+        this.$emit('basicInformationForm')
       },
     }
   }
 </script>
 
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+  @import'~@assets/less/common.less';
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
 
-  .activeRed {
-    color: red;
-  }
-
-  .header-text {
-    /*font-size: 16px;*/
-    font-size: 14px;
-    font-weight: bold;
-    /*margin-left: 15px;*/
-    /*border-bottom: 1px #d9d9d9 dashed;*/
-    /*height: 30px;*/
-    height: 24px;
-    /*margin-bottom: 30px;*/
-    margin-bottom: 20px;
-  }
-
-  .text-field-left {
-    width: 124px;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: 400;
-    color: #6F7385;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-right: 24px;
-  }
-
-  .content-text {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-
-  .text-field {
-    width: 50%;
-    margin-bottom: 8px;
-
-  .text-field-right {
-    width: calc(100% - 200px);
-    display: inline-block;
-    font-size: 14px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    word-break: break-word;
-    color: #040B29;
-    font-weight: 400;
-  }
-
-  .text-field-right-url {
-    color: #00B3BE !important;
-    cursor: pointer;
-  }
-  }
-  }
-
-  .itemModel {
-    width: 100%;
-    display: inline-block;
-    margin-top: 2px;
-    margin-bottom: 12px;
-  }
-
-  .box-title-text {
+  .box-title-text-add {
     line-height: 1.4;
     display: flex;
-    /*align-items: center;*/
+
   }
 
-  .title-text {
-    width: 88px;
+  .title-text-add {
+    width: 114px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -702,100 +215,48 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 42px;
-    line-height: 48px;
-    color: #000F16;
+    line-height: 42px;
+    margin-top: 3px;
   }
 
-  .Required {
-    color: red;
-    margin-right: 4px;
+  .title-text-add-input {
+    width: 80%;
+    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;
+    margin-top: 3px;
+    margin-bottom: 20px;
   }
 
   .title-text-text {
     margin-top: 9px;
   }
 
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
   .box-input {
     display: inline-block;
+    width: 100%;
     height: 38px;
-    width: 100%;
-  }
-  //
-  //.button-text {
-  //  height: 38px;
-  //  width: calc(100% - 250px);
-  //  line-height: 38px;
-  //  background: #fff;
-  //  border: 1px #00B3BE solid;
-  //  color: #00B3BE;
-  //}
-
-  .process-content {
-    margin-top: 4px;
-    position: relative;
-    margin-bottom: 20px;
-
-    .process-content-content {
-      background: #fff;
-      z-index: 1000;
-      padding: 0 20px;
-
-      .process-content-left {
-        float: left;
-      }
-
-      .process-content-right {
-        float: left;
-        margin-left: 7px;
-
-        .process-content-right-top {
-          font-size: 14px;
-          font-weight: 400;
-          color: #040B29;
-          max-width: 155px;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-        }
-
-        .process-content-right-button {
-          max-width: 155px;
-          font-size: 12px;
-          font-weight: 400;
-          color: #6F7385;
-          margin-top: -4px;
-        }
-      }
-    }
-
-
-    .process-content-content:first-child {
-      padding: 0 20px 0 0;
-    }
-
-    .process-content-content:last-child {
-      padding: 0 0 0 20px;
-    }
-
-    .process-content-right-xian {
-      height: 2px;
-      width: calc(100% - 27px);
-      background: #E6E6E9;
-      position: absolute;
-      top: 16px;
-    }
+    margin-top: 2px;
   }
 
-  .drawer-bootom-button {
-    position: absolute;
-    bottom: 0;
-    z-index: 100;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
+  .formAdd {
+    margin: 0 auto;
+    width: 670px;
+  }
+
+  .bootom-button{
+    text-align: center!important;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 9398cb80a..e76e6451d 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -48,7 +48,7 @@
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
-    name: 'SentList',
+    name: 'safetyPrecautions',
     mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index 26d9d7611..cc548dde6 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -1,319 +1,232 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
-      :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="id"
+      rowKey="key"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
-      <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
+
+      <span slot="relevantverification" slot-scope="text,record">
+            <a-radio-group v-model="record.relevantverification">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
       </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
+      <span slot="certifyingmaterials" slot-scope="text,record">
+            <a-button type="primary" v-model="record.relevantverification">{{$t('uploadattachment')}}</a-button>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div class="bootom-button">
+      <a-button class='btn'>{{$t('preservation')}}</a-button>
+      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
+      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
+
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import uploadFile from '@/components/uploadFile/file'
 
   export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    name: 'upgradeRequirements',
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
-        loading: false,
+        dataSource: [
+          {
+            key: '1',
+            onlineupgraderequirements: this.$t('networksecurityrequirements'),
+            specificrequirements: this.$t('ineffectiveupgrades'),
+            relevantverification: '',
+            certifyingmaterials:this.$t('uploadattachment'),
+          },
+          {
+            key: '2',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('againstunauthorized'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '3',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('communicationinterfacethathasateastusedastandard'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '4',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('softwareupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '5',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('Ensurethatsoftware'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '6',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('ifanupgrademayaffectvehiclesafety'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '7',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('iftheimplementationoftheupgradaffectsdrivingsafety'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '8',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('ensurethatthevehicleisinasafecondition'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '9',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('priortotheexecutionoftheupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '10',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('afterperformingtheupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+        ],
         url: {
-          list: '/todoCenter/projectProcess/doneProcess'
         },
         queryParam: {},
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('onlineupgraderequirements'),
             align: 'left',
-            dataIndex: 'projectName',
-            ellipsis: true,
-            scopedSlots: { customRender: 'RelatedItems' },
-            width: 170
+            dataIndex: 'onlineupgraderequirements',
+            width: 170,
+            customRender: (value, row, index) => {
+              const obj = {
+                children: '',
+                attrs: {},
+              };
+              if(index === 0){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 2;
+                obj.children = this.$t('networksecurityrequirements')
+              }else if(index === 2){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 6;
+                obj.children = this.$t('upgradefunctionrequirements')
+              }else if(index === 8){
+                obj.attrs.rowSpan = 2;
+                obj.children = this.$t('usernotificationrequirement')
+              }else{
+                obj.attrs.rowSpan = 0
+              }
+              return obj;
+            }
           },
           {
-            title: this.$t('standardInformation'),
+            title: this.$t('specificrequirements'),
             align: 'left',
-            dataIndex: 'standardInfo',
-            ellipsis: true,
-            scopedSlots: { customRender: 'standardInformation' },
-            width: 170
+            dataIndex: 'specificrequirements',
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('relevantverification'),
             align: 'left',
-            dataIndex: 'flowTypeShow',
+            dataIndex: 'relevantverification',
+            scopedSlots: { customRender: 'relevantverification' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('certifyingmaterials'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'certifyingmaterials',
+            scopedSlots: { customRender: 'certifyingmaterials' },
             ellipsis: true,
-            width: 170
+            width: 170,
+            customRender: (value, row, index) => {
+              const child = this.$createElement('button', {
+                domProps: {
+                  innerHTML: value
+                },
+                on: {
+                  click: () =>{this.click(row)}
+                }
+              });
+              const obj = {
+                children: child,
+                attrs: {},
+              };
+              if(index === 0){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 10;
+              }else{
+                obj.attrs.rowSpan = 0
+              }
+              return  obj
+
+            }
           },
-          {
-            title: this.$t('CurrentProcessor'),
-            align: 'left',
-            dataIndex: 'assigneeName',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('TaskCutOffTime'),
-            align: 'left',
-            dataIndex: 'endTime',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 120,
-            scopedSlots: { customRender: 'operation' }
-          }
         ],
         selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
+        fileList:{},
       }
     },
     mounted() {
-      this.getList()
+      // this.getList()
     },
     methods: {
-      monitoringProcessClick(row){
-        let newUrl = this.$router.resolve({
-          path: '/processDetails',
-          query: {
-            prcNum: row.prcNum,
-            prcType:row.flowType,
-            prcId:row.actiProcInstId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/ProjectDetails',
-          query: {
-            id: item.projectLibraryId,
-            projectName: item.projectName,
-            projectNameId: item.projectNameId,
-            targetMarket: item.targetMarket,
-            studioEngineer:item.studioEngineer,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      standardInformationClick(item){
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.bussDocumentLibraryId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      viewClick(row) {
-        let query = {}
-        row.router = this.$route.path
-        if (row.flowType == '1') {
-          query = {
-            taskDefinitionKey:row.taskDefinitionKey,
-            taskIds:row.taskId,
-            prcType:row.flowType,
-            prcNum:row.prcNum,
-            isTrue:false,
-          }
-          let newUrl = this.$router.resolve({
-            path: '/handshakeProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '10'){
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer:row.studioEngineer,
-              type:'102',
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '2'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            projectLibraryId:row.projectLibraryId,
-            id: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            isDisplay: false,
-            flowType: 2,
-            Sponsor: 'designInitiatorName',
-            personLiable: 'designDutyName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '3'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            studioEngineer: row.studioEngineer,
-            projectLibraryId:row.projectLibraryId,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 3,
-            isDisplay: false,
-            id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
-            personLiable: 'prehomoDutyName',
-            typeOfDeliverables: 'prehomoDeliverableTypeName',
-            deliverableTemplate: 'prehomoDeliverableTemplate',
-            DueDate: 'prehomoDueDate',
-            remarks: 'prehomoRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '4'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            id: row.projectLibraryId,
-            projectLibraryId: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 4,
-            isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
-            personLiable: 'verifyDutyName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+      click(value){
+        this.fileList = value
+        console.log(this.fileList)
+        if(this.fileList.uploadName){
+          this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
         }
+
+          this.$refs.uploadFile.visible = true
       },
-      searchQuery(value) {
-        this.queryParam = value
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push({
+              id:item.id,
+              fileName:item.fileName
+            })
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.fileList.uploadName = attIdList
+        this.fileList.certifyingmaterials = this.$t('viewFile')
       },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -323,25 +236,23 @@
           }
         })
         let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
           ...queryParam
         }
-        this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = 1
               this.getList()
               return
             }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
           } else {
-            this.loading = false
           }
         })
+      },
+      last(){
+        this.$emit('upgradeRequirementsup')
+      },
+      next(){
+        this.$emit('upgradeRequirementsdown')
       }
     }
   }
@@ -349,11 +260,54 @@
 
 <style scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
-  .text-operation{
-     margin-right: 8px;
+
+  button{
+    width: 89px;
+    border-radius: 4px;
+    cursor: pointer;
+    background: #00B3BE;
+    height: 30px;
+    border: none;
+    color: white;
+  }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+  .btn{
+    width: 63px !important;
+    margin-right:50px;
+    line-height: 1.499;
+    position: relative;
+    display: inline-block;
+    font-weight: 400;
+    white-space: nowrap;
+    text-align: center;
+    background-image: none;
+    border: 1px solid transparent;
+    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+    cursor: pointer;
+    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -ms-touch-action: manipulation;
+    touch-action: manipulation;
+    height: 32px;
+    padding: 0 15px;
+    font-size: 14px;
+    border-radius: 4px;
+    color: #040B29;
+    background-color: #fff;
+    border-color: #d9d9d9;
+  }
+  .btn:hover{
+    color: #00B3BE;
+    border-color: #00B3BE;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
index 9f8639d57..69ba8750d 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
@@ -7,20 +7,20 @@
         {{$t('fillintherecord')}}
       </div>
     </div>
-    <a-tabs v-model="tabActive" @change="callback">
+    <a-tabs class="tabs" v-model="tabActive" @change="callback">
       <a-tab-pane :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
         <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('onlineupgraderequirements')" :tab="$t('onlineupgraderequirements')">
+      <a-tab-pane :key="$t('onlineupgraderequirements')"  :tab="$t('onlineupgraderequirements')">
         <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('safetymeasure')" disabled :tab="$t('safetymeasure')">
+      <a-tab-pane :key="$t('safetymeasure')"  :tab="$t('safetymeasure')">
         <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('upgradedonline')" :tab="$t('upgradedonline')">
+      <a-tab-pane :key="$t('upgradedonline')"  :tab="$t('upgradedonline')">
         <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('beupgradedonline')" :tab="$t('beupgradedonline')">
+      <a-tab-pane :key="$t('beupgradedonline')"  :tab="$t('beupgradedonline')">
         <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('recordparameters')" :tab="$t('recordparameters')">
@@ -329,4 +329,8 @@ export default {
 ::v-deep .ant-table-placeholder {
   margin-top: 8px !important;
 }
+
+::v-deep .tabs .ant-tabs-nav .ant-tabs-tab-disabled, .ant-tabs-nav .ant-tabs-tab-disabled:hover{
+  color: #333333 !important;
+}
 </style>
\ No newline at end of file

From 40e94c9f77f603d1da9fb222333a721085ab4e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Tue, 21 Mar 2023 11:09:54 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-=E6=9B=B4=E6=96=B0log?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationListMaintenance.vue                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index aa547a86c..03e278663 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -258,7 +258,7 @@ export default {
       dataSource: [],
       url:{
         list: '/authDummy/authDummyInventoryInfoEO/page',
-        logList: '',//更新log
+        logList: '/authDummy/authDummyLog/page',//更新log
         exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
         exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出
         addModel: '/authDummy/authDummyInventoryInfoEO/batchAdd',//添加

From aef30f14155630e15133f33d8835512a29c4ef07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Tue, 21 Mar 2023 11:26:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/virtualAuthenticationList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 0a32fa3b6..09a3abb36 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -75,7 +75,7 @@
               @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
            <a class="text-operation"
               v-has="'dummyInventoryBase:read'"
-              :disabled="record.state == 2?true:false" @click="subscribe(record)">
+              @click="subscribe(record)">
                {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
            </a>
         <!--          v-if="record.createBy == userData.username || administrators"-->

From 97540b8779143e7229cbeb4864834ffafab135f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Tue, 21 Mar 2023 11:47:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/virtualAuthenticationList/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 09a3abb36..ebd0b8252 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -206,7 +206,7 @@ export default {
         add: '/authDummy/authDummyInventoryBaseEO/add',//添加
         edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑
         deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除
-        urlWithdraw: '/authDummy/authDummyInventoryBaseEO/batchIssueOrWithdraw'//批量发布或撤回
+        urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回
       },
       dataSource: [],
       columns: [
@@ -316,7 +316,7 @@ export default {
         item.state = 2
         content = this.$t('confirmWithdraw')
       }
-      item.ids = val.id
+      item.id = val.id
       let _this = this
       this.$confirm({
         content: content,