Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

@@ -1,16 +1,23 @@
 package com.jero.modules.project.enums;
 
 public enum ProjectTaskPlanningNameEnum {
-    LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"),
-    LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"),
-    DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"),
+//    LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"),
+//    LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"),
+//    DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"),
 //    PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"),
 //    ATTESTATION_START_TIME("认证开始","Certification begins"),
 //    ATTESTATION_END_TIME("认证结束"," End of certification"),
-    PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo   value:Pre-Homo
-    ATTESTATION_START_TIME("认证试验结束","Homo Completion"),//  name:认证开始   value:Certification begins
+//    PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo   value:Pre-Homo
+//    ATTESTATION_START_TIME("认证试验结束","Homo Completion"),//  name:认证开始   value:Certification begins
     ATTESTATION_END_TIME("认证批准","Homo KO"),//  name:认证结束   value:End of certification
-    VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
+//    VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
+
+    LIST_CONFIRMATION("清单发布","List Publishing"),
+    LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"),
+    DESIGN_DEADLINE("设计核查","Design Verification"),
+    PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo   value:Pre-Homo
+    ATTESTATION_START_TIME("认证开始","Certification Start"),//  name:认证开始   value:Certification begins
+    VERIFY_DEADLINE("验证核查","Verification And Verification"),
     ;
     String name;
     String value;

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

@@ -1483,7 +1483,9 @@ module.exports = {
   technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)',
   architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)',
   controllerparameter:'Controller parameter',
-  electroniccontrollername:'Electronic controller name "Hardware"',
+  electronic:'Electronic controller name',
+  electronicController:'Electronic controller name (Hardware)',
+  electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)',
   electroniccontrollerproductionenterprises:'Electronic controller production enterprises',
   electroniccontrollertype:'Electronic controller type',
   hardwareversioninformation:'Hardware version information',
@@ -1681,5 +1683,11 @@ module.exports = {
   last:'Last',
   designComplianceReviewAdmin:'Design Compliance Review',
   missionAccomplished:'Mission Accomplished',
-
+  yesisselected:'If Yes is selected, enter',
+  forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc',
+  upgraderecordnumber:'Upgrade record number',
+  Modelandfunctionrecord:'Model and function record "Announcement" batch',
+  taskTypeMismatch:'Task Type Mismatch',
+  taskNodeMismatch:'Task Node Mismatch',
+  ifNot:'If not, fill in "none" or "not involved"',
 }

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

@@ -1585,6 +1585,8 @@ module.exports = {
   technicalparameters:'升级可能变更的《公告》技术参数(如有)',
   architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)',
   controllerparameter:'控制器参数',
+  electronic:'电子控制器名称',
+  electronicController:'电子控制器名称(硬件)',
   electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)',
   electroniccontrollerproductionenterprises:'电子控制器生产企业',
   electroniccontrollertype:'电子控制器型号',
