WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2023-04-23 17:15:47 +08:00
parent b009ae1097 a91aee26cb
commit 7981f019fb
43 changed files with 112 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1800,4 +1800,5 @@ module.exports = {
responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance',
verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
designaconformancedeliverabletype:'Design a conformance deliverable type',
reasonForReturnOfCompliance:'Reason for compliance return',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1902,4 +1902,5 @@ module.exports = {
responsiblepersonforverifyingcompliance:'验证符合性责任人',
verifytheconformancedeliverabletype:'验证符合性交付物类型',
designaconformancedeliverabletype:'设计符合性交付物类型',
reasonForReturnOfCompliance: '符合性退回原因',
}
jero-web/src/components/ParameterLibraryAdd/index.vue
+1 -1
View File
@@ -112,7 +112,7 @@
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory_dictText',
align: 'left',
width: 200,
width: 100,
ellipsis: true
}
],
jero-web/src/components/SplitTable/index.vue
+1 -1
View File
@@ -36,7 +36,7 @@
</span>
<span slot="detailText" slot-scope="text,record">
<span class="text" :title="text">
{{text && text.length > 18?text.slice(0,17)+'...':text}}
{{text && text.length > 25?text.slice(0,24)+'...':text}}
</span>
</span>
<span slot="detail" slot-scope="text,record">
jero-web/src/components/libraryAddForm/index.vue
+1 -1
View File
@@ -557,7 +557,7 @@
dataIndex: 'implementationDate',
align: 'left',
ellipsis: true,
width: 150,
width: 190,
scopedSlots: { title: 'implementationDateTwo' }
},
{
jero-web/src/components/tableCollection/index.vue
+9
View File
@@ -829,6 +829,15 @@
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.db_field_name == 'dutyTerritory') {
this.columns[index].width = 120
}
if (res.db_field_name == 'sdt') {
this.columns[index].width = 130
}
if (res.db_field_name == 'dre') {
this.columns[index].width = 120
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
jero-web/src/components/tableCollection/index1.vue
+9
View File
@@ -710,6 +710,15 @@
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.db_field_name == 'dutyTerritory') {
this.columns[index].width = 120
}
if (res.db_field_name == 'sdt') {
this.columns[index].width = 130
}
if (res.db_field_name == 'dre') {
this.columns[index].width = 120
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+1 -1
View File
@@ -240,7 +240,7 @@
title: this.$t('correspondingStandard'),
align: 'left',
ellipsis: true,
width: 170,
width: 150,
dataIndex: 'corresponding_standard'
}
]
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+4 -4
View File
@@ -203,14 +203,14 @@
{
title: this.$t('ProcessStatus'),
align: 'left',
width: 140,
width: 100,
ellipsis: true,
dataIndex: 'gatherResultShow'
},
{
title: this.$t('Sponsor'),
align: 'left',
width: 140,
width: 110,
ellipsis: true,
dataIndex: 'createBy'
},
@@ -218,7 +218,7 @@
title: this.$t('brand'),
align: 'left',
ellipsis: true,
width: 140,
width: 120,
dataIndex: 'brand_text'
},
{
@@ -239,7 +239,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 210,
width: 150,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+2 -2
View File
@@ -138,14 +138,14 @@
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true,
width: 228
width: 190
}
],
dataList: [],
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+5 -5
View File
@@ -129,21 +129,21 @@
title: this.$t('monthlyLanguage'),
align: 'left',
dataIndex: 'language',
width: 195,
width: 120,
ellipsis: true,
scopedSlots: { customRender: 'language' }
},
{
title: this.$t('releaseStatus'),
align: 'left',
width: 175,
width: 100,
ellipsis: true,
dataIndex: 'issueStatus_dictText'
},
{
title: this.$t('uploadTime'),
align: 'left',
width: 305,
width: 180,
ellipsis: true,
dataIndex: 'createTime'
},
@@ -151,14 +151,14 @@
title: this.$t('uploadedBy'),
align: 'left',
ellipsis: true,
width: 170,
width: 120,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 240,
width: 180,
scopedSlots: { customRender: 'operation' }
}
]
jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+2 -2
View File
@@ -153,14 +153,14 @@
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true,
width: 228
width: 190
}
// {
// title: this.$t('correspondingStandard'),
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+1 -1
View File
@@ -369,7 +369,7 @@
title: this.$t('correspondingStandard'),
align: 'left',
ellipsis: true,
width: 170,
width: 150,
dataIndex: 'corresponding_standard'
},
{
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+5 -5
View File
@@ -272,14 +272,14 @@
{
title: this.$t('ProcessStatus'),
align: 'left',
width: 170,
width: 100,
ellipsis: true,
dataIndex: 'flowStatusName'
},
{
title: this.$t('Sponsor'),
align: 'left',
width: 140,
width: 110,
ellipsis: true,
dataIndex: 'createBy'
},
@@ -287,21 +287,21 @@
title: this.$t('brand'),
align: 'left',
ellipsis: true,
width: 140,
width: 120,
dataIndex: 'brand_text'
},
{
title: this.$t('dateOfInitiation'),
align: 'left',
ellipsis: true,
width: 170,
width: 130,
dataIndex: 'startTime'
},
{
title: this.$t('closingDate'),
align: 'left',
ellipsis: true,
width: 170,
width: 130,
dataIndex: 'endTime'
},
{
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+2 -2
View File
@@ -323,7 +323,7 @@
title: this.$t('vehicleInProductionDate'),
align: 'left',
ellipsis: true,
width: 210,
width: 190,
sorter: true,
dataIndex: 'implement_time'
},
@@ -332,7 +332,7 @@
align: 'left',
ellipsis: true,
sorter: true,
width: 210,
width: 190,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
},
{
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+2 -2
View File
@@ -157,14 +157,14 @@
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true,
width: 228
width: 190
}
// {
// title: this.$t('correspondingStandard'),
jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
+3 -3
View File
@@ -138,14 +138,14 @@ export default {
{
title: this.$t('ImplementationDate'),
align: 'left',
width: 200,
width: 190,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
align: 'left',
width: 220,
width: 190,
dataIndex: 'implementTime',
ellipsis: true
},
@@ -182,7 +182,7 @@ export default {
align: 'left',
ellipsis: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
width: 100
},
],
fieldList: [
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+5 -5
View File
@@ -464,7 +464,7 @@
title: this.$t('correspondingStandard'),
align: 'left',
dataIndex: 'correspondingStandard',
width: 180,
width: 150,
sorter: true,
ellipsis: true
},
@@ -479,7 +479,7 @@
{
title: this.$t('ImplementationDate'),
align: 'left',
width: 200,
width: 190,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String',
scopedSlots: { customRender: 'titleName' },
sorter: true,
@@ -488,7 +488,7 @@
{
title: this.$t('vehicleInProductionDate'),
align: 'left',
width: 220,
width: 190,
dataIndex: 'implementTimeString',
scopedSlots: { customRender: 'titleName' },
sorter: true,
@@ -522,7 +522,7 @@
title: 'WVTA ID',
align: 'left',
dataIndex: 'wvtaId',
width: 180,
width: 95,
sorter: true,
ellipsis: true
},
@@ -532,7 +532,7 @@
ellipsis: true,
sorter: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
width: 100
},
// {
// title: this.$t('regulatoryEngineer'),
jero-web/src/views/externalReports/index.vue
+2 -2
View File
@@ -412,14 +412,14 @@
align: 'left',
ellipsis: true,
dataIndex: 'createTime',
width: 245
width: 150
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
ellipsis: true,
width: 250,
width: 240,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/parameter/escalationlibrary/index.vue
+4 -4
View File
@@ -160,7 +160,7 @@
{
title: this.$t('entryName'),
align: 'left',
width: 405,
width: 300,
dataIndex: 'projectName',
sorter:true,
scopedSlots: { customRender: 'projectName' }
@@ -168,20 +168,20 @@
{
title: this.$t('ListTitle'),
align: 'left',
width: 500,
width: 400,
dataIndex: 'title',
},
{
title: this.$t('Version'),
align: 'left',
width: 384,
width: 90,
dataIndex: 'version'
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 220,
width: 200,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/parameter/parameterexport/index.vue
+1 -1
View File
@@ -215,7 +215,7 @@ export default {
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 200,
width: 130,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/parameter/parameterlist/index.vue
+3 -3
View File
@@ -185,7 +185,7 @@ export default {
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritory_dictText',
width: 259,
width: 100,
sorter: true,
ellipsis: true,
},
@@ -194,14 +194,14 @@ export default {
align: 'left',
dataIndex: 'createTime',
sorter: true,
width: 265,
width: 200,
ellipsis: true,
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 200,
width: 130,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/projectManagement/components/TaskList.vue
+1 -1
View File
@@ -271,7 +271,7 @@
{
title: this.$t('areaOfResponsibility'),
align: 'left',
width: 180,
width: 100,
sorter:true,
dataIndex: 'areaOfResponsibility',
scopedSlots: { customRender: 'areaOfResponsibility' }
jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue
+1 -1
View File
@@ -134,7 +134,7 @@
dataIndex: 'dutyTerritory_dictText',
align: 'left',
ellipsis: true,
width: 190
width: 100
}
],
dataList: [],
jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
+1 -1
View File
@@ -123,7 +123,7 @@
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 200,
width: 100,
ellipsis: true
},
{
jero-web/src/views/projectManagement/components/certificationList/index.vue
+1 -1
View File
@@ -671,7 +671,7 @@
title: this.$t('configurationItem'),
align: 'left',
dataIndex: 'configItem',
width: 75,
width: 85,
ellipsis: true
},
{
jero-web/src/views/projectManagement/components/listAddModel.vue
+2 -2
View File
@@ -149,14 +149,14 @@
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
// {
// title: this.$t('correspondingStandard'),
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+5 -5
View File
@@ -763,7 +763,7 @@
ellipsis: true,
sorter: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
width: 120
},
{
title: this.$t('regulatoryEngineer'),
@@ -771,7 +771,7 @@
ellipsis: true,
sorter: true,
dataIndex: 'regulationOwnerName',
width: 180
width: 130
},
{
title: this.$t('engineeringInterfacePerson'),
@@ -779,7 +779,7 @@
ellipsis: true,
sorter: true,
dataIndex: 'engineeringInterfacePersonName',
width: 180
width: 130
},
{
title: this.$t('remarks'),
@@ -796,7 +796,7 @@
title: this.$t('personLiable'),
dataIndex: 'designDutyIdName',
align: 'left',
width: 180,
width: 110,
sorter: true,
ellipsis: true
},
@@ -842,7 +842,7 @@
title: this.$t('personLiable'),
dataIndex: 'verifyDutyIdName',
align: 'left',
width: 180,
width: 110,
ellipsis: true,
sorter: true
},
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+1 -1
View File
@@ -300,7 +300,7 @@
align: 'left',
dataIndex: 'dutyTerritory_dictText',
ellipsis: true,
width: 153
width: 100
},
{
align: 'left',
jero-web/src/views/projectManagement/components/nonConformance.vue
+5 -5
View File
@@ -128,7 +128,7 @@
scopedSlots: { customRender: 'ProcessType' },
ellipsis: true,
sorter:true,
width: 180
width: 150
},
{
title: this.$t('areaOfResponsibility'),
@@ -136,7 +136,7 @@
dataIndex: 'dutyTerritory',
ellipsis: true,
sorter:true,
width: 180
width: 100
},
{
title: this.$t('problemType'),
@@ -144,7 +144,7 @@
dataIndex: 'problemType',
ellipsis: true,
sorter:true,
width: 180
width: 150
},
{
title: this.$t('Sponsor'),
@@ -152,7 +152,7 @@
dataIndex: 'initiator',
ellipsis: true,
sorter:true,
width: 140
width: 100
},
{
title: this.$t('personLiable'),
@@ -160,7 +160,7 @@
dataIndex: 'duty',
ellipsis: true,
sorter:true,
width: 140
width: 100
}
],
total: 0,
jero-web/src/views/projectManagement/components/responsibilityList.vue
+1 -1
View File
@@ -59,7 +59,7 @@
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritoryName',
align: 'left',
width: 400,
width: 100,
ellipsis: true,
scopedSlots: { customRender: 'areaOfResponsibility' }
},
jero-web/src/views/projectManagement/components/transferListvirtal.vue
+3 -3
View File
@@ -139,14 +139,14 @@ export default {
{
title: this.$t('ImplementationDate'),
align: 'left',
width: 200,
width: 190,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
align: 'left',
width: 220,
width: 190,
dataIndex: 'implementTime',
ellipsis: true
},
@@ -183,7 +183,7 @@ export default {
align: 'left',
ellipsis: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
width: 100
},
],
fieldList: [
jero-web/src/views/projectManagement/historicalVersion/index.vue
+1 -1
View File
@@ -218,7 +218,7 @@
ellipsis: true,
sorter: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
width: 100
},
{
title: this.$t('regulatoryEngineer'),
jero-web/src/views/projectManagement/projectLibrary/index.vue
+1 -1
View File
@@ -247,7 +247,7 @@
{
title: this.$t('brand'),
align: 'left',
width: 140,
width: 120,
ellipsis: true,
dataIndex: 'brandText'
},
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+5 -5
View File
@@ -223,7 +223,7 @@
title: this.$t('ProcessType'),
align: 'left',
dataIndex: 'flowType',
width: 180,
width: 150,
sorter:true,
ellipsis: true
},
@@ -231,7 +231,7 @@
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritory',
width: 120,
width: 100,
sorter:true,
ellipsis: true
},
@@ -247,7 +247,7 @@
title: this.$t('problemType'),
align: 'left',
dataIndex: 'problemType',
width: 140,
width: 120,
sorter:true,
ellipsis: true
},
@@ -256,14 +256,14 @@
align: 'left',
dataIndex: 'initiator',
sorter:true,
width: 140
width: 100
},
{
title: this.$t('personLiable'),
align: 'left',
dataIndex: 'duty',
sorter:true,
width: 140
width: 100
}
],
total: 0,
jero-web/src/views/regulationsKanban/components/addModel.vue
+1 -1
View File
@@ -184,7 +184,7 @@
{
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory_dicText',
width: 120,
width: 100,
align: 'left',
ellipsis: true
},
jero-web/src/views/regulationsKanban/index.vue
+2 -2
View File
@@ -195,7 +195,7 @@ export default {
align: 'left',
ellipsis: true,
dataIndex: 'state_dicText',
width: 150
width: 130
},
// {
// title: this.$t('category'),
@@ -214,7 +214,7 @@ export default {
title: this.$t('evaluationResults'),
align: 'left',
fixed: 'right',
width: 180,
width: 130,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/regulatoryEarlyWarning/index.vue
+2 -2
View File
@@ -202,7 +202,7 @@
title: this.$t('vehicleInProductionDate'),
align: 'left',
ellipsis: true,
width: 210,
width: 190,
dataIndex: 'implement_time',
scopedSlots: { customRender: 'vehicleInProductionDate' }
},
@@ -210,7 +210,7 @@
title: this.$t('ImplementationDate'),
align: 'left',
ellipsis: true,
width: 210,
width: 190,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
scopedSlots: { customRender: 'ImplementationDate' }
}
jero-web/src/views/system/UserAnnouncementList.vue
+8 -8
View File
@@ -160,22 +160,22 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
align: 'left',
ellipsis: true,
dataIndex: 'msgCategory',
width: 200,
width: 150,
scopedSlots: { customRender: 'msgCategory' }
},
{
title: this.$t('NotificationTime'),
align: 'left',
ellipsis: true,
width: 200,
width: 180,
dataIndex: 'sendTime'
},
{
title: '',
align: 'left',
ellipsis: true,
width: 50
}
// {
// title: '',
// align: 'left',
// ellipsis: true,
// width: 50
// }
],
url: {
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
+2 -2
View File
@@ -163,7 +163,7 @@
align: 'left',
dataIndex: 'dutyTerritoryName',
ellipsis: true,
width: 120
width: 100
},
{
title: this.$t('taskType'),
@@ -207,7 +207,7 @@
align: 'left',
dataIndex: 'dutyTerritoryName',
ellipsis: true,
width: 120
width: 100
},
{
title: this.$t('taskType'),
jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
+2 -2
View File
@@ -166,14 +166,14 @@ export default {
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true,
width: 228
width: 190
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true,
width: 228
width: 190
}
// {
// title: this.$t('correspondingStandard'),
jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue
+1 -1
View File
@@ -123,7 +123,7 @@ export default {
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 200,
width: 100,
ellipsis: true,
},
{
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+1 -1
View File
@@ -328,7 +328,7 @@
align: 'left',
sorter: true,
dataIndex: 'configItem',
width: 75,
width: 85,
ellipsis: true
},
{