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

修改未符合项的传参

Browse Source
This commit is contained in:
qq787203167
2022-05-12 14:26:38 +08:00
parent 89f5dc7932
commit 9b3f5dcd72
6 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/TaskList.vue
+17 -12
View File
@@ -143,30 +143,34 @@
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standard',
width: 200,
width: 202,
scopedSlots: { customRender: 'standardInformation' }
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
width: 180,
dataIndex: 'areaOfResponsibility',
scopedSlots: { customRender: 'areaOfResponsibility' }
},
{
title: this.$t('confirmationOfDesignConformity'),
align: 'center',
width: 240,
dataIndex: 'confirmationOfDesignConformity',
scopedSlots: { customRender: 'confirmationOfDesignConformity' }
},
{
title: this.$t('PrehomoConfirmation'),
align: 'center',
width: 240,
dataIndex: 'PrehomoConfirmation',
scopedSlots: { customRender: 'PrehomoConfirmation' }
},
{
title: this.$t('verificationAndConformityconfirmation'),
align: 'center',
width: 240,
dataIndex: 'verificationAndConformityconfirmation',
scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
},
@@ -192,18 +196,18 @@
'showData': '展示数据'
},
color: {
'conformity': 'accordColor',
'inconformity': 'nonConformityColor',
'to track': 'TrackedColor',
'uninvolved': 'notInvolvedColor',
'to be confirmed': 'submittedColor'
'Compliance': 'accordColor',
'Non-Compliance': 'nonConformityColor',
'To be tracked': 'TrackedColor',
'NA': 'notInvolvedColor',
'No rating': 'submittedColor'
},
statusText: {
'conformity': this.$t('accord'),
'inconformity': this.$t('nonConformity'),
'to track': this.$t('Tracked'),
'uninvolved': this.$t('notInvolved'),
'to be confirmed': this.$t('toBeConfirmed')
'Compliance': this.$t('accord'),
'Non-Compliance': this.$t('nonConformity'),
'To be tracked': this.$t('Tracked'),
'NA': this.$t('notInvolved'),
'No rating': this.$t('toBeConfirmed')
},
queryParam: {},
@@ -391,6 +395,7 @@
position: relative;
display: block;
height: 100%;
text-align: left;
}
.content {
@@ -445,7 +450,7 @@
}
.box-content-color {
width: 78px;
width: 138px;
height: 32px;
display: inline-block;
border-radius: 4px;
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+6 -6
View File
@@ -141,7 +141,7 @@
{{ $t('edit') }}
</a>
<a class="text-operation"
v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'rejected') && record.roleCode == 0"
v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
@click="deleteLib(record)">
{{ $t('deleteLib') }}
</a>
@@ -752,7 +752,7 @@
if (this.dataSource && this.dataSource.length > 0) {
let isTrue
for (let i = 0; i < this.dataSource.length; i++) {
if (this.dataSource[i].taskAffirmStatus == 'accepted' && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
if (this.dataSource[i].taskAffirmStatus == 'Accepted' && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
isTrue = true
} else {
isTrue = false
@@ -776,7 +776,7 @@
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') {
if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
isTrue = true
} else {
isTrue = false
@@ -884,7 +884,7 @@
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
if ((this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') &&
if ((this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') &&
this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
isTrue = true
} else {
@@ -912,8 +912,8 @@
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'rejected') &&
this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') &&
this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
&& this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) ||
(!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId