bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
liang.chao 2024-09-13 14:35:43 +08:00
parent 1d35c72d4b 11362d1f0b
commit ffdbcd019e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
View File

@ -140,6 +140,7 @@
<span v-if="scope.row.sltStatus == '1'">未结算</span>
<span v-if="scope.row.sltStatus == '2'">已结算</span>
<span v-if="scope.row.sltStatus == '3'">已审核</span>
<span v-if="scope.row.sltStatus == '4'">已驳回</span>
</template>
</el-table-column>
<el-table-column
@ -164,12 +165,12 @@
type="primary"
icon="el-icon-edit"
@click="handleApply(scope.row)"
v-if="scope.row.sltStatus == '1'"
v-if="scope.row.sltStatus == '1' || (scope.row.sltStatus == '4' && scope.row.isCommit == 0 )"
>结算申请</el-button
>
<!-- <el-button
size="mini"
type="danger"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>撤销申请</el-button> -->
@ -220,6 +221,7 @@ export default {
{ id: '1', name: '未结算' },
{ id: '2', name: '已结算' },
{ id: '3', name: '已审核' },
{ id: '4', name: '已驳回' },
], //集合
// 表格数据
agreementList: [],
@ -235,6 +237,7 @@ export default {
pageSize: 10,
keyWord: undefined,
sltStatus: '',
isCommit:'',
unitId: '',
projectId: '',
},

3
sgzb-ui/src/views/cost/csotSettlement/costList.vue
View File

@ -152,7 +152,7 @@
>
<!-- <el-button
size="mini"
type="danger"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>撤销申请</el-button> -->
@ -218,6 +218,7 @@ export default {
pageSize: 10,
keyWord: undefined,
sltStatus: '',
isCommit: '',
unitId: '',
projectId: '',
},