@@ -1781,4 +1783,11 @@ module.exports = {
   module:'模块',
   designComplianceReviewAdmin:'设计符合性审查',
   missionAccomplished:'任务完成',
+  yesisselected:'如选择“有”，请输入',
+  forwardXquantity:'如前向X数量，后向X数量，右向X数量等',
+  upgraderecordnumber:'升级备案编号',
+  Modelandfunctionrecord:'车型及功能备案《公告》批次',
+  taskTypeMismatch:'任务类型不匹配',
+  taskNodeMismatch:'任务节点不匹配',
+  ifNot:'如无，则填写“无”或“不涉及”',
 }

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -393,7 +393,10 @@ export default {
     },
     // 创建车型
     createvehicleandfunctionrecords() {
-
+      this.$router.push({
+        path: '/upgradeactivityrecord',
+        query: {}
+      })
     },
     viewProcessClick(row) {
       this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -0,0 +1,359 @@
+<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"
+    >
+      <!--         -->
+      <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>
+      <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>
+    </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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        queryParam: {},
+        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('Sponsor'),
+            align: 'left',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            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
+      }
+    },
+    mounted() {
+      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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue

@@ -0,0 +1,380 @@
+<template>
+  <div class="box">
+    <a-row :gutter="24" style='margin-top: 30px'>
+      <a-col :span="24">
+        <div class="box-title-text">
+          <div class="title-text">
+            <span class="dot"></span>
+            <span class="title-text-text"
+                  :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+            <div class='titlebox'>
+                <span class='titlebox-text'>提交审批</span>
+                <span class='titlebox-text-text'>2023-02-02  14:13:21</span>
+            </div>
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+    <a-row :gutter="24" style='margin-top: 30px'>
+      <a-col :span="24">
+        <div class="box-title-text">
+          <div class="title-text">
+            <span class="dot"></span>
+            <span class="title-text-text"
+                  :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+            <div class='titlebox'>
+              <span class='titlebox-text'>提交审批</span>
+              <span class='titlebox-text-text'>2023-02-02  14:13:21</span>
+            </div>
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        queryParam: {},
+        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('Sponsor'),
+            align: 'left',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            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
+      }
+    },
+    mounted() {
+      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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+  .box{
+    margin-top: 50px;
+    margin-left: 20%;
+  }
+  .dot{
+    width: 10px;
+    height: 10px;
+    border-radius: 10px;
+    background: #00a0e9;
+    display: block;
+    float: left;
+    margin: 4px;
+  }
+  .title-text-text {
+    font-size: 15px;
+    margin-left: 10px;
+    margin-top: 4px;
+  }
+  .titlebox{
+    width: 816px;
+    height: 70px;
+    margin-top: 5px;
+    margin-left: 9px;
+    border-left: #A3AAAD solid 1px;
+  }
+  .titlebox-text{
+    line-height: 5;
+    margin-left: 60px;
+  }
+  .titlebox-text-text{
+    margin-left: 60px;
+  }
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="box">
+    <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('taskname')">{{$t('taskname')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input
+                  :placeholder="$t('pleaseEnter')"
+                  v-model.trim="queryParam.taskname"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('updatereleasetime')">
+                {{$t('updatereleasetime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="updatereleasetime">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('updatereleasetime')"
+                               @change="dateChange({db_field_name:'updatereleasetime'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="queryParam.updatereleasetime"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('upgradeplanexpirationtime')">
+                {{$t('upgradeplanexpirationtime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('upgradeplanexpirationtime')"
+                               @change="dateChange({db_field_name:'upgradeplanexpirationtime'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="queryParam.upgradeplanexpirationtime"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </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='last' style="margin-right:50px">{{$t('last')}}</a-button>
+      <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      queryParam:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    last(){
+      this.$emit('otherup')
+    },
+    dateChange(item) {
+      this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+    },
+    submit(){
+
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height: 650px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  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: 42px;
+  margin-top: 3px;
+}
+
+.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;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue

@@ -0,0 +1,212 @@
+<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-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('totalquantity')">{{$t('totalquantity')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseSelect')"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('dateofproduction')">
+                {{$t('dateofproduction')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('dateofproduction')"
+                               @change="dateChange({db_field_name:'dateofproduction'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.dateofproduction"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('VINcodelist')">
+                {{$t('VINcodelist')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                            v-model="formInline.VINcodelist"
+                            :rows="4"/>
+              </a-form-model-item>
+<!--              <a-form-model-item class="itemModel" prop="VINcodelist">-->
+<!--                <a-button type="primary" class="button-text"-->
+<!--                          @click="clickButtonToUpload('VINcodelist')">-->
+<!--                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||-->
+<!--                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+<!--                  }}-->
+<!--                </a-button>-->
+<!--              </a-form-model-item>-->
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text"></span>
+              </div>
+                            <a-form-model-item class="itemModel" prop="VINcodelist">
+                              <a-button type="primary" class="button-text"
+                                        @click="clickButtonToUpload('VINcodelist')">
+                                {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
+                                formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                                }}
+                              </a-button>
+                            </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button class='btn' style='margin-right: 50px'>{{$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>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      formInline:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    next(){
+      this.$emit('upgradeRequirementsdown')
+    },
+    last(){
+      this.$emit('upgradeRequirementsup')
+    },
+    dateChange(item) {
+      this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height:500px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  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: 42px;
+  margin-top: 3px;
+}
+
+.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;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -0,0 +1,359 @@
+<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"
+    >
+      <!--         -->
+      <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>
+      <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>
+    </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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        queryParam: {},
+        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('Sponsor'),
+            align: 'left',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            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
+      }
+    },
+    mounted() {
+      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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -0,0 +1,366 @@
+<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"
+    >
+      <!--         -->
+      <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>
+      <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>
+    </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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'safetyPrecautions',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'left',
+            dataIndex: 'projectName',
+            scopedSlots: { customRender: 'RelatedItems' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'left',
+            dataIndex: 'standardInfo',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'left',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('LastProcessor'),
+            align: 'left',
+            dataIndex: 'lastAssigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            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,
+        url: {
+          list: '/todoCenter/projectProcess/issuedProcess'
+        },
+        queryParam: {}
+      }
+    },
+    mounted() {
+      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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  /*/deep/.ant-table-column-title{*/
+  /*  font-weight: bold!important;*/
+  /*}*/
+
+  /*/deep/.ant-table-thead > tr > th {*/
+  /*  background: #f3f6f6;*/
+  /*}*/
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -0,0 +1,236 @@
+<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-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('upgraderecordnumber')">{{$t('upgraderecordnumber')}}</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('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('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</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-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'
+
+  export default {
+    name: 'basicInformation',
+    components:{
+    },
+    data() {
+      return {
+        confirmLoading: false,
+        disabled: false,
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      next(){
+        this.$emit('basicInformationForm')
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import'~@assets/less/common.less';
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-title-text-add {
+    line-height: 1.4;
+    display: flex;
+
+  }
+
+  .title-text-add {
+    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: 42px;
+    margin-top: 3px;
+  }
+
+  .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;
+    margin-top: 2px;
+  }
+
+  .formAdd {
+    margin: 0 auto;
+    width: 670px;
+  }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -0,0 +1,212 @@
+<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-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('totalquantity')">{{$t('totalquantity')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseSelect')"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('dateofproduction')">
+                {{$t('dateofproduction')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('dateofproduction')"
+                               @change="dateChange({db_field_name:'dateofproduction'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.dateofproduction"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('VINcodelist')">
+                {{$t('VINcodelist')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                            v-model="formInline.VINcodelist"
+                            :rows="4"/>
+              </a-form-model-item>
+              <!--              <a-form-model-item class="itemModel" prop="VINcodelist">-->
+              <!--                <a-button type="primary" class="button-text"-->
+              <!--                          @click="clickButtonToUpload('VINcodelist')">-->
+              <!--                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||-->
+              <!--                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+              <!--                  }}-->
+              <!--                </a-button>-->
+              <!--              </a-form-model-item>-->
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text"></span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('VINcodelist')">
+                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
+                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button class='btn' style='margin-right: 50px'>{{$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>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      formInline:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    next(){
+      this.$emit('upgradeRequirementsdown')
+    },
+    last(){
+      this.$emit('upgradeRequirementsup')
+    },
+    dateChange(item) {
+      this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height:500px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  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: 42px;
+  margin-top: 3px;
+}
+
+.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;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>

jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue

@@ -0,0 +1,337 @@
+<!--升级-->
+<template>
+  <a-card :bordered="false">
+    <div class="table-operator" style="margin-bottom: 8px">
+      <div @click="fillintherecordClick"
+           class="operator-text">
+        <a-icon type="form"/>
+        {{$t('fillintherecord')}}
+      </div>
+    </div>
+    <a-tabs class="tabs" v-model="tabActive" @change="callback">
+      <a-tab-pane :key="$t('upgradetargetmodel')" :tab="$t('upgradetargetmodel')">
+        <upgradetargetmodel v-if="tabActive == $t('upgradetargetmodel')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('thetargetvehicleofthisupgrade')"  :tab="$t('thetargetvehicleofthisupgrade')">
+        <thetargetvehicleofthisupgrade v-if="tabActive == $t('thetargetvehicleofthisupgrade')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('upgradeimpactassessment')"  :tab="$t('upgradeimpactassessment')">
+        <upgradeimpactassessment v-if="tabActive == $t('upgradeimpactassessment')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('upgradehavechanged')"  :tab="$t('upgradehavechanged')">
+        <upgradehavechanged v-if="tabActive == $t('upgradehavechanged')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('auxiliaryupgradehavechanged')"  :tab="$t('auxiliaryupgradehavechanged')">
+        <auxiliaryupgradehavechanged v-if="tabActive == $t('auxiliaryupgradehavechanged')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('usernotification')" :tab="$t('usernotification')">
+        <usernotification v-if="tabActive == $t('usernotification')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('informationaboutotherupgradetasks')" :tab="$t('informationaboutotherupgradetasks')">
+        <informationaboutotherupgradetasks v-if="tabActive == $t('informationaboutotherupgradetasks')" @otherup='otherup' ref="otherRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
+        <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef"/>
+      </a-tab-pane>
+    </a-tabs>
+    <!--    填写记录-->
+    <a-drawer
+      :title="$t('fillintherecord')"
+      :width="900"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @close="handleCancel"
+    >
+      <!--      :components="drag(columnshistory,'columnshistory')"-->
+      <a-table
+        class="table"
+        :columns="columnshistory"
+        :pagination="false"
+        :scroll="{x: '100%', y: 400}"
+        :data-source="dataSourcehistory"
+        :loading="loading"
+      >
+           <span slot="content" slot-scope="text,record">
+              <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+                <span v-html="text"></span>
+          </a-tooltip>
+           </span>
+        <span slot="detailText" slot-scope="text,record">
+                  <span class="text" :title="text">
+                   {{text && text.length > 10?text.slice(0,9)+'...':text}}
+                  </span>
+            </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="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+      <div class="drawer-bootom-button" >
+        <a-button @click="handleOk" style="margin-right: 16px" type="primary">{{$t('determine')}}</a-button>
+        <a-button @click="handleCancel" >{{$t('cancel')}}</a-button>
+      </div>
+    </a-drawer>
+  </a-card>
+
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import upgradetargetmodel from './components/upgradetargetmodel'
+import thetargetvehicleofthisupgrade from './components/thetargetvehicleofthisupgrade'
+import upgradeimpactassessment from './components/upgradeimpactassessment'
+import upgradehavechanged from './components/upgradehavechanged'
+import auxiliaryupgradehavechanged from './components/auxiliaryupgradehavechanged'
+import usernotification from './components/usernotification'
+import informationaboutotherupgradetasks from './components/informationaboutotherupgradetasks'
+import historicalrecord from './components/historicalrecord'
+
+export default {
+  name: 'index',
+  components: {
+    upgradetargetmodel,
+    thetargetvehicleofthisupgrade,
+    upgradeimpactassessment,
+    upgradehavechanged,
+    auxiliaryupgradehavechanged,
+    usernotification,
+    informationaboutotherupgradetasks,
+    historicalrecord,
+  },
+  data() {
+    return {
+      title: '',
+      queryParam: {
+        projectName:this.$route.query.projectName?this.$route.query.projectName:''
+      },
+      visible:false,
+      confirmLoading: false,
+      pageNohistory: 1,
+      description:'',
+      isTrue:false,
+      pageSizehistory: 10,
+      total: 0,
+      dataSourcehistory:[],
+      columnshistory: [
+        {
+          title: this.$t('fillincontent'),
+          dataIndex: 'logContent',
+          align: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'content' },
+          width: 180
+        },
+        {
+          title: this.$t('module'),
+          dataIndex: 'remarks',
+          align: 'left',
+          ellipsis: true,
+          width: 100,
+          scopedSlots: { customRender: 'detailText' }
+        },
+        {
+          title: this.$t('completedBy'),
+          dataIndex: 'createTime',
+          align: 'left',
+          ellipsis: true,
+          width: 130
+        },
+        {
+          title: this.$t('completedTime'),
+          dataIndex: 'createTime',
+          align: 'left',
+          ellipsis: true,
+          width: 180
+        },
+      ],
+      toggleSearchStatus: false,
+      tabActive: this.$t('upgradetargetmodel')
+    }
+  },
+  methods: {
+    callback(value) {
+      this.tabActive = value
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    fillintherecordClick(){
+      this.visible = true
+      return
+      this.bussLogList()
+    },
+    bussLogList(val) {
+      let query = {
+        pageNo: this.pageNohistory,
+        pageSize: this.pageSizehistory,
+        paramsReportDetailId: this.paramsReportDetailId
+      }
+      this.loading = true
+      getAction('report/detailLog/page', query).then((res) => {
+        if (res.success) {
+          this.dataSourcehistory = res.result.records
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    handleOk() {
+      this.pageNohistory = 1
+      this.visible = false
+    },
+    handleCancel() {
+      this.pageNohistory = 1
+      this.visible = false
+    },
+    onChangehistory(page, pageSize) {
+      this.pageNohistory = page
+      this.bussLogList()
+    },
+    SizeChangehistory(page, pageSize) {
+      this.pageNohistory = 1
+      this.pageSizehistory = pageSize
+      this.bussLogList()
+    },
+    basicInformationForm(){
+      this.tabActive = this.$t('thetargetvehicleofthisupgrade')
+    },
+    upgradeRequirementsup(){
+      this.tabActive = this.$t('upgradetargetmodel')
+    },
+    upgradeRequirementsdown(){
+      this.tabActive = this.$t('upgradeimpactassessment')
+    },
+    safetyPrecautionsup(){
+      this.tabActive = this.$t('thetargetvehicleofthisupgrade')
+    },
+    safetyPrecautionsdown(){
+      this.tabActive = this.$t('upgradehavechanged')
+    },
+    upgradedonlineup(){
+      this.tabActive = this.$t('upgradeimpactassessment')
+    },
+    upgradedonlinedown(){
+      this.tabActive = this.$t('auxiliaryupgradehavechanged')
+    },
+    beupgradedonlineup(){
+      this.tabActive = this.$t('upgradehavechanged')
+    },
+    beupgradedonlinedown(){
+      this.tabActive = this.$t('usernotification')
+    },
+    recordparametersup(){
+      this.tabActive = this.$t('auxiliaryupgradehavechanged')
+    },
+    recordparametersdown(){
+      this.tabActive = this.$t('informationaboutotherupgradetasks')
+    },
+    otherup(){
+      this.tabActive = this.$t('usernotification')
+    },
+    // taskConfirmationHandlingClick() {
+    //   this.$router.push({
+    //     path: '/toDoTaskConfirmation'
+    //   })
+    // }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+::v-deep .ant-table-row:first-child {
+  background: #fff !important;
+  opacity: 0.9;
+}
+
+::v-deep .ant-table-body {
+  background: transparent !important;
+}
+
+::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>

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -1,320 +1,227 @@
 <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"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+      <!--      配置情况-->
+      <span slot="configuration" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--      可升级-->
+      <span slot="whetheritcanbeupgraded" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--       自动化级别-->
+      <span slot="drivingautomationlevel" slot-scope="text,record">
+                    <j-dict-select-tag class="box-input"
+                                       :disabled="disable"
+                                       :placeholder="$t('PleaseSelect')"
+                                       :type="'select'"
+                                       :triggerChange="false"/>
+      </span>
+      <!--       技术参数-->
+      <span slot="technicalparameters" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--      操作列-->
       <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>
-      <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>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </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 style="margin-right:50px">{{$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: 'beupgradedonline',
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
+        dataSource: [
+          {
+            key:1,
+            functionname:'ceshi',
+          }
+        ],
         loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        queryParam: {},
+        disable:false,
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('functionname'),
             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',
+            dataIndex: 'functionname',
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('configuration'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'configuration',
+            ellipsis: true,
+            scopedSlots: { customRender: 'configuration' },
+            width: 170
+          },
+          {
+            title: this.$t('whetheritcanbeupgraded'),
+            align: 'left',
+            dataIndex: 'whetheritcanbeupgraded',
+            scopedSlots: { customRender: 'whetheritcanbeupgraded' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('CurrentProcessor'),
+            title: this.$t('drivingautomationlevel'),
             align: 'left',
-            dataIndex: 'assigneeName',
+            dataIndex: 'drivingautomationlevel',
+            scopedSlots: { customRender: 'drivingautomationlevel' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('TaskCutOffTime'),
+            title: this.$t('technicalparameters'),
             align: 'left',
-            dataIndex: 'endTime',
+            dataIndex: 'technicalparameters',
+            scopedSlots: { customRender: 'technicalparameters' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('taskStatus'),
+            title: this.$t('functiondescription'),
             align: 'left',
-            dataIndex: 'statusShow',
+            dataIndex: 'functiondescription',
             ellipsis: true,
             width: 170
           },
+          {
+            title: this.$t('applicationconditions'),
+            align: 'left',
+            dataIndex: 'applicationconditions',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('controllerparameter'),
+            align: 'left',
+            dataIndex: 'controllerparameter',
+            ellipsis: true,
+            width: 170,
+            children: [
+              {
+                title: this.$t('electronic'),
+                align: 'left',
+                dataIndex: 'electronic',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollerproductionenterprises'),
+                align: 'left',
+                dataIndex: 'electroniccontrollerproductionenterprises',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertypeone',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformation',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformationone',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('softwaredevelopmententerprise'),
+                align: 'left',
+                dataIndex: 'softwaredevelopmententerprise',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemversion'),
+                align: 'left',
+                dataIndex: 'operatingsystemversion',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('inflammatorydata'),
+                align: 'left',
+                dataIndex: 'inflammatorydata',
+                ellipsis: true,
+                width: 170
+              },
+            ]
+          },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 120,
+            width: 200,
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
       }
     },
     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')
-        }
-      },
-      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 => {
@@ -342,18 +249,55 @@
             this.loading = false
           }
         })
-      }
+      },
+      last(){
+        this.$emit('beupgradedonlineup')
+      },
+      next(){
+        this.$emit('beupgradedonlinedown')
+      },
+      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')
+      },
     }
   }
 </script>
 
-<style scoped>
+<style lang='less' scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+
   .text-operation{
-     margin-right: 8px;
+    margin-right: 8px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+    white-space: pre-wrap!important;
   }
 </style>

jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue

@@ -366,9 +366,9 @@
   .titlebox{
     width: 816px;
     height: 70px;
-    margin-top: 10px;
-    margin-left: 26px;
-    border: #191E29 solid 1px;
+    margin-top: 5px;
+    margin-left: 9px;
+    border-left: #A3AAAD solid 1px;
   }
   .titlebox-text{
     line-height: 5;

jero-web/src/views/otamanagement/vehicleinformation/components/other.vue

@@ -1,359 +1,129 @@
 <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"
-    >
-      <!--         -->
-      <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>
-      <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>
-    </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"
-      />
+    <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('upgradepacketprotectionmeasures')">{{$t('upgradepacketprotectionmeasures')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-textarea
+                  :placeholder="$t('controlsystem')"
+                  v-model.trim="queryParam.description" :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='last' style="margin-right:50px">{{$t('last')}}</a-button>
+      <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
     </div>
   </div>
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, deleteAction } from '@/api/manage'
 
-  export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        queryParam: {},
-        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('Sponsor'),
-            align: 'left',
-            dataIndex: 'createBy',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            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
-      }
-    },
-    mounted() {
-      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')
-        }
-      },
-      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
-          }
-        })
-      }
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      queryParam:{}
     }
+  },
+  mounted() {
+
+  },
+  methods: {
+    last(){
+      this.$emit('otherup')
+    },
+    submit(){
+
+    },
   }
+}
 </script>
 
-<style scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-  .text-operation{
-     margin-right: 8px;
-  }
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height: 650px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  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: 42px;
+  margin-top: 3px;
+}
+
+.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;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
 </style>

jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue

@@ -1,118 +1,148 @@
 <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"
+      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="havemeasures" slot-scope="text,record">
+                <j-dict-select-tag class="box-input"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
       </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: 'safetyPrecautions',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
+        dataSource: [
+          {
+            key: '1',
+            aspect: this.$t('upgradepacketprotectionmeasures'),
+            safetymeasure: this.$t('authenticityandintegrityprotectionmechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials: this.$t('uploadattachment'),
+          },
+          {
+            key: '2',
+            aspect: this.$t('otaupgradedsecuritymeasuresforvehicles'),
+            safetymeasure: this.$t('failsafmechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+          {
+            key: '3',
+            aspect: '',
+            safetymeasure: this.$t('vehiclesafetyMeasuresafterUpgradefailure'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+          {
+            key: '4',
+            aspect: '',
+            safetymeasure: this.$t('informationsecuritymechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+        ],
         loading: false,
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('aspect'),
             align: 'left',
-            dataIndex: 'projectName',
-            scopedSlots: { customRender: 'RelatedItems' },
-            ellipsis: true,
-            width: 170
+            dataIndex: 'aspect',
+            customRender: (value, row, index) => {
+              const obj = {
+                children: '',
+                attrs: {},
+              };
+              if(index === 0){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 1;
+                obj.children = this.$t('upgradepacketprotectionmeasures')
+              }else if(index === 1){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 3;
+                obj.children = this.$t('otaupgradedsecuritymeasuresforvehicles')
+              }else{
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+
+            }
           },
           {
-            title: this.$t('standardInformation'),
+            title: this.$t('safetymeasure'),
             align: 'left',
-            dataIndex: 'standardInfo',
-            scopedSlots: { customRender: 'standardInformation' },
-            ellipsis: true,
-            width: 170
+            dataIndex: 'safetymeasure',
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('havemeasures'),
             align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
+            dataIndex: 'havemeasures',
+            scopedSlots: { customRender: 'havemeasures' },
           },
           {
-            title: this.$t('LastProcessor'),
+            title: this.$t('certifyingmaterials'),
             align: 'left',
-            dataIndex: 'lastAssigneeName',
-            ellipsis: true,
-            width: 170
+            dataIndex: 'certifyingmaterials',
+            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,
@@ -128,190 +158,28 @@
       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))
@@ -333,34 +201,81 @@
               this.getList()
               return
             }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
             this.loading = false
           } else {
             this.loading = false
           }
         })
-      }
+      },
+      last(){
+        this.$emit('safetyPrecautionsup')
+      },
+      next(){
+        this.$emit('safetyPrecautionsdown')
+      },
     }
   }
 </script>
 
-<style scoped>
+<style lang='less' 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;
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+    margin-top: 2px;
   }
 
-  /*/deep/.ant-table-column-title{*/
-  /*  font-weight: bold!important;*/
-  /*}*/
+  button{
+    width: 89px;
+    border-radius: 4px;
+    cursor: pointer;
+    background: #00B3BE;
+    height: 30px;
+    border: none;
+    color: white;
+  }
 
-  /*/deep/.ant-table-thead > tr > th {*/
-  /*  background: #f3f6f6;*/
-  /*}*/
+  .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>

jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue

@@ -1,359 +1,279 @@
 <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"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+<!--      可升级-->
+      <span slot="systemclass" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+<!--       技术参数-->
+      <span slot="technicalparameters" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+<!--      上传附件-->
+      <span slot="architecturetopologydiagram" slot-scope="text,record">
+          <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+      </span>
+<!--      操作列-->
       <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>
-      <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>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </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 style="margin-right:50px">{{$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: 'upgradedonline',
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        queryParam: {},
+        dataSource: [
+          {
+            key:1,
+            systemclass: 'ceshi',
+            vaule: 2,
+          }
+          ],
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('systemclass'),
             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',
+            dataIndex: 'systemclass',
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('whetheritcanbeupgraded'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'whetheritcanbeupgraded',
+            scopedSlots: { customRender: 'systemclass' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('CurrentProcessor'),
+            title: this.$t('technicalparameters'),
             align: 'left',
-            dataIndex: 'assigneeName',
+            dataIndex: 'technicalparameters',
+            scopedSlots: { customRender: 'technicalparameters' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('TaskCutOffTime'),
+            title: this.$t('architecturetopologydiagram'),
             align: 'left',
-            dataIndex: 'endTime',
+            dataIndex: 'architecturetopologydiagram',
+            scopedSlots: { customRender: 'architecturetopologydiagram' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('taskStatus'),
+            title: this.$t('controllerparameter'),
             align: 'left',
-            dataIndex: 'statusShow',
+            dataIndex: 'controllerparameter',
             ellipsis: true,
-            width: 170
+            width: 170,
+            children: [
+              {
+                title: this.$t('electronicController'),
+                align: 'left',
+                dataIndex: 'electronicController',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollername'),
+                align: 'left',
+                dataIndex: 'electroniccontrollername',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollerproductionenterprises'),
+                align: 'left',
+                dataIndex: 'electroniccontrollerproductionenterprises',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformation',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('initialsoftwareversionnumber'),
+                align: 'left',
+                dataIndex: 'initialsoftwareversionnumber',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('initialpackageforintegrityinflammatorydata'),
+                align: 'left',
+                dataIndex: 'initialpackageforintegrityinflammatorydata',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('environmentalprotection'),
+                align: 'left',
+                dataIndex: 'environmentalprotection',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemtype'),
+                align: 'left',
+                dataIndex: 'operatingsystemtype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemmanufacturer'),
+                align: 'left',
+                dataIndex: 'operatingsystemmanufacturer',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemversion'),
+                align: 'left',
+                dataIndex: 'operatingsystemversion',
+                ellipsis: true,
+                width: 170
+              },
+            ]
           },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 120,
+            width: 200,
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
       }
     },
     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')
-        }
-      },
-      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
-          }
-        })
-      }
+        // 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
+        //   }
+        // })
+      },
+      last(){
+        this.$emit('upgradedonlineup')
+      },
+      next(){
+        this.$emit('upgradedonlinedown')
+      },
+      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')
+      },
+      clickButtonToUpload() {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+      },
     }
   }
 </script>
 
 <style scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+
   .text-operation{
-     margin-right: 8px;
+    margin-right: 8px;
+  }
+
+  ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+    white-space: pre-wrap!important;
   }
 </style>

jero-web/src/views/otamanagement/vehicleinformation/index.vue

@@ -1,3 +1,4 @@
+<!--车型-->
 <template>
   <a-card :bordered="false">
     <div class="table-operator" style="margin-bottom: 8px">

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

@@ -268,13 +268,15 @@
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
+          <!--              <a class="text-operation"-->
+          <!--                 v-else-->
+          <!--                 @click="viewClick(record)">-->
+          <!--                {{ $t('view') }}-->
+          <!--              </a>-->
               <a class="text-operation"
-                 v-else
-                 @click="viewClick(record)">
-                {{ $t('view') }}
-              </a>
-              <a class="text-operation"
-                 v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
+                 v-if="(record.designFlowStatus == 'List to be released' ||
+                  record.verifyFlowStatus == 'List to be released')
+                 && roleSwitchingCode == 0"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -284,12 +286,12 @@
               </a>
 
         </span>
-        <span slot="operationOne" slot-scope="text,record">
-          <a class="text-operation"
-             @click="viewClick(record)">
-                {{ $t('view') }}
-          </a>
-        </span>
+        <!--        <span slot="operationOne" slot-scope="text,record">-->
+        <!--          <a class="text-operation"-->
+        <!--             @click="viewClick(record)">-->
+        <!--                {{ $t('view') }}-->
+        <!--          </a>-->
+        <!--        </span>-->
         <span slot="titleName" slot-scope="text,record" :title="text">
               <span class="textName">
                  {{ text }}
