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

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

Browse Source
This commit is contained in:
高嵩
2023-08-04 14:40:48 +08:00
parent 14854b3333 162be1cce1
commit 5d0bd48a09
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+4
View File
@@ -401,6 +401,7 @@
position: absolute; position: absolute;
right: 330px; right: 330px;
top: 50%; top: 50%;
font-size: 14px;
transform: translate-Y(-50%); transform: translate-Y(-50%);
} }
@@ -411,12 +412,14 @@
position: absolute; position: absolute;
right: 450px; right: 450px;
top: 50%; top: 50%;
font-size: 14px;
transform: translate-Y(-50%); transform: translate-Y(-50%);
} }
.text-text-right-text-One { .text-text-right-text-One {
width: 120px; width: 120px;
height: 100%; height: 100%;
font-size: 14px;
text-align: center; text-align: center;
position: absolute; position: absolute;
right: 210px; right: 210px;
@@ -427,6 +430,7 @@
.text-text-right-text { .text-text-right-text {
width: 210px; width: 210px;
height: 100%; height: 100%;
font-size: 14px;
text-align: center; text-align: center;
position: absolute; position: absolute;
right: 0; right: 0;
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+28 -20
View File
@@ -2026,7 +2026,7 @@
contentList[i].verifyFlowStatus == 'Duty Person Rejected' || contentList[i].verifyFlowStatus == 'Duty Person Rejected' ||
contentList[i].designFlowStatus == 'Duty Person Rejected') { contentList[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(contentList[i].id) idList.push(contentList[i].id)
}else if(contentList[i].designFlowStatus == 'NA' ||　contentList[i].verifyFlowStatus == 'NA'){ } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
detailedWarningList.push( detailedWarningList.push(
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
} else { } else {
@@ -2382,15 +2382,19 @@
for (let i = 0; i < selectedRowKeysList.length; i++) { for (let i = 0; i < selectedRowKeysList.length; i++) {
if ( if (
(selectedRowKeysList[i].verifyFlowStatus == 'List to be released' || (selectedRowKeysList[i].verifyFlowStatus == 'List to be released' ||
selectedRowKeysList[i].verifyFlowStatus == 'List to be checked' ||
selectedRowKeysList[i].verifyFlowStatus == 'Regulatory engineer returns' ||
selectedRowKeysList[i].verifyFlowStatus == 'Duty Person Rejected' ||
selectedRowKeysList[i].verifyFlowStatus == 'Termination of task' ||
selectedRowKeysList[i].verifyFlowStatus == 'Compliance' || selectedRowKeysList[i].verifyFlowStatus == 'Compliance' ||
selectedRowKeysList[i].verifyFlowStatus == 'Non-Compliance' ||
selectedRowKeysList[i].verifyFlowStatus == 'To be tracked' ||
selectedRowKeysList[i].verifyFlowStatus == 'NA') selectedRowKeysList[i].verifyFlowStatus == 'NA')
&& &&
(selectedRowKeysList[i].designFlowStatus == 'List to be released' || (selectedRowKeysList[i].designFlowStatus == 'List to be released' ||
selectedRowKeysList[i].designFlowStatus == 'List to be checked' ||
selectedRowKeysList[i].designFlowStatus == 'Regulatory engineer returns' ||
selectedRowKeysList[i].designFlowStatus == 'Duty Person Rejected' ||
selectedRowKeysList[i].designFlowStatus == 'Termination of task' ||
selectedRowKeysList[i].designFlowStatus == 'Compliance' || selectedRowKeysList[i].designFlowStatus == 'Compliance' ||
selectedRowKeysList[i].designFlowStatus == 'Non-Compliance' ||
selectedRowKeysList[i].designFlowStatus == 'To be tracked' ||
selectedRowKeysList[i].designFlowStatus == 'NA')) { selectedRowKeysList[i].designFlowStatus == 'NA')) {
isTrue = true isTrue = true
} else { } else {
@@ -2418,9 +2422,9 @@
}) })
} }
}) })
}else{ } else {
this.$confirm({ this.$confirm({
content: _this.$t('thereProcessInProgressDeletion')+'?', content: _this.$t('thereProcessInProgressDeletion') + '?',
onOk() { onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction(_this.url.deleteBatch, { postAction(_this.url.deleteBatch, {
@@ -2456,15 +2460,19 @@
deleteLib(val) { deleteLib(val) {
let _this = this let _this = this
if ((val.verifyFlowStatus == 'List to be released' || if ((val.verifyFlowStatus == 'List to be released' ||
val.verifyFlowStatus == 'List to be checked' ||
val.verifyFlowStatus == 'Regulatory engineer returns' ||
val.verifyFlowStatus == 'Duty Person Rejected' ||
val.verifyFlowStatus == 'Termination of task' ||
val.verifyFlowStatus == 'Compliance' || val.verifyFlowStatus == 'Compliance' ||
val.verifyFlowStatus == 'Non-Compliance' || val.verifyFlowStatus == 'NA') &&
val.verifyFlowStatus == 'To be tracked' ||
val.verifyFlowStatus == 'NA')&&
(val.designFlowStatus == 'List to be released' || (val.designFlowStatus == 'List to be released' ||
val.designFlowStatus == 'Compliance' || val.designFlowStatus == 'List to be checked' ||
val.designFlowStatus == 'Non-Compliance' || val.designFlowStatus == 'Regulatory engineer returns' ||
val.designFlowStatus == 'To be tracked' || val.designFlowStatus == 'Duty Person Rejected' ||
val.designFlowStatus == 'NA')){ val.designFlowStatus == 'Termination of task' ||
val.designFlowStatus == 'Compliance' ||
val.designFlowStatus == 'NA')) {
this.$confirm({ this.$confirm({
content: _this.$t('ConfirmDelete'), content: _this.$t('ConfirmDelete'),
onOk() { onOk() {
@@ -2478,9 +2486,9 @@
}) })
} }
}) })
}else{ } else {
this.$confirm({ this.$confirm({
content: _this.$t('thereProcessInProgressDeletion')+'?', content: _this.$t('thereProcessInProgressDeletion') + '?',
onOk() { onOk() {
deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
if (res.success) { if (res.success) {
@@ -2950,10 +2958,10 @@
dataSource[i].designFlowStatus == 'Duty Person Rejected') { dataSource[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(dataSource[i].id) idList.push(dataSource[i].id)
this.rowKeysSuccessList.push(dataSource[i]) this.rowKeysSuccessList.push(dataSource[i])
} else if(dataSource[i].designFlowStatus == 'NA' ||　dataSource[i].verifyFlowStatus == 'NA'){ } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
this.detailedWarningList.push( this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
}else { } else {
this.detailedWarningList.push( this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
} }
@@ -3035,7 +3043,7 @@
} }
// _this.startProcess(dataList[i], 2, this.requestsNum) // _this.startProcess(dataList[i], 2, this.requestsNum)
} }
}else if(dataList[i].designFlowStatus == 'NA'){ } else if (dataList[i].designFlowStatus == 'NA') {
_this.detailedWarningList.push( _this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
} else { } else {
@@ -3056,7 +3064,7 @@
} }
// _this.startProcess(dataList[i], 4, this.requestsNum) // _this.startProcess(dataList[i], 4, this.requestsNum)
} }
}else if(dataList[i].verifyFlowStatus == 'NA'){ } else if (dataList[i].verifyFlowStatus == 'NA') {
_this.detailedWarningList.push( _this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
} else { } else {