diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 65c93d40b..23869551a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -578,6 +578,7 @@ module.exports = { modifyNode: 'Modify Node', deleteNode: 'Delete Node', ImplementationDate: 'New Type Execution Date', + ImplementationDateOne: 'New Type Execution Date', vehicleInProductionDate: 'New Vehicle Execution Date', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', leastTwo: 'Please Select at Least two pieces of data', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 027eb8a72..ff7ca4844 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -585,6 +585,7 @@ module.exports = { modifyNode: '修改节点', deleteNode: '删除节点', ImplementationDate: '新车型实施日期', + ImplementationDateOne:'新车型实施日期', vehicleInProductionDate: '在产车实施日期', deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？', leastTwo: '请选择至少两条数据', diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 0fea84383..06d7311a2 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -295,22 +295,22 @@  {{$t('confirmationOfDesignConformity')}} - -
-
- {{$t('Sponsor')}} -
- - - -
- + + + + + + + + + + + + + + + +
@@ -327,8 +327,6 @@
- -
@@ -356,6 +354,8 @@
+ +
@@ -389,125 +389,125 @@
-
-  {{$t('PrehomoConfirmation')}} -
- - -
-
- {{$t('Sponsor')}} -
- - - -
- - -
-
- {{$t('personLiable')}} -
- - - -
- - - - -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - - -
- - -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' - || - formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - - - -
-
- {{$t('descriptionDeliverables')}} -
- - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{$t('verificationAndConformityconfirmation')}}
- -
-
- {{$t('Sponsor')}} -
- - - -
- + + + + + + + + + + + + + + + +
@@ -524,8 +524,6 @@
- -
@@ -553,6 +551,9 @@
+ + +
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 838e20155..624da74c4 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -114,16 +114,17 @@ - -
+ +
- +
+ class="operator-text"> {{$t('templateDownload')}}
@@ -135,47 +136,52 @@ {{$t('export')}}
- +
+ class="operator-text"> {{$t('copy')}}
- +
+ class="operator-text"> {{$t('batSetting')}}
- +
+ class="operator-text"> {{$t('Transfer')}}
- +
+ class="operator-text"> {{$t('add')}}
- +
+ class="operator-text"> {{$t('BatchDelete')}}
- + @@ -238,37 +246,37 @@ {{record.designDeliverableTypeName}}
- - - - - - - + + + + + + + -- {{record.prehomoDeliverableTypeName}}
- - - - - - - + + + + + + + -- {{record.verifyDeliverableTypeName}}
- - - - - - - + + + + + + + -- @@ -332,7 +340,7 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import { Base64 } from 'js-base64' import { mapGetters } from 'vuex' - import { ResizeHeader,ResizeColumnProvide } from '@/mixins/header' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'virtualListDetails', @@ -346,7 +354,7 @@ batSetting, globalAdvancedQuery }, - mixins: [ResizeColumnProvide,ResizeHeader], + mixins: [ResizeColumnProvide, ResizeHeader], data() { return { title: '维护虚拟清单', @@ -400,7 +408,7 @@ dataIndex: 'serialNumber', width: 180, fixed: 'left', - sorter:true, + sorter: true, scopedSlots: { customRender: 'standard' } }, { @@ -418,27 +426,6 @@ 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', @@ -488,7 +475,7 @@ align: 'left', dataIndex: 'attestationRank_dictText', width: 180, - sorter:true, + sorter: true, ellipsis: true }, { @@ -503,14 +490,14 @@ align: 'left', dataIndex: 'wvtaId', width: 180, - sorter:true, + sorter: true, ellipsis: true }, { title: this.$t('areaOfResponsibility'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'dutyTerritory_dictText', width: 180 }, @@ -518,7 +505,7 @@ title: this.$t('regulatoryEngineer'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'regulationOwnerName', width: 180 }, @@ -526,7 +513,7 @@ title: this.$t('certifiedEngineer'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'homologationEngineerName', width: 180 }, @@ -534,7 +521,7 @@ title: this.$t('engineeringInterfacePerson'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'engineeringInterfacePersonName', width: 180 }, @@ -556,27 +543,27 @@ ellipsis: true, scopedSlots: { customRender: 'designDeliverableTemplateName' } }, - { - title: this.$t('Sponsor'), - dataIndex: 'designInitiatorName', - align: 'left', - width: 180, - ellipsis: true - }, + // { + // title: this.$t('Sponsor'), + // dataIndex: 'designInitiatorName', + // align: 'left', + // width: 180, + // ellipsis: true + // }, { title: this.$t('personLiable'), - dataIndex: 'designDutyName', + dataIndex: 'designDuty_dictText', align: 'left', width: 180, ellipsis: true }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'designDueDate', - align: 'left', - ellipsis: true, - width: 140 - }, + // { + // title: this.$t('TaskCutOffTime'), + // dataIndex: 'designDueDate', + // align: 'left', + // ellipsis: true, + // width: 140 + // }, { title: this.$t('descriptionDeliverables'), dataIndex: 'designRemark', @@ -586,47 +573,6 @@ } ] }, - { - 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: [ @@ -638,27 +584,20 @@ ellipsis: true, scopedSlots: { customRender: 'verifyDeliverableTemplateName' } }, - { - title: this.$t('Sponsor'), - dataIndex: 'verifyInitiatorName', - align: 'left', - width: 180, - ellipsis: true - }, { title: this.$t('personLiable'), - dataIndex: 'verifyDutyName', + dataIndex: 'verifyDuty_dictText', align: 'left', width: 180, ellipsis: true }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'verifyDueDate', - align: 'left', - ellipsis: true, - width: 140 - }, + // { + // title: this.$t('TaskCutOffTime'), + // dataIndex: 'verifyDueDate', + // align: 'left', + // ellipsis: true, + // width: 140 + // }, { title: this.$t('descriptionDeliverables'), dataIndex: 'verifyRemark', @@ -674,595 +613,245 @@ fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } - }, + } ], columnsAll: [], - // columnsAll: [ - // { - // title: this.$t('standard'), - // align: 'left', - // dataIndex: 'serialNumber', - // width: 180, - // sorter:true, - // fixed: 'left', - // scopedSlots: { customRender: 'standard' } - // }, - // { - // title: this.$t('title'), - // align: 'left', - // dataIndex: 'title', - // width: 180, - // fixed: 'left', - // scopedSlots: { customRender: 'titleName' } - // }, - // { - // title: this.$t('subtitle'), - // align: 'left', - // dataIndex: 'subtitle', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('zoneOfApplication'), - // align: 'left', - // width: 150, - // ellipsis: true, - // dataIndex: 'region_dictText' - // }, - // { - // title: this.$t('scopeOfApplication'), - // align: 'left', - // width: 180, - // ellipsis: true, - // sorter:true, - // dataIndex: 'shi4Yong4Fan4Wei2_dictText' - // }, - // { - // title: this.$t('status'), - // align: 'left', - // width: 100, - // ellipsis: true, - // sorter:true, - // dataIndex: 'state_dictText' - // }, - // { - // title: this.$t('correspondingStandard'), - // align: 'left', - // width: 140, - // ellipsis: true, - // dataIndex: 'correspondingStandard' - // }, - // { - // title: this.$t('implementationCategory'), - // align: 'left', - // width: 140, - // ellipsis: true, - // dataIndex: 'implementType_dictText' - // }, - // { - // title: this.$t('ImplementationDate'), - // align: 'left', - // width: 200, - // ellipsis: true, - // sorter:true, - // dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' - // }, - // { - // title: this.$t('vehicleInProductionDate'), - // align: 'left', - // width: 210, - // ellipsis: true, - // sorter:true, - // dataIndex: 'implementTime' - // }, - // { - // title: 'WVTA ID', - // align: 'left', - // dataIndex: 'wvtaId', - // width: 180, - // sorter:true, - // ellipsis: true - // }, - // { - // title: this.$t('certificationType'), - // align: 'left', - // width: 180, - // ellipsis: true, - // dataIndex: 'attestationType_dictText' - // }, - // { - // title: this.$t('certificationLevel'), - // align: 'left', - // width: 200, - // ellipsis: true, - // sorter:true, - // dataIndex: 'attestationRank_dictText' - // }, - // { - // title: this.$t('applicableSupplement'), - // align: 'left', - // width: 200, - // ellipsis: true, - // dataIndex: 'applicableSupplement' - // }, - // { - // title: this.$t('technicalField'), - // align: 'left', - // width: 180, - // ellipsis: true, - // dataIndex: 'technologyTerritoryName' - // }, - // { - // title: this.$t('areaOfResponsibility'), - // align: 'left', - // width: 180, - // ellipsis: true, - // sorter:true, - // dataIndex: 'dutyTerritory_dictText' - // }, - // { - // title: this.$t('remarks'), - // align: 'left', - // dataIndex: 'remark', - // width: 180, - // ellipsis: true - // }, - // - // { - // title: this.$t('confirmationOfDesignConformity'), - // children: [ - // { - // // TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理 - // title: this.$t('Deliverables'), - // dataIndex: 'designDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'designDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'designInitiator_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'designDuty_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'designRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('PrehomoConfirmation'), - // children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'prehomoDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'prehomoInitiator_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'prehomoDuty_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'prehomoRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('verificationAndConformityconfirmation'), - // children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'verifyDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'verifyDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'verifyInitiator_dictText', - // width: 180, - // align: 'left', - // ellipsis: true - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'verifyDuty_dictText', - // width: 180, - // align: 'left', - // ellipsis: true - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'verifyRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('operation'), - // align: 'left', - // fixed: 'right', - // width: 140, - // scopedSlots: { customRender: 'operation' } - // } - // ], confirmLoading: false, indeterminate: false, customizevisible: false, checkAll: false, - disabled:false, - checkedList: ['serialNumber','title','operation'], - selectedValue:[], + disabled: false, + checkedList: ['serialNumber', 'title', 'operation'], + selectedValue: [], customizeList: [ { sort: '1', name: this.$t('standard'), - disabled:true, - headFieldCn:'编号', - headFieldEn:'Number', + disabled: true, + headFieldCn: '编号', + headFieldEn: 'Number', field: 'serialNumber', key: 1, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:1, + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 1 }, { sort: '2', - disabled:true, + disabled: true, name: this.$t('title'), - headFieldCn:'标题', - headFieldEn:'title', + headFieldCn: '标题', + headFieldEn: 'title', field: 'title', key: 2, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:2, + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 2 }, { sort: '', name: this.$t('subtitle'), - headFieldCn:'子标题', - headFieldEn:'Sub-title', + headFieldCn: '子标题', + headFieldEn: 'Sub-title', field: 'subtitle', key: 3, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('listConfirmationStatus'), - headFieldCn:'清单确认状态', - headFieldEn:'List Confirmation Status', - field: 'inventoryAffirmStatusName', - key: 4, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('taskAffirmStatus'), - headFieldCn:'任务确认状态', - headFieldEn:'Task Confirmation Status', - field: 'taskAffirmStatusName', - key: 5, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('zoneOfApplication'), - headFieldCn:'适用地区', - headFieldEn:'Area', + headFieldCn: '适用地区', + headFieldEn: 'Area', field: 'region_dictText', key: 6, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('correspondingStandard'), - headFieldCn:'对应标准', - headFieldEn:'Compare EU/CN', + headFieldCn: '对应标准', + headFieldEn: 'Compare EU/CN', field: 'correspondingStandard', key: 7, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('implementationCategory'), - headFieldCn:'实施类别', - headFieldEn:'Usage', + headFieldCn: '实施类别', + headFieldEn: 'Usage', field: 'implementType_dictText', key: 8, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', - name: this.$t('ImplementationDate'), - headFieldCn:'标准实施日期', - headFieldEn:'New Type Execution Date', + name: this.$t('ImplementationDateOne'), + headFieldCn: '新车型实施日期', + headFieldEn: 'New Type Execution Date', field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String', key: 9, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('vehicleInProductionDate'), - headFieldCn:'在产车实施日期', - headFieldEn:'New Vehicle Execution Date', + headFieldCn: '在产车实施日期', + headFieldEn: 'New Vehicle Execution Date', field: 'implementTimeString', key: 10, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certificationType'), - headFieldCn:'认证类型', - headFieldEn:'Certification Type', + headFieldCn: '认证类型', + headFieldEn: 'Certification Type', field: 'attestationType_dictText', key: 11, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certificationLevel'), - headFieldCn:'认证级别', - headFieldEn:'Certification Level', + headFieldCn: '认证级别', + headFieldEn: 'Certification Level', field: 'attestationRank_dictText', key: 12, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('applicableSupplement'), - headFieldCn:'适用增补件', - headFieldEn:'Applicable Supplement', + headFieldCn: '适用增补件', + headFieldEn: 'Applicable Supplement', field: 'applicableSupplement', key: 13, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: 'WVTA ID', - headFieldCn:'WVTA ID', - headFieldEn:'WVTA ID', + headFieldCn: 'WVTA ID', + headFieldEn: 'WVTA ID', field: 'wvtaId', key: 14, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('areaOfResponsibility'), - headFieldCn:'责任领域', - headFieldEn:'Responsible Field', + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', field: 'dutyTerritory_dictText', key: 15, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('regulatoryEngineer'), - headFieldCn:'法规工程师', - headFieldEn:'Regulation Engineer', + headFieldCn: '法规工程师', + headFieldEn: 'Regulation Engineer', field: 'regulationOwnerName', key: 16, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certifiedEngineer'), - headFieldCn:'认证工程师', - headFieldEn:'Homo Engineer', + headFieldCn: '认证工程师', + headFieldEn: 'Homo Engineer', field: 'homologationEngineerName', key: 17, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('engineeringInterfacePerson'), - headFieldCn:'工程接口人', - headFieldEn:'Eng. Interface', + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', field: 'engineeringInterfacePersonName', key: 18, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('remarks'), - headFieldCn:'备注', - headFieldEn:'Comments', + headFieldCn: '备注', + headFieldEn: 'Comments', field: 'remark', key: 19, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', + headFieldCn: '交付物', + headFieldEn: 'Deliverables', field: 'designDeliverableTemplateName', - affirmFlag:'1', + affirmFlag: '1', key: 20, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'designInitiatorName', - affirmFlag:'1', - key: 21, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', + headFieldCn: '责任人', + headFieldEn: 'Assignee', field: 'designDutyName', - affirmFlag:'1', + affirmFlag: '1', key: 22, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'designDueDate', - affirmFlag:'1', - key: 23, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', + headFieldCn: '交付物说明', + headFieldEn: 'Instruction', field: 'designRemark', - affirmFlag:'1', + affirmFlag: '1', key: 24, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', - field: 'prehomoDeliverableTemplateName', - affirmFlag:'2', - key: 25, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'prehomoInitiatorName', - affirmFlag:'2', - key:26, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', - field: 'prehomoDutyName', - affirmFlag:'2', - key: 27, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'prehomoDueDate', - affirmFlag:'2', - key: 28, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', - field: 'prehomoRemark', - affirmFlag:'2', - key: 29, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', + headFieldCn: '交付物', + headFieldEn: 'Deliverables', field: 'verifyDeliverableTemplateName', - affirmFlag:'3', + affirmFlag: '3', key: 30, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'verifyInitiatorName', - affirmFlag:'3', - key: 31, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', + headFieldCn: '责任人', + headFieldEn: 'Assignee', field: 'verifyDutyName', - affirmFlag:'3', + affirmFlag: '3', key: 32, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'verifyDueDate', - affirmFlag:'3', - key: 33, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', + headFieldCn: '交付物说明', + headFieldEn: 'Instruction', field: 'verifyRemark', - affirmFlag:'3', + affirmFlag: '3', key: 34, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', - disabled:true, + disabled: true, name: this.$t('operation'), - headFieldCn:'操作', - headFieldEn:'Operation', + headFieldCn: '操作', + headFieldEn: 'Operation', key: 35, - field:'operation', - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:2, - }, + field: 'operation', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 2 + } ], selectedRowKeys: [], isTrue: false, @@ -1359,7 +948,7 @@ } } this.isTruee = false - this.$nextTick(()=>{ + this.$nextTick(() => { this.isTruee = true }) return columnResult @@ -1367,7 +956,7 @@ }, methods: { ...mapGetters(['userInfo']), - sVisible(){ + sVisible() { this.getDataAdmin() }, handleSuperQuery(params, matchType) { @@ -1401,13 +990,13 @@ }, //调取 transferClick() { - this.$refs.transferListRef.transferModel() + this.$refs.transferListRef.transferModel() }, - getDataAdmin(){ + getDataAdmin() { this.isTrue = false - setTimeout(()=>{ + setTimeout(() => { this.isTrue = true - },100) + }, 100) }, //导出 handleExport() { @@ -1452,28 +1041,28 @@ editModelList() { this.getList() }, - transferListForm(id){ + transferListForm(id) { this.$refs.transferListvirtalRef.transferModel(id) }, - transferListFormHomo(){ + transferListFormHomo() { this.$refs.transferListRef.handleCancel() this.getList() }, tableOnChange(pagination, filters, sorter) { this.orderBy = sorter.order == 'ascend' ? '1' : '2' - if(sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText'){ + if (sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText') { this.orderByField = 'shi4Yong4Fan4Wei2' - } else if(sorter.columnKey == 'state_dictText') { + } else if (sorter.columnKey == 'state_dictText') { this.orderByField = 'state' - } else if(sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') { + } else if (sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') { this.orderByField = 'xin1_che1_xing2_shi2_shi1_ri4_qi1' - } else if(sorter.columnKey == 'implementTime') { + } else if (sorter.columnKey == 'implementTime') { this.orderByField = 'implement_time' - } else if(sorter.columnKey == 'dutyTerritory_dictText') { + } else if (sorter.columnKey == 'dutyTerritory_dictText') { this.orderByField = 'dutyTerritory' - } else if(sorter.columnKey == 'attestationRank_dictText') { + } else if (sorter.columnKey == 'attestationRank_dictText') { this.orderByField = 'attestationRank' - } else{ + } else { this.orderByField = sorter.columnKey } this.getList() @@ -1481,70 +1070,62 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, - getHeader(){ + getHeader() { getAction('head/headCustomEO/list', { moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }).then((res) => { if (res.success) { - console.log(res.result) - if(res.result.length != 0){ - this.columnsAll = res.result - }else{ - this.columnsAll = this.column - } - this.columnsAll.forEach((item,index) => { - if(item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认'){ - item.width = 180 - item.align = 'left' - if(item.title == '操作'){ - item.scopedSlots = { - customRender: 'operation' + this.columnsAll = res.result + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } } - item.fixed = 'right' - }else if(item.title == '编号'){ - item.sorter = true - item.fixed = 'left' - item.scopedSlots = { - customRender: 'standard' + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } } - }else if(item.title == '标题'){ - item.fixed = 'left' - item.scopedSlots = { - customRender: 'titleName' - } - }else if(item.title == '在产车实施日期'){ - item.scopedSlots = { - customRender: 'titleName' - } - }else if(item.title == '标准实施日期'){ - item.scopedSlots = { - customRender: 'titleName' + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] } } - else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' || - item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人'){ - item.sorter = true - } - }else { - delete item.dataIndex - delete item.fixed - item.children.forEach((val,index) => { - val.width = 180 - val.align = 'left' - val.ellipsis = true - }) } - }) + } this.columnsAll.forEach((item) => { - if(item.children){ + if (item.children) { item.children.forEach((val) => { - this.checkedList.push(item.dataIndex,val.dataIndex) + this.checkedList.push(item.dataIndex, val.dataIndex) }) - }else { + } else { this.checkedList.push(item.dataIndex) } }) - console.log(this.checkedList) + this.columnsAll.push({ + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 160, + scopedSlots: { customRender: 'operation' } + }) + this.loading = false this.JLoading = false } else { @@ -1554,10 +1135,10 @@ }) }, getList() { - if(this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array){ + if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) { this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',') } - if(this.queryParam.implementTimeString && this.queryParam.implementTimeString instanceof Array){ + if (this.queryParam.implementTimeString && this.queryParam.implementTimeString instanceof Array) { this.queryParam.implementTimeString = this.queryParam.implementTimeString.join(',') } let query = { @@ -1601,43 +1182,44 @@ }) }, onCheckAllChange(e) { - this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; + let selectedValue = ['serialNumber', 'title', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue this.selectedValue = this.checkedList this.indeterminate = false }, - onChange(){ + onChange() { this.selectedValue = this.checkedList }, - onChangedatet(values){ + onChangedatet(values) { let StartTime = values[0].format('YYYY-MM-DD') let EndTime = values[1].format('YYYY-MM-DD') let array = [] - array.push(StartTime,EndTime) + array.push(StartTime, EndTime) console.log(array) this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = array }, - onChangedate(values){ + onChangedate(values) { let StartTime = values[0].format('YYYY-MM-DD') let EndTime = values[1].format('YYYY-MM-DD') let array = [] - array.push(StartTime,EndTime) + array.push(StartTime, EndTime) console.log(array) this.queryParam.implementTimeString = array }, - getcustomize(){ + getcustomize() { this.customizevisible = true }, - cancel(){ + cancel() { this.customizevisible = false }, - handleSubmit(){ + handleSubmit() { let list = [] let uniqueArray = this.selectedValue.filter((item, index, array) => { return array.indexOf(item) === index }) uniqueArray.forEach(item => { - this.customizeList.forEach((val,index) => { - if(item == val.field){ + this.customizeList.forEach((val, index) => { + if (item == val.field) { val.sort = index + 1 list.push(val) } @@ -1645,8 +1227,8 @@ }) this.confirmLoading = true let headCustomEOList = JSON.parse(JSON.stringify(list)) - let query ={ - headCustomEOList :headCustomEOList + let query = { + headCustomEOList: headCustomEOList } postAction('head/headCustomEO/add', query).then((res) => { if (res.success) { @@ -1739,7 +1321,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { @@ -1759,7 +1341,7 @@ } 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'){ + } 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 { @@ -1803,7 +1385,7 @@