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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-11-01 17:42:51 +08:00
parent 47abdbe613 bc8ca6e924
commit d2c5811bed
1 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+56 -46
View File
@@ -8,24 +8,24 @@
</div> </div>
</div> </div>
<div class="header-content"> <div class="header-content">
<div class="operator-text" <a-button class="header-btn submit"
v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
@click="distributionEngineerClick($t('distributionEngineer'),1)"> @click="distributionEngineerClick($t('distributionEngineer'),1)"
<a-icon type="audit"/> type="primary">
{{ $t('distributionEngineer') }} {{$t('distributionEngineer')}}
</div> </a-button>
<div class="operator-text" <a-button class="header-btn submit"
v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
@click="reminderHandling()"> @click="distributionEngineerClick($t('addFeedback'),2)"
<a-icon type="sound"/> type="primary">
{{ $t('reminderHandling') }} {{$t('addFeedback')}}
</div> </a-button>
<div class="operator-text" <!-- <div class="operator-text"-->
v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" <!-- v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"-->
@click="distributionEngineerClick($t('addFeedback'),2)"> <!-- @click="reminderHandling()">-->
<a-icon type="plus-circle"/> <!-- <a-icon type="sound"/>-->
{{ $t('addFeedback') }} <!-- {{ $t('reminderHandling') }}-->
</div> <!-- </div>-->
</div> </div>
<a-table <a-table
ref="table" ref="table"
@@ -74,6 +74,11 @@
@click="deleted(result)"> @click="deleted(result)">
{{$t('deleteLib')}} {{$t('deleteLib')}}
</a> </a>
<a class="text"
@click="reminderClick(result)"
v-if="$route.query.TaskKey == 'zrrclrw' && !result.createUser">
{{ $t('reminderHandling') }}
</a>
</span> </span>
</a-table> </a-table>
<a-modal <a-modal
@@ -279,31 +284,31 @@
</div> </div>
<JLoading :loading="pageLoading">{{$t('dataLoading')}}</JLoading> <JLoading :loading="pageLoading">{{$t('dataLoading')}}</JLoading>
</a-modal> </a-modal>
<a-modal <!-- <a-modal-->
:title="$t('reminderHandling')" <!-- :title="$t('reminderHandling')"-->
:width="800" <!-- :width="800"-->
:visible="visibleTable" <!-- :visible="visibleTable"-->
:maskClosable="false" <!-- :maskClosable="false"-->
@cancel="visibleTable = false" <!-- @cancel="visibleTable = false"-->
> <!-- >-->
<template slot="footer"> <!-- <template slot="footer">-->
<a-button key="back" @click="visibleTable = false"> <!-- <a-button key="back" @click="visibleTable = false">-->
{{$t('cancel')}} <!-- {{$t('cancel')}}-->
</a-button> <!-- </a-button>-->
</template> <!-- </template>-->
<a-table <!-- <a-table-->
ref="table" <!-- ref="table"-->
:loading="loadingTable" <!-- :loading="loadingTable"-->
:pagination="false" <!-- :pagination="false"-->
:scroll="{x: true,y:400}" <!-- :scroll="{x: true,y:400}"-->
:data-source="dataSourceTable" <!-- :data-source="dataSourceTable"-->
:columns="columnsTable" <!-- :columns="columnsTable"-->
> <!-- >-->
<span slot="operationTable" slot-scope="result"> <!-- <span slot="operationTable" slot-scope="result">-->
<a @click="reminderClick(result)">{{$t('reminder')}}</a> <!-- <a @click="reminderClick(result)">{{$t('reminder')}}</a>-->
</span> <!-- </span>-->
</a-table> <!-- </a-table>-->
</a-modal> <!-- </a-modal>-->
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/> <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
<viewFileModel ref="viewFileModelRef"/> <viewFileModel ref="viewFileModelRef"/>
</div> </div>
@@ -436,7 +441,7 @@
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'left', align: 'left',
width: 160, width: 190,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
], ],
@@ -722,7 +727,7 @@
_this.formInline.userId.splice(num, 1) _this.formInline.userId.splice(num, 1)
_this.formInline.userId = _this.formInline.userId.join(',') _this.formInline.userId = _this.formInline.userId.join(',')
_this.formInline = { ..._this.formInline } _this.formInline = { ..._this.formInline }
if (id){ if (id) {
deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => { deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
@@ -829,7 +834,7 @@
line-height: 80px; line-height: 80px;
.header-text { .header-text {
font-size: 16px; font-size: 18px;
font-weight: 400; font-weight: 400;
color: #000F16; color: #000F16;
} }
@@ -960,4 +965,9 @@
line-height: 200px; line-height: 200px;
text-align: center; text-align: center;
} }
.header-btn {
height: 38px;
margin-left: 16px;
}
</style> </style>