From 321d57e10176108279c325bfbf06e386b298c2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 17 Mar 2023 14:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 2 +-
jero-web/src/common/lang/zh-cn.js | 2 +-
.../components/listEditModel.vue | 6 +-
.../components/listOfRegulations.vue | 1019 +++++++++--------
4 files changed, 533 insertions(+), 496 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9b6002a7b..483791338 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1109,7 +1109,7 @@ module.exports = {
PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
theProjectContactEmpty: 'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected',
- TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be empty',
+ TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
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',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2b9b9361a..c8930af65 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -704,7 +704,7 @@ module.exports = {
ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
pleaseSelectinitiatedOrRejected: '请选择清单确认状态为未发起或拒绝的数据',
- TheEngineerAndCertification: '的法规工程师、认证工程师不能为空',
+ TheEngineerAndCertification: '的法规工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
theProjectContactEmpty: '的工程接口人不能为空',
PleaseTaskConfirmationRejected: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据',
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 481f43746..8b410da1c 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -359,13 +359,13 @@
{{$t('cutoffTime')}}
-
+
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 500838bc6..5425b231c 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -114,9 +114,10 @@
{{ $t('BatchSetting') }}
-
+
-
+
{
if (res.success) {
- this.isDisplay = true
+ // this.isDisplay = true
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
this.AndUserId = res.result.id
if (this.formInlineRoleSwitching.roleSwitchingCode) {
@@ -1533,16 +1568,16 @@ export default {
} else {
this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
}
- this.isRoleSwitching = true
- if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
- this.isDisplay = true
- } else {
- this.isDisplay = false
- if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
- this.formInlineRoleSwitching.roleSwitchingCode == '' || this.formInlineRoleSwitching.roleSwitchingCode == '13') {
- this.isRoleSwitching = false
- }
- }
+ // this.isRoleSwitching = true
+ // if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
+ // this.isDisplay = true
+ // } else {
+ // this.isDisplay = false
+ // if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
+ // this.formInlineRoleSwitching.roleSwitchingCode == '' || this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+ // this.isRoleSwitching = false
+ // }
+ // }
this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
this.$emit('getRoleSwitch',this.formInlineRoleSwitching.roleSwitchingCode)
this.getList()
@@ -1564,17 +1599,17 @@ export default {
}
},
handleExport() {
- let roleCodeIndex
- if (this.isDisplay) {
- roleCodeIndex = 0
- } else {
- roleCodeIndex = 4
- }
- if (this.roleSwitchingCode == '11' ||
- this.roleSwitchingCode == '12' ||
- this.roleSwitchingCode == '13') {
- roleCodeIndex = 0
- }
+ let roleCodeIndex = this.roleSwitchingCode
+ // if (this.isDisplay) {
+ // roleCodeIndex = 0
+ // } else {
+ // roleCodeIndex = 4
+ // }
+ // if (this.roleSwitchingCode == '11' ||
+ // this.roleSwitchingCode == '12' ||
+ // this.roleSwitchingCode == '13') {
+ // roleCodeIndex = 0
+ // }
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let query = {
...this.queryParam,
@@ -1834,17 +1869,17 @@ export default {
this.confirmLoadingRoleSwitching = true
postAction(this.url.AndUserIdEdit, query).then((res) => {
if (res.success) {
- this.isRoleSwitching = true
- if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
- this.isDisplay = true
- } else {
- this.isDisplay = false
- if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
- this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
- this.formInlineRoleSwitching.roleSwitchingCode == '13') {
- this.isRoleSwitching = false
- }
- }
+ // this.isRoleSwitching = true
+ // if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
+ // this.isDisplay = true
+ // } else {
+ // this.isDisplay = false
+ // if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
+ // this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
+ // this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+ // this.isRoleSwitching = false
+ // }
+ // }
this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
this.$message.success(this.$t('OperationSuccessful'))
this.visibleRoleSwitching = false
@@ -1919,18 +1954,18 @@ export default {
}
},
edit(item) {
- let roleCodeIndex
- if (this.isDisplay) {
- roleCodeIndex = 0
- } else {
- roleCodeIndex = 4
- }
- if (this.roleSwitchingCode == '11' ||
- this.roleSwitchingCode == '12' ||
- this.roleSwitchingCode == '13') {
- roleCodeIndex = 0
- }
- item.roleCodeIndex = roleCodeIndex
+ // let roleCodeIndex
+ // if (this.isDisplay) {
+ // roleCodeIndex = 0
+ // } else {
+ // roleCodeIndex = 4
+ // }
+ // if (this.roleSwitchingCode == '11' ||
+ // this.roleSwitchingCode == '12' ||
+ // this.roleSwitchingCode == '13') {
+ // roleCodeIndex = 0
+ // }
+ item.roleCodeIndex = this.roleSwitchingCode
this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
},
deleteLib(val) {
@@ -2007,6 +2042,8 @@ export default {
moduleFlag: '法规清单'
}).then((res) => {
if (res.success) {
+ this.columnsAll = this.column
+ return
if (res.result.length != 0) {
this.columnsAll = res.result
} else {
@@ -2073,17 +2110,17 @@ export default {
})
},
getList() {
- let roleCode
- if (this.isDisplay) {
- roleCode = 0
- } else {
- roleCode = 4
- }
- if (this.roleSwitchingCode == '11' || this.roleSwitchingCode == '12') {
- roleCode = 0
- } else if (this.roleSwitchingCode == '13') {
- roleCode = 13
- }
+ let roleCode = this.roleSwitchingCode
+ // if (this.isDisplay) {
+ // roleCode = 0
+ // } else {
+ // roleCode = 4
+ // }
+ // if (this.roleSwitchingCode == '11' || this.roleSwitchingCode == '12') {
+ // roleCode = 0
+ // } else if (this.roleSwitchingCode == '13') {
+ // roleCode = 13
+ // }
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
@@ -2186,7 +2223,7 @@ export default {
this.getList()
},
initiateListConfirmationcClick(name) {
- this.listTitle = this.$t('ListConfirmationDeadline')
+ this.listTitle = this.$t('release')
this.timeName = name
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -2203,13 +2240,13 @@ export default {
}
for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
- if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) {
+ if (dataSource[i].regulationOwnerId) {
if (dataSource[i].designDeliverableType) {
- if (!dataSource[i].designInitiatorId) {
- this.detailedWarningList.push(
- < div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
- continue
- }
+ // if (!dataSource[i].designInitiatorId) {
+ // this.detailedWarningList.push(
+ // < div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
+ // continue
+ // }
if (!dataSource[i].designDutyId) {
this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
@@ -2221,29 +2258,29 @@ export default {
continue
}
}
- if (dataSource[i].prehomoDeliverableType) {
- if (!dataSource[i].prehomoInitiatorId) {
- this.detailedWarningList.push(
- < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
- continue
- }
- if (!dataSource[i].prehomoDutyId) {
- this.detailedWarningList.push(
- < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
- continue
- }
- if (!dataSource[i].prehomoDueDate) {
- this.detailedWarningList.push(
- < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
- continue
- }
- }
+ // if (dataSource[i].prehomoDeliverableType) {
+ // if (!dataSource[i].prehomoInitiatorId) {
+ // this.detailedWarningList.push(
+ // < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
+ // continue
+ // }
+ // if (!dataSource[i].prehomoDutyId) {
+ // this.detailedWarningList.push(
+ // < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
+ // continue
+ // }
+ // if (!dataSource[i].prehomoDueDate) {
+ // this.detailedWarningList.push(
+ // < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
+ // continue
+ // }
+ // }
if (dataSource[i].verifyDeliverableType) {
- if (!dataSource[i].verifyInitiatorId) {
- this.detailedWarningList.push(
- < div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
- continue
- }
+ // if (!dataSource[i].verifyInitiatorId) {
+ // this.detailedWarningList.push(
+ // < div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
+ // continue
+ // }
if (!dataSource[i].verifyDutyId) {
this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
@@ -3062,7 +3099,7 @@ export default {
}
.customize-text {
- height: 1533px;
+ /*height: 1533px;*/
display: flex;
flex-direction: column;
align-items: flex-start;