rev:出入库流程兼容

This commit is contained in:
zhangzq
2024-06-03 10:09:04 +08:00
parent e446f8b743
commit a243c910ce
85 changed files with 741 additions and 301 deletions

View File

@@ -54,7 +54,7 @@
</el-form-item>
<el-form-item label="任务状态">
<el-select
v-model="query.task_status"
v-model="query.status"
multiple
style="width: 360px"
placeholder="任务状态"
@@ -84,7 +84,7 @@
<el-input v-model="form.task_code" style="width: 240px;"/>
</el-form-item>
<el-form-item label="任务状态">
<el-input v-model="form.task_status" style="width: 240px;"/>
<el-input v-model="form.status" style="width: 240px;"/>
</el-form-item>
<el-form-item label="点位1">
<el-input v-model="form.point_code1" style="width: 240px;"/>
@@ -127,9 +127,9 @@
<el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码"/>
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型"/>
<el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
<el-table-column prop="task_status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
<el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
<template slot-scope="scope">
{{ getStatusName(scope.row.task_status) }}
{{ getStatusName(scope.row.status) }}
</template>
</el-table-column>
<el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤"/>
@@ -157,14 +157,14 @@
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
:disabled="scope.row.status==='5' || scope.row.status==='6'"
>完成
</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
:disabled="scope.row.status==='5' || scope.row.status==='6'"
>取消
</el-button>
</template>
@@ -193,7 +193,7 @@ const defaultForm = {
task_code: null,
task_type: null,
acs_type: null,
task_status: null,
status: null,
task_step: null,
group_code: null,
point_code1: null,
@@ -250,9 +250,9 @@ export default {
this.crud.toQuery()
},
handTaskStatus(value) {
this.crud.query.more_task_status = null
this.crud.query.more_status = null
if (value) {
this.crud.query.more_task_status = value.toString()
this.crud.query.more_status = value.toString()
}
this.crud.toQuery()
},