Merge branch 'main' into 'stg'

签字和签章加code=5 已删除

See merge request cloud-mediate/mediate-manage-web!81
This commit is contained in:
刘翕 2025-02-25 10:41:57 +00:00
commit 7cc853a2c4
3 changed files with 5 additions and 5 deletions

View File

@ -86,8 +86,8 @@
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<div class="flex-row align-items-center">
<el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope.row)">重试</el-button>
<el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope.row)">取消</el-button>
<el-button size="mini" v-if="scope.row.status.code !== 5 && scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope.row)">重试</el-button>
<el-button size="mini" v-if="scope.row.status.code !== 5 && scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope.row)">取消</el-button>
</div>
</template>
</el-table-column>

View File

@ -94,8 +94,8 @@
<template slot-scope="scope">
<div class="flex-row align-items-center">
<el-button size="mini" @click="handleDetail(scope)">明细</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleAgain(scope.row)">重试</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleCancel(scope.row)">取消</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 5 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleAgain(scope.row)">重试</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 5 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleCancel(scope.row)">取消</el-button>
</div>
</template>
</el-table-column>

View File

@ -59,7 +59,7 @@
<el-table-column prop="updateByName" label="发起人" show-overflow-tooltip ></el-table-column>
<el-table-column label="状态" show-overflow-tooltip >
<template slot-scope="scope">
<span v-if="scope.row.status.code != 3 && scope.row.status.code != 4">{{ scope.row.signStatus.desc }}</span>
<span v-if="scope.row.status.code != 3 && scope.row.status.code != 4 && scope.row.status.code != 5">{{ scope.row.signStatus.desc }}</span>
<span v-else>{{ scope.row.status.desc }}</span>
</template>
</el-table-column>