Merge pull request 'feat: 修改审核状态判断historyStates' (#31) from jie into test

Reviewed-on: #31
pull/41/head
lizijie 1 year ago
commit a88db14644

@ -275,7 +275,7 @@ function immersionHandler() {
function showAction() {
const item = taskDetailInfo.value;
if (item.states === 2 || item.states === 3) {
if (item.historyStates === 2 || item.historyStates === 3) {
return
}
if (batch.value === false) overTask.value = item;
@ -367,6 +367,7 @@ function doAudit(param: any) {
const { code } = res
setBatch(false)
if (code === 'OK') {
message.info(res.message)
emitter.emit('refresh')
refreshHandler()
}
@ -439,8 +440,8 @@ function reloadList() {
</div>
</div>
<div class="status">
<img v-show="taskDetailInfo?.states === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
<img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/not_pass.png"
<img v-show="taskDetailInfo?.historyStates === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
<img v-show="taskDetailInfo?.historyStates === 3" class="img-status" src="@/assets/images/task/not_pass.png"
alt="">
</div>
<!-- 右下信息 -->
@ -452,7 +453,7 @@ function reloadList() {
</span>
</n-gi>
<n-gi span="8" class="gi2">
<span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</span>
<span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</span>
<span class="label">审批状态</span>
</n-gi>
<n-gi span="4" class="gi1">
@ -487,15 +488,15 @@ function reloadList() {
<n-scrollbar style="max-height: 100%">
<n-ellipsis style="max-width: 350px">任务ID{{ taskDetailInfo.taskname }}</n-ellipsis>
<div class="tags">
<div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
<div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates]
}}</div>
<div class="tag tag-approve" v-else-if="taskDetailInfo.states == 2">{{
TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
<div class="tag tag-passed" v-else-if="taskDetailInfo.states == 3">{{
TASK_STATUS_OBJ[taskDetailInfo.states]
<div class="tag tag-approve" v-else-if="taskDetailInfo.historyStates == 2">{{
TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
<div class="tag tag-passed" v-else-if="taskDetailInfo.historyStates == 3">{{
TASK_STATUS_OBJ[taskDetailInfo.historyStates]
}}</div>
<div class="tag tag-approved" v-else-if="taskDetailInfo.states == 4">{{
TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
<div class="tag tag-approved" v-else-if="taskDetailInfo.historyStates == 4">{{
TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
</div>
<n-divider class="divider-line" />
<div class="property">

Loading…
Cancel
Save