@@ -301,6 +303,23 @@
                  {{ text }}
               </a>
         </span>
+
+        <span slot="verifyDeliverableTemplateName" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.verifyDeliverableTemplate)"
+                      v-if="result.verifyDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
+        <span slot="designDeliverableTemplate" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.designDeliverableTemplate)"
+                      v-if="result.designDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
       </a-table>
       <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
         {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
@@ -358,39 +377,6 @@
         </a-form-model>
       </a-spin>
     </a-modal>
-    <a-modal
-      :title="fileTitle"
-      :width="600"
-      :visible="visibleFile"
-      :maskClosable="false"
-      @cancel="visibleFile = false"
-    >
-      <template slot="footer">
-        <a-button key="back" @click="visibleFile = false">
-          {{ $t('cancel') }}
-        </a-button>
-      </template>
-      <a-table
-        class="table"
-        :columns="columnsFile"
-        :pagination="false"
-        :scroll="{x:500,y: 400}"
-        :data-source="dataSourceFile"
-        :loading="loading"
-      >
-        <span slot="fileOperation" slot-scope="record">
-           <a class="text" @click="pdfPreview(record)"
-              :disabled="record.fileSuffix == '.pdf' || record.fileSuffix == '.docx' || record.fileSuffix == '.doc'
-              || record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif'|| record.fileSuffix == '.jpeg'
-              || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true">
-                {{ $t('See') }}
-          </a>
-          <a class="text" @click="download(record)">
-                {{ $t('download') }}
-          </a>
-        </span>
-      </a-table>
-    </a-modal>
     <a-modal
       :title="$t('reasonsForRejection')"
       :width="500"
@@ -459,6 +445,7 @@
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
     <listOfRegulationsView ref="listOfRegulationsViewRef"/>
     <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
+    <viewFileModel ref="viewFileModelRef"/>
   </a-card>
 </template>
 
@@ -473,6 +460,7 @@
   import fixedPlate from './fixedPlateForm'
   import resultReportedUpload from './resultReportedUpload'
   import listOfRegulationsView from './listOfRegulationsView'
+  import viewFileModel from '@/components/viewFileModel/index'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import batchSettingPersonnel from './batchSettingPersonnel'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
@@ -496,7 +484,8 @@
       fixedPlate,
       resultReportedUpload,
       batchSettingPersonnel,
-      listOfRegulationsView
+      listOfRegulationsView,
+      viewFileModel
     },
     mixins: [ResizeColumnProvide, ResizeHeader],
     data() {
@@ -531,92 +520,27 @@
             ellipsis: true,
             width: 180
           },
-          // {
-          //   title: this.$t('listConfirmationStatus'),
-          //   align: 'left',
-          //   dataIndex: 'inventoryAffirmStatusName',
-          //   width: 240,
-          //   sorter: true,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('taskAffirmStatus'),
-          //   align: 'left',
-          //   sorter: true,
-          //   dataIndex: 'taskAffirmStatusName',
-          //   width: 240,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('taskReleaseStatus'),
-          //   align: 'center',
-          //   dataIndex: 'taskReleaseStatus'
-          // },
-          // {
-          //   title: this.$t('zoneOfApplication'),
-          //   align: 'left',
-          //   dataIndex: 'region_dictText',
-          //   width: 180,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('correspondingStandard'),
-          //   align: 'left',
-          //   dataIndex: 'correspondingStandard',
-          //   width: 180,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('implementationCategory'),
-          //   align: 'left',
-          //   dataIndex: 'implementType_dictText',
-          //   width: 180,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('ImplementationDate'),
-          //   align: 'left',
-          //   width: 200,
-          //   dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('vehicleInProductionDate'),
-          //   align: 'left',
-          //   width: 220,
-          //   dataIndex: 'implementTime',
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('certificationType'),
-          //   align: 'left',
-          //   dataIndex: 'attestationType_dictText',
-          //   width: 180,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('certificationLevel'),
-          //   align: 'left',
-          //   dataIndex: 'attestationRank_dictText',
-          //   width: 180,
-          //   sorter: true,
-          //   ellipsis: true
-          // },
-          // {
-          //   title: this.$t('applicableSupplement'),
-          //   align: 'left',
-          //   width: 220,
-          //   dataIndex: 'applicableSupplement',
-          //   ellipsis: true
-          // },
-          // {
-          //   title: 'WVTA ID',
-          //   align: 'left',
-          //   dataIndex: 'wvtaId',
-          //   width: 180,
-          //   sorter: true,
-          //   ellipsis: true
-          // },
+          {
+            title: this.$t('applicableSupplement'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'applicableSupplement',
+            width: 180
+          },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'attestationType_dictText',
+            width: 180
+          },
+          {
+            title: this.$t('certificationLevel'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'attestationRank_dictText',
+            width: 180
+          },
           {
             title: this.$t('areaOfResponsibility'),
             align: 'left',
@@ -649,31 +573,16 @@
             dataIndex: 'engineeringInterfacePersonName',
             width: 180
           },
-          // {
-          //   title: this.$t('remarks'),
-          //   align: 'left',
-          //   dataIndex: 'remark',
-          //   width: 180,
-          //   ellipsis: true
-          // },
+          {
+            title: this.$t('remarks'),
+            align: 'left',
+            dataIndex: 'remark',
+            width: 180,
+            ellipsis: true
+          },
           {
             title: this.$t('confirmationOfDesignConformity'),
             children: [
-              // {
-              //   title: this.$t('Deliverables'),
-              //   dataIndex: 'designDeliverableTemplateName',
-              //   align: 'left',
-              //   width: 180,
-              //   ellipsis: true,
-              //   scopedSlots: { customRender: 'designDeliverableTemplateName' }
-              // },
-              // {
-              //   title: this.$t('Sponsor'),
-              //   dataIndex: 'designInitiatorName',
-              //   align: 'left',
-              //   width: 180,
-              //   ellipsis: true
-              // },
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'designDutyName',
@@ -694,6 +603,14 @@
                 align: 'left',
                 ellipsis: true,
                 width: 140
+              },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'designDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'designDeliverableTemplate' }
               }
               // {
               //   title: this.$t('descriptionDeliverables'),
@@ -704,65 +621,9 @@
               // }
             ]
           },
