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

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

Browse Source
This commit is contained in:
高嵩
2023-04-16 14:42:33 +08:00
parent ebf1224886 d31362a572
commit d4d652485d
18 changed files with 125 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1787,4 +1787,5 @@ module.exports = {
pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
lidar:'lidar',
history:'History',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1889,4 +1889,5 @@ module.exports = {
pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
lidar:'激光雷达',
history:'历史',
}
jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
+4 -4
View File
@@ -2,7 +2,7 @@
<a-drawer
:title="$t('Transfer')"
:maskClosable="false"
:width="1000"
:width="1100"
placement="right"
:closable="true"
@close="handleCancel"
@@ -45,7 +45,7 @@
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: 800,y:600}"
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@@ -95,7 +95,7 @@ export default {
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
width: 100,
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'standard' }
},
@@ -103,7 +103,7 @@ export default {
title: this.$t('title'),
align: 'left',
dataIndex: 'title',
width: 100,
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'titleName' }
},
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+51 -51
View File
@@ -534,30 +534,30 @@
dataIndex: 'dutyTerritory_dictText',
width: 180
},
{
title: this.$t('regulatoryEngineer'),
align: 'left',
ellipsis: true,
sorter: true,
dataIndex: 'regulationOwnerName',
width: 180
},
{
title: this.$t('certifiedEngineer'),
align: 'left',
ellipsis: true,
sorter: true,
dataIndex: 'homologationEngineerName',
width: 180
},
{
title: this.$t('engineeringInterfacePerson'),
align: 'left',
ellipsis: true,
sorter: true,
dataIndex: 'engineeringInterfacePersonName',
width: 180
},
// {
// title: this.$t('regulatoryEngineer'),
// align: 'left',
// ellipsis: true,
// sorter: true,
// dataIndex: 'regulationOwnerName',
// width: 180
// },
// {
// title: this.$t('certifiedEngineer'),
// align: 'left',
// ellipsis: true,
// sorter: true,
// dataIndex: 'homologationEngineerName',
// width: 180
// },
// {
// title: this.$t('engineeringInterfacePerson'),
// align: 'left',
// ellipsis: true,
// sorter: true,
// dataIndex: 'engineeringInterfacePersonName',
// width: 180
// },
{
title: this.$t('remarks'),
align: 'left',
@@ -801,33 +801,33 @@
key: 15,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
{
sort: '',
name: this.$t('regulatoryEngineer'),
headFieldCn: '法规工程师',
headFieldEn: 'Regulation Engineer',
field: 'regulationOwnerName',
key: 16,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
{
sort: '',
name: this.$t('certifiedEngineer'),
headFieldCn: '认证工程师',
headFieldEn: 'Homo Engineer',
field: 'homologationEngineerName',
key: 17,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
{
sort: '',
name: this.$t('engineeringInterfacePerson'),
headFieldCn: '工程接口人',
headFieldEn: 'Eng. Interface',
field: 'engineeringInterfacePersonName',
key: 18,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
// {
// sort: '',
// name: this.$t('regulatoryEngineer'),
// headFieldCn: '法规工程师',
// headFieldEn: 'Regulation Engineer',
// field: 'regulationOwnerName',
// key: 16,
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
// },
// {
// sort: '',
// name: this.$t('certifiedEngineer'),
// headFieldCn: '认证工程师',
// headFieldEn: 'Homo Engineer',
// field: 'homologationEngineerName',
// key: 17,
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
// },
// {
// sort: '',
// name: this.$t('engineeringInterfacePerson'),
// headFieldCn: '工程接口人',
// headFieldEn: 'Eng. Interface',
// field: 'engineeringInterfacePersonName',
// key: 18,
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
// },
{
sort: '',
name: this.$t('remarks'),
jero-web/src/views/documentTools/virtualList/index.vue
+9 -9
View File
@@ -5,10 +5,10 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('VirtualListName')">
<span>{{$t('VirtualListName')}}</span>
<div class="title-text" :title="$t('marketRegulationList')">
<span>{{$t('marketRegulationList')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"
v-model="queryParam.name"></j-input>
</div>
</a-col>
@@ -54,7 +54,7 @@
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
:rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource"
@change="tableOnChange"
@@ -119,12 +119,12 @@
<div class="box-title-text-add">
<div class="title-text-add">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('VirtualListName')">{{$t('VirtualListName')}}</span>
<span class="title-text-text" :title="$t('marketRegulationList')">{{$t('marketRegulationList')}}</span>
</div>
<a-form-model-item class="itemModel" prop="name">
<a-input class="box-input-add"
v-model.trim="formInline.name"
:placeholder="$t('PleaseEnter')+$t('VirtualListName')"/>
:placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
</a-form-model-item>
</div>
</a-col>
@@ -180,12 +180,12 @@
name: [
{
required: true,
message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
message: this.$t('marketRegulationList') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 100,
message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -218,7 +218,7 @@
title: this.$t('newlyAdded'),
columns: [
{
title: this.$t('VirtualListName'),
title: this.$t('marketRegulationList'),
align: 'left',
dataIndex: 'name',
width: '40',
jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+9 -2
View File
@@ -33,10 +33,10 @@
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: '100%',y:600}"
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
:loading="loading">
</a-table>
@@ -87,6 +87,13 @@
dataIndex: 'studioEngineerName',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('explain'),
dataIndex: 'explanation',
align: 'left',
ellipsis: true,
width: 223
}
],
jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
+1 -1
View File
@@ -45,7 +45,7 @@
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: 800,y:600}"
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
jero-web/src/views/projectManagement/components/certificationList/index.vue
+3 -3
View File
@@ -292,7 +292,7 @@
</a>
<a class="text-operation"
@click="modifyHistoryClick(record)">
{{ $t('modifyHistory') }}
{{ $t('history') }}
</a>
<a class="text-operation"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
@@ -662,7 +662,7 @@
title: this.$t('configurationItem'),
align: 'left',
dataIndex: 'configItem',
width: 180,
width: 100,
ellipsis: true
},
{
@@ -778,7 +778,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 230,
width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+1 -1
View File
@@ -1118,7 +1118,7 @@
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'),
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('typeOfDeliverables'),
headFieldCn: '交付物类型',
headFieldEn: 'Deliverable Type',
field: 'verifyDeliverableTypeName',
jero-web/src/views/projectManagement/components/transferListvirtal.vue
+4 -4
View File
@@ -2,7 +2,7 @@
<a-drawer
:title="$t('Transfer')"
:maskClosable="false"
:width="1000"
:width="1100"
placement="right"
:closable="true"
@close="handleCancel"
@@ -45,7 +45,7 @@
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: 800,y:600}"
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -94,7 +94,7 @@ export default {
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
width: 100,
width: 180,
fixed: 'left',
ellipsis: true,
scopedSlots: { customRender: 'standard' }
@@ -103,7 +103,7 @@ export default {
title: this.$t('title'),
align: 'left',
dataIndex: 'title',
width: 100,
width: 180,
fixed: 'left',
ellipsis: true,
scopedSlots: { customRender: 'titleName' }
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+3 -3
View File
@@ -69,7 +69,7 @@
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
width: 300
width: 200
},
{
title: this.$t('standardInformation'),
@@ -77,7 +77,7 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 300
width: 200
},
{
title: this.$t('ProcessType'),
@@ -122,7 +122,7 @@
dataIndex: 'endTime',
ellipsis: true,
sorter: true,
width: 108
width: 100
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+3 -3
View File
@@ -81,7 +81,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 300
width: 200
},
{
title: this.$t('standardInformation'),
@@ -89,7 +89,7 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 300
width: 200
},
{
title: this.$t('ProcessType'),
@@ -126,7 +126,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 172,
width: 100,
sorter: true,
scopedSlots: { customRender: 'endTime' }
},
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+4 -4
View File
@@ -11,10 +11,6 @@
style="height: 100%;overflow: auto;margin-bottom: 436px;">
<JLoading :loading="loading">{{textLoading}}</JLoading>
<a-button style="float: right;" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<a-icon v-if="this.queryData.isDisplay"
class="questionClass"
:title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
@@ -46,6 +42,10 @@
<!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"-->
<div v-if="this.queryData.isDisplay" class="drawer-review">
<a-button style="float: right;" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<reviewedByThePersonInCharge
v-if="isDisplay"
ref="reviewedByThePersonInChargeRef"
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+3 -3
View File
@@ -74,7 +74,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 300
width: 200
},
{
title: this.$t('standardInformation'),
@@ -82,7 +82,7 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 300
width: 200
},
{
title: this.$t('ProcessType'),
@@ -120,7 +120,7 @@
dataIndex: 'endTime',
ellipsis: true,
sorter: true,
width: 108
width: 100
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
+12 -2
View File
@@ -33,10 +33,10 @@
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: '100%',y:600}"
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
:loading="loading">
</a-table>
@@ -87,6 +87,13 @@
dataIndex: 'studioEngineerName',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('explain'),
dataIndex: 'explanation',
align: 'left',
ellipsis: true,
width: 223
}
],
@@ -151,6 +158,9 @@
},
onSelectChange(value) {
this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
},
handleCancel() {
this.visible = false
jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+1 -2
View File
@@ -2,8 +2,7 @@
<div class="box">
<div class="box-text">
<div class="header-text">
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey
== 'dezrrtjjfw'
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw'
? $t('personLiableConfirm'):$t('sponsorReview')}}
</div>
</div>
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+6 -6
View File
@@ -23,10 +23,10 @@
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text tree-select">
<div class="title-text" :title="$t('taskType')">
<span>{{$t('taskType')}}</span>
<div class="title-text" :title="$t('ProcessType')">
<span>{{$t('ProcessType')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
<a-select :placeholder="$t('PleaseSelect')+$t('ProcessType')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
@@ -44,10 +44,10 @@
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('taskStatus')">
<span>{{$t('taskStatus')}}</span>
<div class="title-text" :title="$t('ProcessStatus')">
<span>{{$t('ProcessStatus')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')"
<a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
jero-web/src/views/virtualAuthenticationList/index.vue
+9 -9
View File
@@ -5,10 +5,10 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('CertificationListName')">
<span>{{$t('CertificationListName')}}</span>
<div class="title-text" :title="$t('marketCertificationList')">
<span>{{$t('marketCertificationList')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"
v-model="queryParam.name"></j-input>
</div>
</a-col>
@@ -114,12 +114,12 @@
<div class="title-text-add">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
:title="$t('marketCertificationList')">{{$t('marketCertificationList')}}</span>
</div>
<a-form-model-item class="itemModel" prop="name">
<a-input class="box-input-add"
v-model.trim="formInline.name"
:placeholder="$t('PleaseEnter')+$t('CertificationListName')"/>
:placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
</a-form-model-item>
</div>
</a-col>
@@ -167,12 +167,12 @@
name: [
{
required: true,
message: this.$t('CertificationListName') + this.$t('cannotEmpty'),
message: this.$t('marketCertificationList') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 100,
message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -212,10 +212,10 @@
dataSource: [],
columns: [
{
title: this.$t('CertificationListName'),
title: this.$t('marketCertificationList'),
align: 'left',
dataIndex: 'name',
width: '40%',
width: '40',
ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' }
},