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

平台件项目库修改bug

Browse Source
This commit is contained in:
zyx.net
2023-09-28 11:06:33 +08:00
parent 10056e4e8e
commit 95ad465998
3 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2
View File
@@ -955,6 +955,7 @@ module.exports = {
modelName: 'Model Name',
modelYear: 'Model Year',
NoteConfirmTheChange: 'Note: After resetting, the status of the selected items will be changed to To Be Released and the historical data will disappear. Please confirm whether to reset',
NoteConfirmTheChangeplatform:'Note: After the reset, the selected item data will be changed to the task ready state, and the historical data will disappear. Please confirm whether to reset the process',
onlyDataChanged: 'Only data with task confirmation status of Accepted can be changed',
inquiry: 'Inquiry',
ConfirmationDeadline: 'Confirm Deadline',
@@ -1119,6 +1120,7 @@ module.exports = {
pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
TheEngineerAndCertification: 'The Homo Engineer cannot be empty',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
pleaseSelectTheDataverification:'Select the data whose status of the design conformance verification process is Task ready to start and the responsible person rejects it, or the verification conformance verification process is list to be checked and the responsible person rejects it',
theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
bringInTheProjectInterface: 'Assign to Owner',
theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -968,6 +968,7 @@ module.exports = {
modelName: '车型名称',
modelYear: '年款',
NoteConfirmTheChange: '注意：重置后所选条目数据将变为清单待发布状态，历史数据将消失，请确认是否进行流程重置',
NoteConfirmTheChangeplatform: '注意：重置后所选条目数据将变为任务待发起状态，历史数据将消失，请确认是否进行流程重置',
onlyDataChanged: '只能变更任务确认状态为接受的数据',
inquiry: '询问',
ConfirmationDeadline: '确认截止时间',
@@ -2621,6 +2622,7 @@ module.exports = {
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
TheEngineerAndCertification: '的法规工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
theProjectContactEmpty: '的工程接口人不能为空',
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+36 -36
View File
@@ -204,10 +204,10 @@
{{ $t('add') }}
</div>
<!-- 复制-->
<div @click="copyClick('lawsInventoryStudioCopy')" class="operator-text-title">
<a-icon type="copy"/>
{{ $t('copy') }}
</div>
<!-- <div @click="copyClick('lawsInventoryStudioCopy')" class="operator-text-title">-->
<!-- <a-icon type="copy"/>-->
<!-- {{ $t('copy') }}-->
<!-- </div>-->
<!-- 批量删除-->
<div @click="handleDel" class="operator-text-title">
<a-icon type="delete"/>
@@ -224,10 +224,10 @@
@getList="getPersonnelList"/>
</div>
<!-- 导出-->
<div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">
<a-icon type="export" :rotate="-90"/>
{{ $t('export') }}
</div>
<!-- <div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">-->
<!-- <a-icon type="export" :rotate="-90"/>-->
<!-- {{ $t('export') }}-->
<!-- </div>-->
<!-- 定版-->
<div class="operator-text-title" @click="fixedPlateClick">
<a-icon type="pushpin"/>
@@ -239,10 +239,10 @@
{{ $t('compliancereport') }}
</div>
<!-- 修改操作人-->
<div class="operator-text-title" @click="modifyOperatorClick('studio')">
<a-icon type="export" :rotate="-90"/>
{{ $t('modifyOperator') }}
</div>
<!-- <div class="operator-text-title" @click="modifyOperatorClick('studio')">-->
<!-- <a-icon type="export" :rotate="-90"/>-->
<!-- {{ $t('modifyOperator') }}-->
<!-- </div>-->
<!-- <div class="operator-text-title" @click="batSettingClick">-->
<!-- <a-icon type="setting" />-->
<!-- {{ $t('batchSettingInformation') }}-->
@@ -286,10 +286,10 @@
{{ $t('initiateTask') }}
</div>
<!-- 退回-->
<div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
<a-icon type="close-circle"/>
{{ $t('sendBack') }}
</div>
<!-- <div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">-->
<!-- <a-icon type="close-circle"/>-->
<!-- {{ $t('sendBack') }}-->
<!-- </div>-->
<!-- 催办-->
<div class="operator-text" @click="questionClick"
v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
@@ -602,7 +602,7 @@
@cancel="handleCancelReset"
>
<div class="noteConfirm">
{{$t('NoteConfirmTheChange')}}
{{$t('NoteConfirmTheChangeplatform')}}
</div>
<a-form-model :model="formInlineReset" class="formAdd" :rules="rulesRoleReset"
ref="ruleFormReset">
@@ -1372,16 +1372,16 @@
// }
],
listOptions: [
{
value: 'List to be released',
key: 'List to be released',
label: this.$t('listToBeReleased')
},
{
value: 'Regulatory engineer returns',
key: 'Regulatory engineer returns',
label: this.$t('regulatoryEngineerReturns')
},
// {
// value: 'List to be released',
// key: 'List to be released',
// label: this.$t('listToBeReleased')
// },
// {
// value: 'Regulatory engineer returns',
// key: 'Regulatory engineer returns',
// label: this.$t('regulatoryEngineerReturns')
// },
{
value: 'Duty Person Rejected',
key: 'Duty Person Rejected',
@@ -2012,10 +2012,10 @@
idList.push(contentList[i].id)
} else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
detailedWarningList.push(
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
} else {
detailedWarningList.push(
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
}
}
@@ -2276,7 +2276,7 @@
let _this = this
this.$confirm({
width: 760,
content: _this.$t('NoteConfirmTheChange'),
content: _this.$t('NoteConfirmTheChangeplatform'),
onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction('/platform/projectLawsInventoryEO/change', {
@@ -2944,10 +2944,10 @@
this.rowKeysSuccessList.push(dataSource[i])
} else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
} else {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
}
}
if (idList && idList.length > 0) {
@@ -3029,10 +3029,10 @@
}
} else if (dataList[i].designFlowStatus == 'NA') {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
} else {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
}
if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
@@ -3050,10 +3050,10 @@
}
} else if (dataList[i].verifyFlowStatus == 'NA') {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
} else {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
}
}
if (this.requestsNum == 0) {