|
|
@@ -35,7 +35,7 @@
|
|
|
<el-input size="small" v-model="queryParams.taskTypeName" style="width: 150px" placeholder="请输入项目" clearable
|
|
|
@keyup.enter="handleQuery" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="任务结果：" prop="resultStatus">
|
|
|
+ <el-form-item label="交接单状态：" prop="resultStatus">
|
|
|
<el-select size="small" v-model="queryParams.resultStatus" placeholder="请选择交接单状态" clearable @change="handleQuery">
|
|
|
<el-option v-for="item in resultStatus" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
|
@@ -210,7 +210,7 @@
|
|
|
{{rowNum(scope.row.arriveAmount)}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="交接单" align="center" min-width="140">
|
|
|
+ <el-table-column label="任务结果" align="center" min-width="140">
|
|
|
<template #default="scope">
|
|
|
<div v-if="scope.row.record == null || scope.row.record.status===0">
|
|
|
{{}}
|
|
|
@@ -218,9 +218,9 @@
|
|
|
<div v-else>
|
|
|
<el-button link type="primary" size="small" @click="viewResult(scope.row,true)"
|
|
|
>{{resultLable(scope.row)}}</el-button>
|
|
|
- <el-button v-hasNoPermi="['business:production:onceWork:perEdit']" v-if="(scope.row.record !== null && scope.row.record.status === 1) && scope.row.record.handlerId === useUserStore().user.userId" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
+ <el-button v-if="(scope.row.record !== null && scope.row.record.status===1) && scope.row.record.handlerId === useUserStore().user.userId" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
@click="viewResult(scope.row,false)" />
|
|
|
- <el-button v-hasPermi="['business:production:onceWork:perEdit']" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
+ <el-button v-if="scope.row.record !== null && scope.row.record.status === 3" v-hasPermi="['business:production:onceWork:perEdit']" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
@click="viewResult(scope.row,false)" />
|
|
|
</div>
|
|
|
|
ly