-          // {
-          //   title: this.$t('PrehomoConfirmation'),
-          //   children: [
-          //     {
-          //       title: this.$t('Deliverables'),
-          //       dataIndex: 'prehomoDeliverableTemplateName',
-          //       align: 'left',
-          //       width: 180,
-          //       ellipsis: true,
-          //       scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
-          //     },
-          //     // {
-          //     //   title: this.$t('Sponsor'),
-          //     //   dataIndex: 'prehomoInitiatorName',
-          //     //   align: 'left',
-          //     //   width: 180,
-          //     //   ellipsis: true
-          //     // },
-          //     {
-          //       title: this.$t('personLiable'),
-          //       dataIndex: 'prehomoDutyName',
-          //       align: 'left',
-          //       width: 180,
-          //       ellipsis: true
-          //     },
-          //     {
-          //       title: this.$t('TaskCutOffTime'),
-          //       dataIndex: 'prehomoDueDate',
-          //       align: 'left',
-          //       width: 140,
-          //       ellipsis: true
-          //     },
-          //     {
-          //       title: this.$t('descriptionDeliverables'),
-          //       dataIndex: 'prehomoRemark',
-          //       align: 'left',
-          //       width: 220,
-          //       ellipsis: true
-          //     }
-          //   ]
-          // },
           {
             title: this.$t('verificationAndConformityconfirmation'),
             children: [
-              // {
-              //   title: this.$t('Deliverables'),
-              //   dataIndex: 'verifyDeliverableTemplateName',
-              //   align: 'left',
-              //   width: 180,
-              //   ellipsis: true,
-              //   scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
-              // },
-              // {
-              //   title: this.$t('Sponsor'),
-              //   dataIndex: 'verifyInitiatorName',
-              //   align: 'left',
-              //   width: 180,
-              //   ellipsis: true
-              // },
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'verifyDutyName',
@@ -783,6 +644,14 @@
                 align: 'left',
                 ellipsis: true,
                 width: 180
+              },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'verifyDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
               }
               // {
               //   title: this.$t('descriptionDeliverables'),
@@ -799,13 +668,6 @@
             fixed: 'right',
             width: 200,
             scopedSlots: { customRender: 'operation' }
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 140,
-            scopedSlots: { customRender: 'operationOne' }
           }
         ],
         columnsAll: [],
@@ -911,6 +773,33 @@
             key: 3,
             moduleFlag: '法规清单'
           },
+          {
+            sort: '',
+            name: this.$t('applicableSupplement'),
+            headFieldCn: '适用增补件',
+            headFieldEn: 'Applicable Supplement',
+            field: 'applicableSupplement',
+            key: 4,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('certificationType'),
+            headFieldCn: '认证类型',
+            headFieldEn: 'Certification Type',
+            field: 'attestationType_dictText',
+            key: 5,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('certificationLevel'),
+            headFieldCn: '认证级别',
+            headFieldEn: 'Certification Level',
+            field: 'attestationRank_dictText',
+            key: 6,
+            moduleFlag: '法规清单'
+          },
           {
             sort: '',
             name: this.$t('areaOfResponsibility'),
@@ -938,6 +827,15 @@
             key: 18,
             moduleFlag: '法规清单'
           },
+          {
+            sort: '',
+            name: this.$t('remarks'),
+            headFieldCn: '备注',
+            headFieldEn: 'Comments',
+            field: 'remark',
+            key: 18,
+            moduleFlag: '法规清单'
+          },
           {
             sort: '',
             name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
@@ -965,7 +863,17 @@
             headFieldEn: 'Process Status',
             field: 'designFlowStatusName',
             affirmFlag: '1',
-            key: 23,
+            key: 24 ,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'designDeliverableTemplate',
+            affirmFlag: '3',
+            key: 25,
             moduleFlag: '法规清单'
           },
           {
@@ -998,6 +906,16 @@
             key: 34,
             moduleFlag: '法规清单'
           },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'verifyDeliverableTemplate',
+            affirmFlag: '3',
+            key: 36,
+            moduleFlag: '法规清单'
+          },
           {
             sort: '',
             disabled: true,
@@ -1216,23 +1134,15 @@
       },
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        console.log(this.isRoleSwitching)
-        if (!this.isRoleSwitching) {
+        if (this.roleSwitchingCode == 0 || this.roleSwitchingCode == 1) {
+        } else {
           for (var i = 0; i < columnResult.length; i++) {
-            if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 200) {
-              columnResult.splice(i, 1)
-              i--
-            }
-          }
-        } else if (this.isRoleSwitching) {
-          for (var i = 0; i < columnResult.length; i++) {
-            if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) {
+            if (columnResult[i].title === this.$t('operation')) {
               columnResult.splice(i, 1)
               i--
             }
           }
         }
-
         return columnResult
       }
     },
@@ -1620,7 +1530,8 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
+                if (this.dataSource[i].verifyFlowStatus == 'List to be released' ||
+                  this.dataSource[i].designFlowStatus == 'List to be released') {
                   isTrue = true
                 } else {
                   isTrue = false
@@ -1733,6 +1644,15 @@
         }).then((res) => {
           if (res.success) {
             this.columnsAll = this.column
+            this.columnsAll.forEach((item) => {
+              if (item.children) {
+                item.children.forEach((val) => {
+                  this.checkedList.push(item.dataIndex, val.dataIndex)
+                })
+              } else {
+                this.checkedList.push(item.dataIndex)
+              }
+            })
             return
             if (res.result.length != 0) {
               this.columnsAll = res.result
@@ -2082,7 +2002,7 @@
         })
       },
 
-      startProcess(value, type,index) {
+      startProcess(value, type, index) {
         let query = {
           type: type,
           projectLawsInvnetoryList: value,
@@ -2092,7 +2012,7 @@
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
-            this.completeTaskList.push(this.completeTask(value, res.result,index))
+            this.completeTaskList.push(this.completeTask(value, res.result, index))
             Promise.all(this.completeTaskList).then((res) => {
               if (this.requestsNum == res.length) {
                 this.visible = false
@@ -2269,7 +2189,7 @@
           if (dataList[i].designFlowStatus == 'List to be checked') {
             if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
               this.requestsNum++
-              _this.startProcess(dataList[i], 2,this.requestsNum)
+              _this.startProcess(dataList[i], 2, this.requestsNum)
             }
           } else {
             _this.detailedWarningList.push(
@@ -2278,7 +2198,7 @@
           if (dataList[i].verifyFlowStatus == 'List to be checked') {
             if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
               this.requestsNum++
-              _this.startProcess(dataList[i], 2,this.requestsNum)
+              _this.startProcess(dataList[i], 2, this.requestsNum)
             }
           } else {
             _this.detailedWarningList.push(
@@ -2384,27 +2304,6 @@
         }
       },
 
-      pdfPreviewClick(name, id) {
-        let fileName = name
-        let index1 = fileName.lastIndexOf('.')
-        let index2 = fileName.length
-        let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username))
-        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
-          window.open(url, '_blank')
-        } else {
-          downloadFile('/sys/common/downLoadFile', name, { id: id, userName: this.userInfo().username })
-        }
-      },
-
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
       },
@@ -2465,7 +2364,7 @@
       },
 
       resultReportedClick(val) {
-        if (val.regulationOwnerId == this.userInfo().id) {
+        if (this.roleSwitchingCode == 1) {
           this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val)
         } else {
           if (val.fileId) {
@@ -2483,6 +2382,9 @@
           }
         })
         window.open(newUrl.href, '_blank')
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -2772,6 +2674,11 @@
     padding-bottom: 0 !important;
     overflow: scroll !important;
   }
+
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
 </style>
 <style lang="less">
   .box-input .ant-select-selection {

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

@@ -92,7 +92,7 @@
                 </div>
               </div>
             </a-col>
-            <a-col :span="12" v-if="formInline.roleCodeIndex == 0">
+            <a-col :span="12" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
@@ -103,7 +103,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0">
+          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -125,29 +125,21 @@
               </div>
             </a-col>
           </a-row>
-          <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <div class="header-text">
             &nbsp;{{$t('confirmationOfDesignConformity')}}
           </div>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.designInitiatorName ? formInline.designInitiatorName : '--'}}
-                </div>
-              </div>
-            </a-col>
+          <a-row :gutter="24">
+            <!--            <a-col :span="12">-->
+            <!--              <div class="box-title-text">-->
+            <!--                <div class="title-text">-->
+            <!--                <span class="title-text-text"-->
+            <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+            <!--                </div>-->
+            <!--                <div class="itemModel">-->
+            <!--                  {{formInline.designInitiatorName ? formInline.designInitiatorName : '&#45;&#45;'}}-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -159,12 +151,6 @@
                 </div>
               </div>
             </a-col>
-          </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -177,11 +163,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -211,11 +193,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <a-row :gutter="24">
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
@@ -228,132 +206,124 @@
               </div>
             </a-col>
           </a-row>
