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

软件版本列表增加一列"扩展任务数量"

Browse Source
This commit is contained in:
范强强
2023-10-20 14:20:01 +08:00
parent 5e6428fd8f
commit d7d3bb8b5f
6 changed files with 907 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+6 -4
View File
@@ -1434,7 +1434,7 @@ module.exports = {
onlyDataStatusConfirmedSelected: 'Only data with process status of Task to Be Confirmed can be selected', onlyDataStatusConfirmedSelected: 'Only data with process status of Task to Be Confirmed can be selected',
onlyDataStatusSubmittedCanBeSelected: 'Only data with process status of Result to Be Submitted can be selected', onlyDataStatusSubmittedCanBeSelected: 'Only data with process status of Result to Be Submitted can be selected',
operationWithoutPermission: 'No access', operationWithoutPermission: 'No access',
data:"'s data", data: '\'s data',
confirmApproval: 'Confirm to approve?', confirmApproval: 'Confirm to approve?',
confirmReturnForApproval: 'Confirm to reject?', confirmReturnForApproval: 'Confirm to reject?',
onlyDataStatusResultReviewedCanBeSelected: 'Only data with process status of Result to Be Reviewed can be selected', onlyDataStatusResultReviewedCanBeSelected: 'Only data with process status of Result to Be Reviewed can be selected',
@@ -1725,7 +1725,7 @@ module.exports = {
note: 'Note: The attachment includes the list of test items and test report. Test standard or technical specification', note: 'Note: The attachment includes the list of test items and test report. Test standard or technical specification',
notecsv: 'Note: CSV format is supported. The value is within 20M', notecsv: 'Note: CSV format is supported. The value is within 20M',
format: 'It supports doc/docx/pdf format and is less than 50M in size', format: 'It supports doc/docx/pdf format and is less than 50M in size',
cantTransferToYourself:"Can't transfer to yourself", cantTransferToYourself: 'Can\'t transfer to yourself',
theDataYouInitiate: 'The data you selected does not meet the process initiation criteria. Please recheck and initiate', theDataYouInitiate: 'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
dataWithProcessReleasedCannotBeReset: 'Data with a process status of list to be released cannot be reset', dataWithProcessReleasedCannotBeReset: 'Data with a process status of list to be released cannot be reset',
reasonForReturnOfDesignCompliance: 'Reason for the return by the regulation engineer', reasonForReturnOfDesignCompliance: 'Reason for the return by the regulation engineer',
@@ -1784,7 +1784,7 @@ module.exports = {
batchComplianceConfirmation: 'Compliance Confirmation in Batch', batchComplianceConfirmation: 'Compliance Confirmation in Batch',
onlyDataWithApprovedCanCeSelected: 'Only data with a process status of result pending review or approved can be selected', onlyDataWithApprovedCanCeSelected: 'Only data with a process status of result pending review or approved can be selected',
deadlineForResponsibilityConfirmation: 'Deadline for Responsibility Confirmation', deadlineForResponsibilityConfirmation: 'Deadline for Responsibility Confirmation',
checkRegulatoryCompletedBefore: "Check the implementation of regulatory requirements before product design freezes. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before G3.", checkRegulatoryCompletedBefore: 'Check the implementation of regulatory requirements before product design freezes. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before G3.',
checkVerificationResultsBeforeMP: 'Check the verification results required by regulations before mass production of the product. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before MP.', checkVerificationResultsBeforeMP: 'Check the verification results required by regulations before mass production of the product. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before MP.',
modifyOperator: 'Change Operator', modifyOperator: 'Change Operator',
onlyDesignComplianceConfirmationSelected: 'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected', onlyDesignComplianceConfirmationSelected: 'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected',
@@ -1991,7 +1991,7 @@ module.exports = {
matchempty: 'The match is empty', matchempty: 'The match is empty',
onlyDataProcessStatusDeleted: 'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person', onlyDataProcessStatusDeleted: 'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
platformitemhasbeenassociated: 'A platform item has been associated', platformitemhasbeenassociated: 'A platform item has been associated',
power:'power', power: 'Latent Parameter',
producer: 'producer', producer: 'producer',
Nameplatelabel: 'Nameplate label', Nameplatelabel: 'Nameplate label',
Batteryfilingrecord: 'Battery filing record', Batteryfilingrecord: 'Battery filing record',
@@ -2022,4 +2022,6 @@ module.exports = {
Compliancemanagementvalvepoint: 'Compliance management valve point', Compliancemanagementvalvepoint: 'Compliance management valve point',
designTaskValidation: 'Design task validation', designTaskValidation: 'Design task validation',
verificationTaskValidation: 'Verification task validation', verificationTaskValidation: 'Verification task validation',
platformType: 'Platform Type',
extensionItems:'Extension Items',
} }
jero-web/src/common/lang/zh-cn.js
+3 -1
View File
@@ -3947,7 +3947,7 @@ module.exports = {
Processdetails:'流程详情', Processdetails:'流程详情',
matchempty:'匹配项为空', matchempty:'匹配项为空',
platformitemhasbeenassociated:'已关联平台件项目', platformitemhasbeenassociated:'已关联平台件项目',
power:'功率', power:'特征参数',
producer:'生产商', producer:'生产商',
Nameplatelabel:'铭牌标签', Nameplatelabel:'铭牌标签',
Batteryfilingrecord:'电池备案记录', Batteryfilingrecord:'电池备案记录',
@@ -3978,4 +3978,6 @@ module.exports = {
Compliancemanagementvalvepoint:'合规管理阀点', Compliancemanagementvalvepoint:'合规管理阀点',
designTaskValidation:'设计任务确认', designTaskValidation:'设计任务确认',
verificationTaskValidation:'验证任务确认', verificationTaskValidation:'验证任务确认',
platformType:'平台件类型',
extensionItems:'扩展任务数量',
} }
jero-web/src/views/otamanagement/otaAuthentication/index.vue
+8
View File
@@ -268,6 +268,14 @@
sorter: true, sorter: true,
dataIndex: 'releaseType' dataIndex: 'releaseType'
}, },
{
title: this.$t('extensionItems'),
align: 'left',
width: 150,
ellipsis: true,
sorter: true,
dataIndex: 'extensionItemCount'
},
{ {
title: this.$t('vehicleType'), title: this.$t('vehicleType'),
align: 'left', align: 'left',
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+13 -6
View File
@@ -57,11 +57,18 @@
>{{queryForm.regulationOwnerIdName}}</span> >{{queryForm.regulationOwnerIdName}}</span>
</div> </div>
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span> <span class="text-field-left"
:title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
<span class="text-field-right" <span class="text-field-right"
:title="queryForm.engineeringInterfacePersonName" :title="queryForm.engineeringInterfacePersonName"
>{{queryForm.engineeringInterfacePersonName}}</span> >{{queryForm.engineeringInterfacePersonName}}</span>
</div> </div>
<div class="text-field">
<span class="text-field-left" :title="$t('platformType')">{{$t('platformType')}}</span>
<span class="text-field-right"
:title="queryForm.platformType"
>{{queryForm.platformType}}</span>
</div>
</div> </div>
<div class="content-text"> <div class="content-text">
<div class="text-field"> <div class="text-field">
@@ -279,17 +286,17 @@
this.queryForm.projectNameId + '-' + this.queryForm.projectVersion + '-' + this.$t('projectProgressStatistics') + '.xls', query) this.queryForm.projectNameId + '-' + this.queryForm.projectVersion + '-' + this.$t('projectProgressStatistics') + '.xls', query)
}, },
handleCancelimg() { handleCancelimg() {
this.previewVisible = false; this.previewVisible = false
}, },
async handlePreview(file) { async handlePreview(file) {
if (!file.url && !file.preview) { if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj); file.preview = await getBase64(file.originFileObj)
} }
this.previewImage = file.url || file.preview; this.previewImage = file.url || file.preview
this.previewVisible = true; this.previewVisible = true
}, },
handleChange({ fileList }) { handleChange({ fileList }) {
this.fileList = fileList; this.fileList = fileList
console.log(this.fileList) console.log(this.fileList)
}, },
versionStatisticsClick() { versionStatisticsClick() {
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+66 -21
View File
@@ -139,7 +139,8 @@
<span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span> <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="engineeringInterfacePersonName"> <a-form-model-item class="itemModel" prop="engineeringInterfacePersonName">
<PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('regulatoryEngineer')}" <PersonnelSelection
:query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('regulatoryEngineer')}"
:isSingleChoice="true" :isSingleChoice="true"
:personneQuery="formInline" :personneQuery="formInline"
@change="PersonnelSelectionChange" @change="PersonnelSelectionChange"
@@ -148,6 +149,20 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('platformType')">{{$t('platformType')}}</span>
</div>
<a-form-model-item class="itemModel" prop="platformType">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('platformType')"
v-model="formInline.platformType"></a-input>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
@@ -221,7 +236,8 @@
<span class="title-text-text" :title="$t('Electriccellproductionenterprises')">{{$t('Electriccellproductionenterprises')}}</span> <span class="title-text-text" :title="$t('Electriccellproductionenterprises')">{{$t('Electriccellproductionenterprises')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="Electriccellproductionenterprises"> <a-form-model-item class="itemModel" prop="Electriccellproductionenterprises">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Electriccellproductionenterprises')" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Electriccellproductionenterprises')"
v-model="formInline.cellEnterprise"></a-input> v-model="formInline.cellEnterprise"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -296,10 +312,12 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('Productclasscode') + '(4)'">{{$t('Productclasscode') + '(4)'}}</span> <span class="title-text-text"
:title="$t('Productclasscode') + '(4)'">{{$t('Productclasscode') + '(4)'}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="Productclasscode"> <a-form-model-item class="itemModel" prop="Productclasscode">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productclasscode') + '(4)'" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Productclasscode') + '(4)'"
v-model="formInline.productTypeCode"></a-input> v-model="formInline.productTypeCode"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -307,10 +325,12 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('Batterytypecode') + '(5)'">{{$t('Batterytypecode') + '(5)'}}</span> <span class="title-text-text"
:title="$t('Batterytypecode') + '(5)'">{{$t('Batterytypecode') + '(5)'}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="Batterytypecode"> <a-form-model-item class="itemModel" prop="Batterytypecode">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Batterytypecode') + '(5)'" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Batterytypecode') + '(5)'"
v-model="formInline.batteryTypeCode"></a-input> v-model="formInline.batteryTypeCode"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -323,7 +343,8 @@
<span class="title-text-text" :title="$t('Specificationcode') + '(6～7)'">{{$t('Specificationcode') + '(6～7)'}}</span> <span class="title-text-text" :title="$t('Specificationcode') + '(6～7)'">{{$t('Specificationcode') + '(6～7)'}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="Specificationcode"> <a-form-model-item class="itemModel-multi" prop="Specificationcode">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Specificationcode') + '(6～7)'" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Specificationcode') + '(6～7)'"
v-model="formInline.specificationCode"></a-input> v-model="formInline.specificationCode"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -334,7 +355,8 @@
<span class="title-text-text" :title="$t('Traceinformationcode') + '(8～14)'">{{$t('Traceinformationcode') + '(8～14)'}}</span> <span class="title-text-text" :title="$t('Traceinformationcode') + '(8～14)'">{{$t('Traceinformationcode') + '(8～14)'}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="Traceinformationcode"> <a-form-model-item class="itemModel-multi" prop="Traceinformationcode">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Traceinformationcode') + '(8～14)'" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Traceinformationcode') + '(8～14)'"
v-model="formInline.traceabilityCode"></a-input> v-model="formInline.traceabilityCode"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -347,7 +369,8 @@
<span class="title-text-text" :title="$t('Productionyearmonthdateserialnumber') + '(15～20)'">{{$t('Productionyearmonthdateserialnumber') + '(15～20)'}}</span> <span class="title-text-text" :title="$t('Productionyearmonthdateserialnumber') + '(15～20)'">{{$t('Productionyearmonthdateserialnumber') + '(15～20)'}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="Productionyearmonthdateserialnumber"> <a-form-model-item class="itemModel-multi" prop="Productionyearmonthdateserialnumber">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productionyearmonthdateserialnumber') + '(15～20)'" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Productionyearmonthdateserialnumber') + '(15～20)'"
v-model="formInline.ymdNumber"></a-input> v-model="formInline.ymdNumber"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -409,10 +432,12 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('Numbercontainedmodules')">{{$t('Numbercontainedmodules')}}</span> <span class="title-text-text"
:title="$t('Numbercontainedmodules')">{{$t('Numbercontainedmodules')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="Numbercontainedmodules"> <a-form-model-item class="itemModel" prop="Numbercontainedmodules">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Numbercontainedmodules')" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Numbercontainedmodules')"
v-model="formInline.moduleNumber"></a-input> v-model="formInline.moduleNumber"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -420,10 +445,12 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('Moduleseriesparallelmode')">{{$t('Moduleseriesparallelmode')}}</span> <span class="title-text-text"
:title="$t('Moduleseriesparallelmode')">{{$t('Moduleseriesparallelmode')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="Moduleseriesparallelmode"> <a-form-model-item class="itemModel" prop="Moduleseriesparallelmode">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Moduleseriesparallelmode')" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Moduleseriesparallelmode')"
v-model="formInline.connectionType"></a-input> v-model="formInline.connectionType"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -436,7 +463,8 @@
<span class="title-text-text" :title="$t('modulspecificationcodeused')">{{$t('modulspecificationcodeused')}}</span> <span class="title-text-text" :title="$t('modulspecificationcodeused')">{{$t('modulspecificationcodeused')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="modulspecificationcodeused"> <a-form-model-item class="itemModel" prop="modulspecificationcodeused">
<a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('modulspecificationcodeused')" <a-input class="box-input" :maxLength="200"
:placeholder="$t('PleaseEnter')+$t('modulspecificationcodeused')"
v-model="formInline.moduleSpecificationCode"></a-input> v-model="formInline.moduleSpecificationCode"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -588,6 +616,18 @@
trigger: 'blur' trigger: 'blur'
} }
], ],
platformType: [
{
required: true,
message: this.$t('platformType') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 200,
message: this.$t('platformType') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
trigger: 'blur'
}
],
power: [ power: [
{ {
required: true, required: true,
@@ -686,7 +726,7 @@
message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
trigger: 'change' trigger: 'change'
} }
], ]
}, },
disabled: false, disabled: false,
previewVisible: false, previewVisible: false,
@@ -702,7 +742,7 @@
myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl, myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
upDataList: [], upDataList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download'
} }
}, },
created() { created() {
@@ -721,17 +761,17 @@
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
handleCancelimg() { handleCancelimg() {
this.previewVisible = false; this.previewVisible = false
}, },
async handlePreview(file) { async handlePreview(file) {
if (!file.url && !file.preview) { if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj); file.preview = await getBase64(file.originFileObj)
} }
this.previewImage = file.url || file.preview; this.previewImage = file.url || file.preview
this.previewVisible = true; this.previewVisible = true
}, },
handleChange({ fileList }) { handleChange({ fileList }) {
this.fileList = fileList; this.fileList = fileList
let filelistId = [] let filelistId = []
let file = [] let file = []
console.log(this.fileList) console.log(this.fileList)
@@ -992,24 +1032,28 @@
height: 40px; height: 40px;
margin-bottom: 24px; margin-bottom: 24px;
} }
.itemModelimg { .itemModelimg {
width: calc(100% - 130px); width: calc(100% - 130px);
display: inline-block; display: inline-block;
margin-top: 2px; margin-top: 2px;
margin-bottom: 24px; margin-bottom: 24px;
} }
.header-text { .header-text {
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
.header-title-text { .header-title-text {
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
line-height: 50px; line-height: 50px;
margin: 0 19px; margin: 0 19px;
} }
.header-title { .header-title {
background: #F5F6F7; background: #F5F6F7;
width: 100%; width: 100%;
@@ -1017,6 +1061,7 @@
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.Required { .Required {
color: red; color: red;
margin-right: 4px; margin-right: 4px;
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+15 -1
View File
@@ -177,7 +177,21 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('personable')">{{$t('personable')}}</span>
</div>
<a-form-model-item class="itemModel">
<PersonnelSelection :query="{db_field_name:'dutyPerson',db_field_txt:$t('personable')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.dutyPerson"/>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2"> <a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2">
<a-col :span="24"> <a-col :span="24">