法规清单流程为法规工程师退回的数据可以再次发布

This commit is contained in:
范强强
2023-04-16 15:09:44 +08:00
parent d4d652485d
commit 7982503428
6 changed files with 47 additions and 26 deletions
@@ -291,11 +291,13 @@
<a class="text-operation"
v-if="(
record.verifyFlowStatus == 'List to be released' ||
record.verifyFlowStatus == 'Regulatory engineer returns' ||
record.verifyFlowStatus == 'Compliance' ||
record.verifyFlowStatus == 'Non-Compliance' ||
record.verifyFlowStatus == 'To be tracked' ||
record.verifyFlowStatus == 'NA')
&& (record.designFlowStatus == 'List to be released' ||
record.designFlowStatus == 'Regulatory engineer returns' ||
record.designFlowStatus == 'Compliance' ||
record.designFlowStatus == 'Non-Compliance' ||
record.designFlowStatus == 'To be tracked' ||
@@ -346,6 +348,7 @@
</span>
<span slot="designFlowStatusName" slot-scope="text,result">
<span v-if="result.designFlowStatus == 'List to be released' ||
result.designFlowStatus == 'Regulatory engineer returns' ||
result.designFlowStatus == 'List to be checked'"
:title="text">
{{text}}
@@ -355,7 +358,8 @@
</span>
<span slot="verifyFlowStatusName" slot-scope="text,result">
<span v-if="result.verifyFlowStatus == 'List to be released' ||
result.verifyFlowStatus == 'List to be checked'"
result.verifyFlowStatus == 'Regulatory engineer returns' ||
result.verifyFlowStatus == 'List to be checked'"
:title="text">
{{text}}
</span>
@@ -776,7 +780,7 @@
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
title: this.$t('deliveryDate'),
dataIndex: 'designDueDate',
align: 'left',
ellipsis: true,
@@ -822,7 +826,7 @@
sorter: true
},
{
title: this.$t('TaskCutOffTime'),
title: this.$t('deliveryDate'),
dataIndex: 'verifyDueDate',
align: 'left',
ellipsis: true,
@@ -1048,9 +1052,9 @@
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'),
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'),
headFieldCn: '截止时间',
headFieldEn: 'Due Date',
headFieldEn: 'Delivery Date',
field: 'designDueDate',
affirmFlag: '1',
key: 23,
@@ -1098,9 +1102,9 @@
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'),
headFieldCn: '截止时间',
headFieldEn: 'Due Date',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'),
headFieldCn: '交付日期',
headFieldEn: 'Delivery Date',
field: 'verifyDueDate',
affirmFlag: '3',
key: 33,
@@ -1240,6 +1244,11 @@
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',
@@ -1296,6 +1305,11 @@
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',
@@ -1749,9 +1763,9 @@
}
}
}
if (!isTrue){
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0])
}else{
if (!isTrue) {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0])
} else {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
}
} else {
@@ -2369,7 +2383,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) {
if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l]
}
}
@@ -2381,7 +2395,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) {
if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l]
}
}
@@ -2475,7 +2489,10 @@
}
}
for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') {
if (dataSource[i].verifyFlowStatus == 'List to be released' ||
dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
dataSource[i].designFlowStatus == 'List to be released' ||
dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
if (dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(dataSource[i])
} else {