|
|
@@ -36,7 +36,7 @@
|
|
|
@keyup.enter="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务结果：" prop="resultStatus">
|
|
|
- <el-select size="small" v-model="queryParams.resultStatus" placeholder="请选择交接单状态" clearable @change="handleQuery">
|
|
|
+ <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>
|
|
|
</el-form-item>
|
|
|
@@ -218,9 +218,7 @@
|
|
|
<div v-else>
|
|
|
<el-button link type="primary" size="small" @click="viewResult(scope.row,true)"
|
|
|
>{{resultLable(scope.row)}}</el-button>
|
|
|
- <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-if="scope.row.record !== null" v-hasPermi="['business:production:onceWork:perEdit']" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
+ <el-button v-if="null != scope.row.record" v-hasPermi="['business:production:onceWork:perEdit']" link type="primary" icon="Edit" size="small" style="margin: 0"
|
|
|
@click="viewResult(scope.row,false)" />
|
|
|
</div>
|
|
|
|
ly