-          <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            &nbsp;{{$t('PrehomoConfirmation')}}
-          </div>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.prehomoInitiatorName ? formInline.prehomoInitiatorName : '--'}}
-                </div>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.prehomoDutyName ? formInline.prehomoDutyName : '--'}}
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.prehomoDueDate ? formInline.prehomoDueDate : '--'}}
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.prehomoDeliverableTypeName ? formInline.prehomoDeliverableTypeName : '--'}}
-                </div>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-                </div>
-                <div class="itemModel">
-                <span v-if="formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' ||
-                  formInline.prehomoDeliverableTemplate == null">
-                  --
-                </span>
-                  <a @click="clickButtonToUpload(formInline.prehomoDeliverableTemplate)" v-else>
-                    {{ $t('viewFile') }}
-                  </a>
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="24">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.prehomoRemark ? formInline.prehomoRemark : '--'}}
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-          <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <!--          <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            &nbsp;{{$t('PrehomoConfirmation')}}-->
+          <!--          </div>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoInitiatorName ? formInline.prehomoInitiatorName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDutyName ? formInline.prehomoDutyName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDueDate ? formInline.prehomoDueDate : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDeliverableTypeName ? formInline.prehomoDeliverableTypeName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                <span v-if="formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' ||-->
+          <!--                  formInline.prehomoDeliverableTemplate == null">-->
+          <!--                  &#45;&#45;-->
+          <!--                </span>-->
+          <!--                  <a @click="clickButtonToUpload(formInline.prehomoDeliverableTemplate)" v-else>-->
+          <!--                    {{ $t('viewFile') }}-->
+          <!--                  </a>-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="24">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoRemark ? formInline.prehomoRemark : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <div class="header-text">
             &nbsp;{{$t('verificationAndConformityconfirmation')}}
           </div>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-        formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-         formInline.regulationOwnerId == userInfoQuery.id)">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-                </div>
-                <div class="itemModel">
-                  {{formInline.verifyInitiatorName ? formInline.verifyInitiatorName : '--'}}
-                </div>
-              </div>
-            </a-col>
+          <a-row :gutter="24">
+            <!--            <a-col :span="12">-->
+            <!--              <div class="box-title-text">-->
+            <!--                <div class="title-text">-->
+            <!--                <span class="title-text-text"-->
+            <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+            <!--                </div>-->
+            <!--                <div class="itemModel">-->
+            <!--                  {{formInline.verifyInitiatorName ? formInline.verifyInitiatorName : '&#45;&#45;'}}-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -365,12 +335,6 @@
                 </div>
               </div>
             </a-col>
-          </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -383,11 +347,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -416,11 +376,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+          <a-row :gutter="24">
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
@@ -550,8 +506,8 @@
         formInline: {},
         disabled: false,
         userInfoQuery: {},
