lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 压制、烧制、冷却

Browse Source
This commit is contained in:
liyongde
2025-12-22 14:43:09 +08:00
parent 1332a4ea96
commit 80a63776c2
53 changed files with 2702 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/components/Crud/crud.js
View File

@@ -97,7 +97,7 @@ function CRUD(options) {
// 页码
page: 0,
// 每页数据条数
size: 20,
size: 10,
// 总数据条数
total: 0
},

134
lms/nladmin-ui/src/views/wms/pdm/kiln/index.vue Normal file
View File

@@ -0,0 +1,134 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="托盘编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="托盘类型">
<el-input v-model="form.vehicle_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="入干燥窑时间">
<el-input v-model="form.into_dry_kiln_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="出干燥窑时间">
<el-input v-model="form.out_dry_kiln_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="入冷却窑时间">
<el-input v-model="form.into_cooling_kiln_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="出冷却窑时间">
<el-input v-model="form.out_cooling_kiln_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="干燥窑号">
<el-input v-model="form.dry_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="冷却窑号">
<el-input v-model="form.cooling_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="状态">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="vehicle_code" label="托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'托盘编码')" />
<el-table-column prop="vehicle_type" label="托盘类型" :min-width="flexWidth('vehicle_type',crud.data,'托盘类型')">
<template slot-scope="scope">
{{ dict.label.record_vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="into_dry_kiln_time" label="入干燥窑时间" :min-width="flexWidth('into_dry_kiln_time',crud.data,'入干燥窑时间')" />
<el-table-column prop="out_dry_kiln_time" label="出干燥窑时间" :min-width="flexWidth('out_dry_kiln_time',crud.data,'出干燥窑时间')" />
<el-table-column prop="into_cooling_kiln_time" label="入冷却窑时间" :min-width="flexWidth('into_cooling_kiln_time',crud.data,'入冷却窑时间')" />
<el-table-column prop="out_cooling_kiln_time" label="出冷却窑时间" :min-width="flexWidth('out_cooling_kiln_time',crud.data,'出冷却窑时间')" />
<el-table-column prop="dry_code" label="干燥窑号" :min-width="flexWidth('dry_code',crud.data,'干燥窑号')" />
<el-table-column prop="dry_name" label="干燥窑名称" :min-width="flexWidth('dry_name',crud.data,'干燥窑名称')" />
<el-table-column prop="cooling_code" label="冷却窑号" :min-width="flexWidth('cooling_code',crud.data,'冷却窑号')" />
<el-table-column prop="cooling_name" label="冷却窑名称" :min-width="flexWidth('cooling_name',crud.data,'冷却窑名称')" />
<el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态（1：干燥窑、2：冷却窑、3：历史记录）')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudPdmBdKilnRecord from './pdmBdKilnRecord'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
record_id: null,
vehicle_code: null,
vehicle_type: null,
into_dry_kiln_time: null,
out_dry_kiln_time: null,
into_cooling_kiln_time: null,
out_cooling_kiln_time: null,
dry_code: null,
dry_name: null,
cooling_code: null,
cooling_name: null,
status: null,
create_time: null,
update_time: null
}
export default {
name: 'PdmBdKilnRecord',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['record_vehicle_type'],
cruds() {
return CRUD({
title: '窑信息历史记录',
url: 'api/pdmBdKilnRecord',
idField: 'record_id',
sort: 'record_id,desc',
crudMethod: { ...crudPdmBdKilnRecord }
})
},
data() {
return {
permission: {
},
rules: {
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
lms/nladmin-ui/src/views/wms/pdm/kiln/pdmBdKilnRecord.js Normal file
View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/pdmBdKilnRecord',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/pdmBdKilnRecord/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/pdmBdKilnRecord',
method: 'put',
data
})
}
export default { add, edit, del }

79
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -112,6 +112,28 @@
label-width="135px"
label-suffix=":"
>
<el-form-item label="所属工序" prop="region_code">
<el-select
v-model="form.region_code"
filterable
placeholder="请选择"
style="width: 240px;"
@change="setRegionName"
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_code"
:value="item.region_code"
>
<span style="float: left">{{ item.region_name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.region_code }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工序名称">
<el-input v-model="form.region_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item v-if="false" label="所属车间">
<el-select
v-model="form.workshop_code"
@@ -191,28 +213,6 @@
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="所属工序" prop="region_code">
<el-select
v-model="form.region_code"
filterable
placeholder="请选择"
style="width: 240px;"
@change="setRegionName"
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_code"
:value="item.region_code"
>
<span style="float: left">{{ item.region_name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.region_code }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工序名称">
<el-input v-model="form.region_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="设备编码" prop="point_code">
<el-select
v-model="form.point_code"
@@ -285,6 +285,13 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item v-if="form.region_code === 'FJ'" label="计划拆数">
<el-input-number
v-model.number="form.plan_weight"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item v-if="crud.status.edit && form.region_code === 'YZ'" label="实际重量">
<el-input-number
v-model.number="form.real_weight"
@@ -292,6 +299,13 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item v-if="crud.status.edit && form.region_code === 'FJ'" label="实际拆数">
<el-input-number
v-model.number="form.real_weight"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="form.vehicle_type"
@@ -308,6 +322,22 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.region_code === 'YZ'" label="工单类型">
<el-select
v-model="form.workorder_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 240px;"
>
<el-option
v-for="item in dict.order_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.region_code === 'YZ'" label="优先级">
<el-input-number
v-model.number="form.priority"
@@ -535,7 +565,7 @@ const defaultForm = {
region_name: null,
workorder_status: null,
is_needmove: true,
workorder_type: null,
workorder_type: '1',
passback_status: null,
workshop_code: null,
ext_id: null,
@@ -555,7 +585,7 @@ const defaultForm = {
}
export default {
name: 'PdmBdWorkorder',
dicts: ['vehicle_type', 'pdm_workorder_status'],
dicts: ['vehicle_type', 'pdm_workorder_status', 'order_type'],
components: { MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -683,6 +713,7 @@ export default {
this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code
this.form.plan_weight = row.total_material_qty == null ? 0 : row.total_material_qty
} else {
this.form.raw_material_name = row.material_name
this.form.raw_material_id = row.material_id

25
lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
View File

@@ -12,7 +12,7 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-width="85px"
>
<el-form-item label="物料名称">
<el-input
@@ -42,7 +42,7 @@
/>
</el-form-item>
<el-form-item :label="queryInfo">
<el-button icon="el-icon-sort" circle @click="queryMaterials"></el-button>
<el-button icon="el-icon-sort" circle @click="queryMaterials" />
</el-form-item>
<rrOperation />
</el-form>
@@ -75,7 +75,8 @@
<el-table-column prop="material_model" label="物料型号" width="140" />
<el-table-column prop="pack_method" label="包装方式" width="140" />
<el-table-column prop="pack_palletspec" label="包装规则" width="140" />
<el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" />
<el-table-column v-if="queryInfo === '库存顺序' || queryInfo === '冷却窑顺序'" prop="total_material_qty" label="物料总数/块" width="140" />
<el-table-column v-if="queryInfo === '冷却窑顺序'" prop="cooling_name" label="所在窑道" width="140" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
@@ -130,7 +131,7 @@ export default {
tableRadio: null,
tableData: [],
queryInfo: '物料顺序',
queryFlag: false
queryFlag: 1
}
},
watch: {
@@ -148,15 +149,19 @@ export default {
},
queryMaterials() {
this.queryFlag = !this.queryFlag
if (this.queryFlag) {
this.queryFlag = this.nextFlag(this.queryFlag)
if (this.queryFlag === 2) {
this.queryInfo = '库存顺序'
this.crud.url = 'api/pdmBdWorkorder/materials'
this.crud.toQuery()
} else {
} else if (this.queryFlag === 1) {
this.queryInfo = '物料顺序'
this.crud.url = 'api/mdBaseMaterial'
this.crud.toQuery()
} else {
this.queryInfo = '冷却窑顺序'
this.crud.url = 'api/pdmBdWorkorder/cooling'
this.crud.toQuery()
}
},
handleSelectionChange(val, row) {
@@ -189,6 +194,12 @@ export default {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows, this.flag)
},
nextFlag(queryFlag) {
if (queryFlag !== 3) {
return queryFlag + 1
}
return 1
}
}
}

306
lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -4,87 +4,151 @@
append-to-body
fullscreen
:visible.sync="dialogVisible"
class="view-dialog"
@open="open"
@close="close"
>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">点位信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="点位类型">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="点位状态">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="载具类型">
<el-input v-model="form.vehicle_type" style="width: 200px;"/>
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="载具数量">
<el-input v-model="form.vehicle_qty" style="width: 200px;"/>
</el-form-item>
<div class="dialog-content">
<!-- 点位信息卡片 -->
<el-card class="info-card" shadow="hover">
<div slot="header" class="card-header">
<i class="el-icon-location-information" />
<span class="card-title">点位信息</span>
</div>
<el-form
ref="form"
disabled
:model="form"
:rules="rules"
size="small"
label-width="110px"
class="detail-form"
>
<el-row :gutter="24">
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="区域编码">
<el-input v-model="form.region_code" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="区域名称">
<el-input v-model="form.region_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="点位编码">
<el-input v-model="form.point_code" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="点位名称">
<el-input v-model="form.point_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="点位类型">
<el-input v-model="form.point_type_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="点位状态">
<el-input v-model="form.point_status_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="载具类型">
<el-input v-model="form.vehicle_type" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="载具数量">
<el-input v-model="form.vehicle_qty" readonly />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</el-form>
</el-card>
<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">库存信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="groups" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="groups.material_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="groups.material_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="groups.material_spec" style="width: 200px;"/>
</el-form-item>
<el-form-item label="泥料编码">
<el-input v-model="groups.raw_material_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="groups.pcsn" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料数量">
<el-input v-model="groups.material_qty" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料重量">
<el-input v-model="groups.material_weight" style="width: 200px;"/>
</el-form-item>
<el-form-item label="设备">
<el-input v-model="groups.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="groups.instorage_time" style="width: 200px;"/>
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="groups.standing_time" style="width: 200px;"/>
</el-form-item>
<el-form-item label="绑定状态">
<el-input v-model="groups.group_bind_material_status_name" style="width: 200px;"/>
</el-form-item>
</el-form>
</el-card>
<!-- 库存信息卡片 -->
<el-card class="info-card" shadow="hover">
<div slot="header" class="card-header">
<i class="el-icon-box" />
<span class="card-title">库存信息</span>
</div>
<el-form
ref="inventoryForm"
disabled
:model="groups"
:rules="rules"
size="small"
label-width="110px"
class="detail-form"
>
<el-row :gutter="24">
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料编码">
<el-input v-model="groups.material_code" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料名称">
<el-input v-model="groups.material_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料规格">
<el-input v-model="groups.material_spec" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="泥料编码">
<el-input v-model="groups.raw_material_code" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料批次">
<el-input v-model="groups.pcsn" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料数量">
<el-input v-model="groups.material_qty" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="物料重量">
<el-input v-model="groups.material_weight" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="设备">
<el-input v-model="groups.point_name" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="入库时间">
<el-input v-model="groups.instorage_time" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="静置时间(分)">
<el-input v-model="groups.standing_time" readonly />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item label="绑定状态">
<el-input v-model="groups.group_bind_material_status_name" readonly />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
</el-dialog>
</template>
@@ -211,11 +275,91 @@ export default {
</script>
<style scoped>
::v-deep .el-card__header {
padding: 5px 0 5px 10px;
background-color: #f8f8f9;
.view-dialog ::v-deep .el-dialog__body {
padding: 20px;
background-color: #f5f7fa;
}
.dialog-content {
display: flex;
flex-direction: column;
gap: 20px;
}
.info-card {
border-radius: 8px;
transition: all 0.3s ease;
}
.info-card:hover {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
}
.card-header {
display: flex;
align-items: center;
padding: 0;
}
.card-header i {
font-size: 18px;
color: #409eff;
margin-right: 8px;
}
.card-title {
font-weight: 600;
font-size: 16px;
color: #303133;
}
::v-deep .el-card__header {
padding: 15px 20px;
background: linear-gradient(135deg, #f5f7fa 0%, #ffffff 100%);
border-bottom: 2px solid #e4e7ed;
}
::v-deep .el-card__body {
padding: 10px 0 10px 0;
padding: 20px;
}
.detail-form {
margin-top: 10px;
}
::v-deep .el-form-item {
margin-bottom: 18px;
}
::v-deep .el-form-item__label {
color: #606266;
font-weight: 500;
padding-right: 12px;
}
::v-deep .el-input.is-disabled .el-input__inner {
background-color: #f5f7fa;
border-color: #e4e7ed;
color: #606266;
cursor: default;
}
::v-deep .el-input__inner {
border-radius: 4px;
}
/* 响应式优化 */
@media (max-width: 768px) {
.view-dialog ::v-deep .el-dialog__body {
padding: 15px;
}
::v-deep .el-card__body {
padding: 15px;
}
.dialog-content {
gap: 15px;
}
}
</style>

37
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -32,12 +32,13 @@
</el-form-item>
<el-form-item label="任务名称">
<label slot="label">任务名称:</label>
<el-select v-model="query.config_code" placeholder="请选择" style="width: 240px" @change="crud.toQuery" clearable>
<el-select v-model="query.config_code" placeholder="请选择" style="width: 240px" clearable @change="crud.toQuery">
<el-option
v-for="item in taskConfigList"
:key="item.config_id"
:label="item.task_name"
:value="item.config_code">
:value="item.config_code"
>
<span style="float: left">{{ item.config_code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.task_name }}</span>
</el-option>
@@ -60,8 +61,8 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery">
</el-date-picker>
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-select
@@ -122,9 +123,9 @@
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item v-if="false" label="处理类">
<el-input v-model="form.handle_class" style="width: 240px;" />
</el-form-item>
@@ -184,7 +185,7 @@
{{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
</template>
</el-table-column>
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
<template slot-scope="scope">
{{ getStatusName(scope.row.task_status) }}
@@ -214,7 +215,7 @@
{{ dict.label.finished_type[scope.row.finished_type]?dict.label.finished_type[scope.row.finished_type]:'未完成' }}
</template>
</el-table-column>
<el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')" >
<el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')">
<template slot-scope="scope">
{{ dict.label.create_mode[scope.row.create_mode] }}
</template>
@@ -230,22 +231,22 @@
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-upload"-->
<!-- @click="doOperate(scope.row, 'c')"-->
<!-- >下发</el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-upload"-->
<!-- @click="doOperate(scope.row, 'c')"-->
<!-- >下发</el-button>-->
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
@click="doOperate(scope.row, 'a')"
>完成</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'"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
@@ -313,6 +314,10 @@ export default {
download: false,
reset: true
},
query: {
'more_task_status': '7',
'task_status': ['7']
},
crudMethod: { ...crudSchBaseTask }
})
},