-        rejectCauseList:[],
-        rejectCauseListOne:[]
+        rejectCauseList: [],
+        rejectCauseListOne: []
       }
     },
     mounted() {

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -40,16 +40,20 @@
         @showSizeChange="SizeChange"
       />
     </div>
+    <designCompliance ref="designComplianceRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-
+  import designCompliance from './designCompliance'
   export default {
     name: 'SentList',
     mixins:[ResizeHeader, ResizeColumnProvide],
+    components:{
+      designCompliance
+    },
     data() {
       return {
         dataSource: [],
@@ -79,19 +83,33 @@
             width: 170
           },
           {
-            title: this.$t('LastProcessor'),
+            title: this.$t('Tasknode'),
             align: 'left',
-            dataIndex: 'lastAssigneeName',
+            dataIndex: 'taskDefinitionKeyName',
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('CurrentProcessor'),
+            title: this.$t('Sponsor'),
             align: 'left',
-            dataIndex: 'assigneeName',
+            dataIndex: 'createBy',
             ellipsis: true,
             width: 170
           },
+          // {
+          //   title: this.$t('LastProcessor'),
+          //   align: 'left',
+          //   dataIndex: 'lastAssigneeName',
+          //   ellipsis: true,
+          //   width: 170
+          // },
+          // {
+          //   title: this.$t('CurrentProcessor'),
+          //   align: 'left',
+          //   dataIndex: 'assigneeName',
+          //   ellipsis: true,
+          //   width: 170
+          // },
           {
             title: this.$t('TaskCutOffTime'),
             align: 'left',
@@ -99,13 +117,13 @@
             ellipsis: true,
             width: 170
           },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
+          // {
+          //   title: this.$t('taskStatus'),
+          //   align: 'left',
+          //   dataIndex: 'statusShow',
+          //   ellipsis: true,
+          //   width: 170
+          // },
           {
             title: this.$t('operation'),
             align: 'left',
@@ -207,7 +225,7 @@
             TaskKey: row.taskDefinitionKey,
             isDisplay: false,
             flowType: 2,
-            Sponsor: 'designInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'designDutyName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
@@ -219,11 +237,12 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+          // let newUrl = this.$router.resolve({
+          //   path: '/taskListProcess',
+          //   query: query
+          // })
+          // window.open(newUrl.href, '_blank')
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -241,7 +260,7 @@
             flowType: 3,
             isDisplay: false,
             id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'prehomoDutyName',
             typeOfDeliverables: 'prehomoDeliverableTypeName',
             deliverableTemplate: 'prehomoDeliverableTemplate',
@@ -275,7 +294,7 @@
             TaskKey: row.taskDefinitionKey,
             flowType: 4,
             isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'verifyDutyName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -12,12 +12,12 @@
           <img v-if="item.status == 1" src="../../../../assets/wancheng.png" class="process-content-left" alt="">
           <span v-else-if="item.status == 2" class="process-content-left">
              <span class="process-content-left-yuan">
-                   4
+                   {{index+1}}
              </span>
           </span>
           <span v-else-if="item.status == 3" class="process-content-left">
              <span class="process-content-left-last">
-                   5
+                  {{index+1}}
              </span>
           </span>
           <div class="process-content-right">
@@ -41,8 +41,8 @@
         </span>
         <span slot="approvalFile" slot-scope="text,result">
               <span class="viewFile"
-                    @click="viewFileClick(record.approvalFile)"
-                    v-if="record.approvalFile">
+                    @click="viewFileClick(result.approvalFile)"
+                    v-if="result.approvalFile">
                 {{$t('viewFile')}}
               </span>
               <span v-else>--</span>
@@ -109,7 +109,7 @@
           },
           {
             title: this.$t('Tasknode'),
-            dataIndex: 'name',
+            dataIndex: 'taskDefinitionKeyName',
             align: 'left',
             width: 180,
             ellipsis: true
@@ -126,11 +126,10 @@
           },
           {
             title: this.$t('resultofhandling'),
-            dataIndex: 'approvalResult',
+            dataIndex: 'operatorResultName',
             align: 'left',
             width: 200,
             ellipsis: true,
-            scopedSlots: { customRender: 'approvalResult' }
           },
           {
             title: this.$t('feedback'),
@@ -162,6 +161,76 @@
         getAction('/wkflow/processHistoryEO/list', query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length > 0) {
+              let taskData = this.dataSource[this.dataSource.length - 1]
+              if (this.queryProject.TaskKey == 'fqlc'){
+                this.regulatoryCertificationTaskPlanList.forEach(val => {
+                  if (val.name == this.$t('initiatingProcess')) {
+                    val.status = '2'
+                  } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                    val.status = '3'
+                  } else {
+                    val.status = '3'
+                  }
+                })
+              }
+              if (this.queryProject.TaskKey == 'zrrqr' || this.queryProject.TaskKey == 'dezrrqr') {
+                this.regulatoryCertificationTaskPlanList.forEach(val => {
+                  if (val.name == this.$t('initiatingProcess')) {
+                    val.status = '1'
+                  } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                    val.status = '2'
+                  } else {
+                    val.status = '3'
+                  }
+                })
+              }
+              if (this.queryProject.TaskKey == 'zrrtjjfw' || this.queryProject.TaskKey == 'dezrrtjjfw') {
+                this.regulatoryCertificationTaskPlanList.forEach(val => {
+                  if (val.name == this.$t('initiatingProcess')) {
+                    val.status = '1'
+                  } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                    val.status = '1'
+                  } else if (val.name == this.$t('designComplianceReview')) {
+                    val.status = '2'
+                  } else {
+                    val.status = '3'
+                  }
+                })
+              }
+              if (this.queryProject.TaskKey == 'fggcssh') {
+                if (taskData.operatorResult == 'Adopt'){
+                  this.regulatoryCertificationTaskPlanList.forEach(val => {
+                    if (val.name == this.$t('initiatingProcess')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('designComplianceReview')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('designComplianceReviewAdmin')) {
+                      val.status = '1'
+                    } else {
+                      val.status = '1'
+                    }
+                  })
+                }else{
+                  this.regulatoryCertificationTaskPlanList.forEach(val => {
+                    if (val.name == this.$t('initiatingProcess')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('designComplianceReview')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('designComplianceReviewAdmin')) {
+                      val.status = '2'
+                    } else {
+                      val.status = '3'
+                    }
+                  })
+                }
+              }
+              this.regulatoryCertificationTaskPlanList = [...this.regulatoryCertificationTaskPlanList]
+            }
             this.loading = false
           } else {
             this.dataSource = []
@@ -204,14 +273,16 @@
     margin-top: 8px;
     position: relative;
     margin-bottom: 26px;
-    .process-content-top{
+
+    .process-content-top {
       display: flex;
       justify-content: space-between;
     }
+
     .process-content-content {
       background: #fff;
       z-index: 1000;
-      padding: 0;
+      padding: 0 10px;
 
       .process-content-left {
         float: left;
@@ -228,7 +299,8 @@
           line-height: 32px;
           text-align: center;
         }
-        .process-content-left-last{
+
+        .process-content-left-last {
           width: 32px;
           height: 32px;
           border-radius: 50%;
@@ -257,7 +329,13 @@
         }
       }
     }
+    .process-content-content:first-child {
+      padding: 0 10px 0 0;
+    }
 
+    .process-content-content:last-child {
+      padding: 0 0 0 10px;
+    }
     .process-content-right-xian {
       height: 2px;
       width: calc(100% - 27px);

jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue

@@ -1,212 +1,468 @@
 <template>
-  <a-drawer
-    :title="titlename == 1 ? this.$t('Taskresponsibilityrecognition'): this.$t('complianceConfirmation')"
-    :maskClosable="false"
-    :width="948"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 20px">
-      <div class="header-text">
-        {{$t('Listoftreatableregulations')}}
-      </div>
-      <a-table
-        :pagination="false"
-        :scroll="{x: '100%'}"
-        rowKey="id"
-        :columns="columns">
+  <div style="position: relative">
+    <a-drawer
+      :title="titleName"
+      :maskClosable="false"
+      :width="948"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
+      <div class="box">
+        <div class="header-text">
+          {{$t('Listoftreatableregulations')}}
+        </div>
+        <a-table
+          :pagination="false"
+          class="table"
+          :scroll="{x: '100%',y:300}"
+          :data-source="processableList"
+          rowKey="id"
+          :columns="columns">
 
-      </a-table>
-    </div>
-    <div style="margin-bottom: 20px">
-      <div class="header-text">
-        {{$t('Listofuntractableregulations')}}
+        </a-table>
       </div>
-      <a-table
-        :pagination="false"
-        :scroll="{x: '100%'}"
-        rowKey="id"
-        :columns="columns">
+      <div class="box box-two">
+        <div class="header-text">
+          {{$t('Listofuntractableregulations')}}
+        </div>
+        <a-table
+          :pagination="false"
+          class="table"
+          :scroll="{x: '100%',y:300}"
+          rowKey="id"
+          :data-source="noProcessableList"
+          :columns="noColumns">
+         <span slot="problemType" slot-scope="text">
+             <span class="problemTypeText">
+                  {{text}}
+             </span>
+         </span>
+        </a-table>
+      </div>
+      <div class="drawer-review">
+        <div class="header-text">
+          {{titleName == $t('Taskresponsibilityrecognition') ? this.$t('Taskconfirmationresult'):
+          this.$t('Compliancetaskhandling')}}
+        </div>
+        <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('resultofhandling')">{{$t('resultofhandling')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'disposeResult'">
+                <a-radio-group class="box-input"
+                               v-model="formInline.disposeResult">
+                  <a-radio value="Accepted" v-if="titleName == $t('Taskresponsibilityrecognition')">
+                    {{$t('accept')}}
+                  </a-radio>
+                  <a-radio value="Rejected" v-if="titleName == $t('Taskresponsibilityrecognition')">
+                    {{$t('refuse')}}
+                  </a-radio>
+                  <a-radio value="Compliance" v-if="titleName == $t('complianceConfirmation')">
+                    {{$t('accord')}}
+                  </a-radio>
+                  <a-radio value="Non-Compliance" v-if="titleName == $t('complianceConfirmation')">
+                    {{$t('nonConformity')}}
+                  </a-radio>
+                  <a-radio value="To be tracked" v-if="titleName == $t('complianceConfirmation')">
+                    {{$t('Tracked')}}
+                  </a-radio>
+                  <a-radio value="NA" v-if="titleName == $t('complianceConfirmation')">
+                    {{$t('notInvolved')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </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('feedbackMessage')">{{$t('feedbackMessage')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
+                            v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="titleName == $t('complianceConfirmation')">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('approvalFile')">
+                  {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                  formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="determineClick" type="primary">{{$t('determine')}}</a-button>
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile"
+                @uploadSuccess="uploadSuccess"/>
+  </div>
 
-      </a-table>
-    </div>
-    <div style="margin-bottom: 40px">
-      <div class="header-text">
-        {{titlename == 1 ? this.$t('Taskconfirmationresult'): this.$t('Compliancetaskhandling')}}
-      </div>
-      <div class="box-title-text">
-        <div class="title-text">
-          <span class="title-text-text" :title="$t('resultofhandling')">{{$t('resultofhandling')}}</span>
-        </div>
-        <a-form-model-item class="itemModel">
-          <a-radio-group>
-            <a-radio value="1">
-              {{$t('accept')}}
-            </a-radio>
-            <a-radio value="2">
-              {{$t('refuse')}}
-            </a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-      </div>
-      <div class="box-title-text">
-        <div class="title-text">
-          <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" v-if="titlename == 1 ? false:true">
-        <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">{{$t('uploadattachment')}}</a-button>
-        </a-form-model-item>
-      </div>
-    </div>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button type="primary">{{$t('determine')}}</a-button>
-    </div>
-</a-drawer>
 </template>
 
 <script>
-export default {
-  name:'confirmationDrawer',
-  props: {
-  },
-  data() {
-    return {
-      titlename:'',
-      allTitle: '',
-      visible:false,
-      columns:[
-        {
-          title: this.$t('project'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 170
-        },
-        {
-          title: this.$t('standard'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 170
-        },
-        {
-          title: this.$t('areaOfResponsibility'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 120
-        },
-        {
-          title: this.$t('taskType'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 150
-        },
-        {
-          title: this.$t('Categoryofdeliverables'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 120
-        },
-        {
-          title: this.$t('closingDate'),
-          align: 'left',
-          dataIndex: '',
-          ellipsis: true,
-          width: 170
-        },
-      ]
-    }
-  },
-  methods:{
-    confirmation(data){
-      this.visible = true
-      this.$nextTick(()=>{
-        this.titlename = data
-      })
+  import uploadFile from '@/components/uploadFile/file'
+  import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
 
+  export default {
+    name: 'confirmationDrawer',
+    components: {
+      uploadFile
     },
-    handleCancel(){
-      this.visible = false
-      this.titlename = ''
+    props: {},
+    data() {
+      return {
+        titleName: '',
+        allTitle: '',
+        visible: false,
+        columns: [
+          {
+            title: this.$t('project'),
+            align: 'left',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standard'),
+            align: 'left',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            dataIndex: '',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'left',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 150
+          },
+          {
+            title: this.$t('Categoryofdeliverables'),
+            align: 'left',
+            dataIndex: 'deliverableTypeName',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'left',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 120
+          }
+        ],
+        noColumns: [
+          {
+            title: this.$t('project'),
+            align: 'left',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standard'),
+            align: 'left',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            dataIndex: '',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'left',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 150
+          },
+          {
+            title: this.$t('problemType'),
+            align: 'left',
+            dataIndex: 'problemType',
+            ellipsis: true,
+            width: 240,
+            scopedSlots: { customRender: 'problemType' }
+          }
+        ],
+        processableList: [],
+        noProcessableList: [],
+        loading:false,
+        rules: {
+          disposeResult: [
+            {
+              required: true,
+              message: this.$t('reviewResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('feedbackMessage') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        formInline: {},
+        uploadName: ''
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      confirmation(data, name) {
+        this.visible = true
+        this.processableList = []
+        this.noProcessableList = []
+        this.formInline = {}
+        data.forEach(res => {
+          res = JSON.parse(res)
+          if (name == this.$t('Taskresponsibilityrecognition')) {
+            //任务责任确认
+            if (res.taskDefinitionKey == 'zrrqr' || res.taskDefinitionKey == 'dezrrqr') {
+              this.processableList.push(res)
+            } else {
+              if (res.flowType == '2' || res.flowType == '4') {
+                res.problemType = this.$t('taskNodeMismatch')
+              } else {
+                res.problemType = this.$t('taskTypeMismatch')
+              }
+              this.noProcessableList.push(res)
+            }
+          } else if (name == this.$t('complianceConfirmation')) {
+            //符合性确认
+            if (res.taskDefinitionKey == 'zrrtjjfw' || res.taskDefinitionKey == 'dezrrtjjfw') {
+              this.processableList.push(res)
+            } else {
+              if (res.flowType == '2' || res.flowType == '4') {
+                res.problemType = this.$t('taskNodeMismatch')
+              } else {
+                res.problemType = this.$t('taskTypeMismatch')
+              }
+              this.noProcessableList.push(res)
+            }
+          }
+        })
+        this.$nextTick(() => {
+          this.titleName = name
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      determineClick() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {
+              userid: this.userInfo().id,
+              taskId: this.queryData.taskId || this.queryData.taskIds,
+            }
+            postAction('/workFlow/completeTask', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.$emit('confirmationdrawerList')
+              } else {
+                this.loading = false
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.validateField([this.uploadName])
+        })
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.header-text {
-  font-size: 14px;
-  font-weight: bold;
-  height: 24px;
-  margin-bottom: 20px;
-}
+  .box {
+    margin-bottom: 20px;
+  }
 
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  /*align-items: center;*/
-}
+  .box-two {
+    margin-bottom: 438px;
+  }
 
-.title-text {
-  width: 88px;
-  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;
-  color: #000F16;
-}
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    height: 24px;
+  }
 
-.title-text-text {
-  margin-top: 9px;
-}
+  .table {
+    margin-top: 20px;
+  }
 
-.itemModel {
-  width: 100%;
-  display: inline-block;
-  margin-top: 2px;
-  margin-bottom: 12px;
-}
+  .drawer-review {
+    position: absolute;
+    bottom: 40px;
+    z-index: 1001;
+    height: 404px;
+    width: 100%;
+    padding: 24px;
+    border-top: 1px solid #e8e8e8;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 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-top: 10px;
+  }
 
-/*.button-text {*/
-/*  height: 38px;*/
-/*  width: calc(100% - 250px);*/
-/*  line-height: 38px;*/
-/*  background: #fff;*/
-/*  border: 1px #00B3BE solid;*/
-/*  color: #00B3BE;*/
-/*}*/
+  .box-title-text {
+    /*line-height: 1.4;*/
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    /*width: 88px;*/
+    text-align: left;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 32px;
+    line-height: 36px;
+    color: #000F16;
+  }
+
+  .title-text-fq {
+    /*width: 130px;*/
+    text-align: left;
+    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;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: 100%;
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 0px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 1002;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(50% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .problemTypeText {
+    color: red;
+  }
 </style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -7,7 +7,7 @@
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="id"
+      :rowKey="(record)=>JSON.stringify(record)"
       :data-source="dataSource"
       :columns="columns"
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -46,6 +46,8 @@
       />
     </div>
     <designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/>
+    <confirmation-drawer ref="confirmationdrawer"
+                         @confirmationdrawerList="confirmationdrawerList"></confirmation-drawer>
   </div>
 </template>
 
@@ -194,13 +196,25 @@
       this.getList()
     },
     methods: {
+      getData(name) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.confirmationdrawer.confirmation(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
       onSelectChange(value) {
         this.selectedRowKeys = value
-        console.log(this.selectedRowKeys)
       },
-      designComplianceList(){
+      designComplianceList() {
         this.getList()
       },
+
+      confirmationdrawerList() {
+        this.selectedRowKeys = []
+        this.getList()
+      },
+
       RelatedItemsClick(item) {
         let newUrl = this.$router.resolve({
           path: '/ProjectDetails',
@@ -318,7 +332,7 @@
             flowType: 3,
             isDisplay: true,
             id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'prehomoDutyName',
             typeOfDeliverables: 'prehomoDeliverableTypeName',
             deliverableTemplate: 'prehomoDeliverableTemplate',

jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue

@@ -26,15 +26,16 @@
         :url="url"
         :standardContentQuery="queryProject"
       />
-     <div style="margin-bottom: 436px">
-       <circulationHistory
-         :title="$t('Processhistory')"
-         :queryProject="queryData"
-       />
-     </div>
+      <div :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}">
+        <circulationHistory
+          v-if="isDisplay"
+          :title="$t('Processhistory')"
+          :queryProject="queryData"
+        />
+      </div>
 
 
-      <div class="drawer-review">
+      <div class="drawer-review" v-if="this.queryData.isDisplay">
         <reviewedByThePersonInCharge
           v-if="isDisplay"
           ref="reviewedByThePersonInChargeRef"
@@ -130,6 +131,9 @@
         return true
       },
       isConfirm() {
+        if (!this.queryData.isDisplay) {
+          return false
+        }
         return true
       }
     },
@@ -146,6 +150,8 @@
         })
       },
       completeTask(value) {
+        this.textLoading = this.$t('Submitting')
+        this.loading = true
         let json = Object.assign(this.queryBy, value)
         let data = JSON.stringify(json).replace(/\"/g, '\'')
         Object.keys(value).forEach(res => {
@@ -163,6 +169,7 @@
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.visible = false
+            this.loading = false
             this.$emit('designComplianceList')
           } else {
             this.loading = false
@@ -172,6 +179,7 @@
       },
       getList(row, title) {
         this.queryData = row
+        this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay)
         this.loading = true
         this.visible = true
         this.title = title
@@ -289,4 +297,12 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
+
+  .circulationHistory {
+    margin-bottom: 436px;
+  }
+
+  .circulationHistoryOne {
+    margin-bottom: 30px;
+  }
 </style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -42,15 +42,19 @@
         @showSizeChange="SizeChange"
       />
     </div>
+    <designCompliance ref="designComplianceRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-
+  import designCompliance from './designCompliance'
   export default {
     name: 'doneList',
+    components:{
+      designCompliance
+    },
     mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
@@ -84,6 +88,13 @@
             ellipsis: true,
             width: 170
           },
+          {
+            title: this.$t('Tasknode'),
+            align: 'left',
+            dataIndex: 'taskDefinitionKeyName',
+            ellipsis: true,
+            width: 170
+          },
           {
             title: this.$t('Sponsor'),
             align: 'left',
@@ -91,13 +102,13 @@
             ellipsis: true,
             width: 170
           },
-          {
-            title: this.$t('CurrentProcessor'),
-            align: 'left',
-            dataIndex: 'assigneeName',
-            ellipsis: true,
-            width: 170
-          },
+          // {
+          //   title: this.$t('CurrentProcessor'),
+          //   align: 'left',
+          //   dataIndex: 'assigneeName',
+          //   ellipsis: true,
+          //   width: 170
+          // },
           {
             title: this.$t('TaskCutOffTime'),
             align: 'left',
@@ -105,13 +116,13 @@
             ellipsis: true,
             width: 170
           },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
+          // {
+          //   title: this.$t('taskStatus'),
+          //   align: 'left',
+          //   dataIndex: 'statusShow',
+          //   ellipsis: true,
+          //   width: 170
+          // },
           {
             title: this.$t('operation'),
             align: 'left',
@@ -209,7 +220,7 @@
             TaskKey: row.taskDefinitionKey,
             isDisplay: false,
             flowType: 2,
-            Sponsor: 'designInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'designDutyName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
@@ -221,11 +232,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
         }else if(row.flowType == '3'){
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -243,7 +250,7 @@
             flowType: 3,
             isDisplay: false,
             id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'prehomoDutyName',
             typeOfDeliverables: 'prehomoDeliverableTypeName',
             deliverableTemplate: 'prehomoDeliverableTemplate',
@@ -277,7 +284,7 @@
             TaskKey: row.taskDefinitionKey,
             flowType: 4,
             isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'verifyDutyName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -100,7 +100,6 @@
         <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
       </a-tab-pane>
     </a-tabs>
-    <confirmation-drawer ref="confirmationdrawer"></confirmation-drawer>
   </a-card>
 </template>
 
@@ -109,78 +108,74 @@
   import dealtWith from './components/dealtWith'
   import doneList from './components/doneList'
   import SentList from './components/SentList'
-  import confirmationDrawer from './components/confirmationDrawer'
 
   export default {
     name: 'index',
     components: {
       dealtWith,
       doneList,
-      SentList,
-      confirmationDrawer
+      SentList
     },
     data() {
       return {
         title: '',
         queryParam: {
-          projectName:this.$route.query.projectName?this.$route.query.projectName:''
+          projectName: this.$route.query.projectName ? this.$route.query.projectName : ''
         },
         toggleSearchStatus: false,
         taskTypeList: [
           {
-            name:this.$t('confirmationOfRegulationsList'),
-            value:'10',
+            name: this.$t('confirmationOfRegulationsList'),
+            value: '10'
           },
           {
-            name:this.$t('listTaskConfirmation'),
-            value:'1',
+            name: this.$t('listTaskConfirmation'),
+            value: '1'
           },
           {
-            name:this.$t('designComplianceReview'),
-            value:'2',
+            name: this.$t('designComplianceReview'),
+            value: '2'
           },
           {
-            name:this.$t('preHomeConfirmation'),
-            value:'3',
+            name: this.$t('preHomeConfirmation'),
+            value: '3'
           },
           {
-            name:this.$t('verificationComplianceReview'),
-            value:'4',
-          },
+            name: this.$t('verificationComplianceReview'),
+            value: '4'
+          }
         ],
         taskStatusList: [
           {
-            name:this.$t('listToConfirm'),
-            value:'List to confirm',
+            name: this.$t('listToConfirm'),
+            value: 'List to confirm'
           },
           {
-            name:this.$t('Finished'),
-            value:'Completed',
+            name: this.$t('Finished'),
+            value: 'Completed'
           },
           {
-            name:this.$t('inquiry'),
-            value:'Inquiry',
+            name: this.$t('inquiry'),
+            value: 'Inquiry'
           },
           {
-            name:this.$t('toSubmit'),
-            value:'To submit',
+            name: this.$t('toSubmit'),
+            value: 'To submit'
           },
           {
-            name:this.$t('toAudit'),
-            value:'To audit',
-          },
+            name: this.$t('toAudit'),
+            value: 'To audit'
+          }
         ],
         tabActive: this.$t('toDoProcess')
       }
     },
     methods: {
       TaskresponsibilityrecognitionClick() {
-        this.$refs.confirmationdrawer.confirmation(1)
-        // this.title = this.$t('Taskresponsibilityrecognition')
+        this.$refs.dealtWithRef.getData(this.$t('Taskresponsibilityrecognition'))
       },
       complianceConfirmationClick() {
-        this.$refs.confirmationdrawer.confirmation(2)
-        // this.title = this.$t('complianceConfirmation')
+        this.$refs.dealtWithRef.getData(this.$t('complianceConfirmation'))
       },
       callback(value) {
         this.tabActive = value
@@ -190,11 +185,11 @@
       },
       searchQuery() {
         if (this.tabActive == this.$t('toDoProcess')) {
-          this.$refs.dealtWithRef.searchQuery(this.queryParam )
+          this.$refs.dealtWithRef.searchQuery(this.queryParam)
         } else if (this.tabActive == this.$t('processDone')) {
-          this.$refs.doneListRef.searchQuery(this.queryParam )
+          this.$refs.doneListRef.searchQuery(this.queryParam)
         } else if (this.tabActive == this.$t('sentProcess')) {
-          this.$refs.SentListRef.searchQuery(this.queryParam )
+          this.$refs.SentListRef.searchQuery(this.queryParam)
         }
       },
       searchReset() {
@@ -206,7 +201,7 @@
         } else if (this.tabActive == this.$t('sentProcess')) {
           this.$refs.SentListRef.searchReset()
         }
-      },
+      }
       // taskConfirmationHandlingClick() {
       //   this.$router.push({
       //     path: '/toDoTaskConfirmation'