root/stand_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复

Browse Source
This commit is contained in:
liyongde
2023-05-29 08:36:45 +08:00
parent 0e6defe5fe
commit 11991e46e6
43 changed files with 1128 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,25 +4,60 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">工单编号</label>
<el-input
v-model="query.workorder_code"
clearable
placeholder="工单编号"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<label class="el-form-item-label">设备编码</label>
<el-input
v-model="query.point_code"
clearable
placeholder="设备编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation :crud="crud" />
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="工单编号">
<el-input
v-model="query.workorder_code"
clearable
placeholder="工单编号"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="设备编码">
<el-input
v-model="query.point_code"
clearable
placeholder="设备编码"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery">
</el-date-picker>
</el-form-item>
<el-form-item label="工单状态">
<el-select
v-model="query.workorder_status"
multiple
placeholder="工单状态"
class="filter-item"
clearable
@change="handOrderStatus"
>
<el-option
v-for="item in dict.pdm_workorder_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
@@ -228,7 +263,11 @@
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column
prop="planproducestart_date"
label="计划开始时间"
@@ -254,8 +293,6 @@
label="静置时间(分钟)"
:min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
/>
<el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
<template slot-scope="scope">
{{ scope.row.is_needmove ? '是' : '否' }}
@@ -436,6 +473,13 @@ export default {
setPointName(data) {
var point = this.pointList.find(item => item.point_code === data)
this.form.point_name = point.point_name
},
handOrderStatus(value) {
this.crud.query.more_order_status = null
if (value) {
this.crud.query.more_order_status = value.toString()
}
this.crud.toQuery()
}
}
}

54
nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -25,6 +25,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="所属区域" prop="region_code">
<el-select
v-model="query.region_code"
placeholder="请选择"
@change="hand"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
@@ -34,6 +47,22 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="绑定状态">
<el-select
v-model="query.group_bind_material_status"
clearable
size="mini"
placeholder="绑定状态"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.group_bind_material_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -202,6 +231,11 @@
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
<el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
<el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'入库时间')">
<template slot-scope="scope">
{{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
</template>
</el-table-column>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
@@ -254,6 +288,7 @@ import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
import WorkOrderDialog from '@/views/wms/sch/group/WorkOrderDialog.vue'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
const defaultForm = {
group_id: null,
@@ -289,14 +324,14 @@ const defaultForm = {
}
export default {
name: 'VehicleMaterialGroup',
dicts: ['group_status'],
dicts: ['group_status', 'group_bind_material_status'],
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '组盘信息管理',
url: 'api/schBaseVehiclematerialgroup',
idField: 'vehicle_code',
idField: 'group_id',
sort: 'vehicle_code,desc',
optShow: {
add: true,
@@ -305,12 +340,16 @@ export default {
download: false,
reset: true
},
query: {
group_bind_material_status: '2'
},
crudMethod: { ...crudSchBaseVehiclematerialgroup }
})
},
created() {
this.getWorkShopList()
this.getPointList()
this.getRegionList()
},
data() {
return {
@@ -320,6 +359,7 @@ export default {
},
workShopList: [],
pointList: [],
regionList: [],
choose: '物料',
materialDialog: false,
workOrderDialog: false
@@ -335,6 +375,11 @@ export default {
this.workShopList = res
})
},
getRegionList() {
crudSchBaseRegion.getRegionList().then(res => {
this.regionList = res
})
},
getMaterial() {
if (this.choose === '物料') {
this.materialDialog = true
@@ -365,7 +410,10 @@ export default {
setPointName(data) {
var point = this.pointList.find(item => item.point_code === data)
this.form.point_name = point.point_name
}
},
hand(value) {
this.crud.toQuery()
},
}
}
</script>

10
nladmin-ui/src/views/wms/sch/group/schBaseVehiclematerialgroup.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function getGroup(data) {
return request({
url: 'api/schBaseVehiclematerialgroup/getGroup',
method: 'post',
data
})
}
export default { add, edit, del, getGroup }

183
nladmin-ui/src/views/wms/sch/interactivelog/index.vue Normal file
View File

@@ -0,0 +1,183 @@
<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.request_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 370px;" />
</el-form-item>
<el-form-item label="下发任务的请求参数">
<el-input v-model="form.response_param" style="width: 370px;" />
</el-form-item>
<el-form-item label="链路标识">
<el-input v-model="form.acs_trace_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="请求描述">
<el-input v-model="form.request_desc" style="width: 370px;" />
</el-form-item>
<el-form-item label="请求类型">
<el-input v-model="form.request_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否处理完成">
<el-input v-model="form.is_finish" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" 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="request_name"
label="请求名字"
:min-width="flexWidth('request_name',crud.data,'请求名字')"
/>
<el-table-column
prop="request_param"
label="生成任务的请求参数"
:min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')"
/>
<el-table-column
prop="response_param"
label="下发任务的请求参数"
:min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')"
/>
<el-table-column
prop="acs_trace_id"
label="链路标识"
:min-width="flexWidth('acs_trace_id',crud.data,'链路标识')"
/>
<el-table-column
prop="request_desc"
label="请求描述"
:min-width="flexWidth('request_desc',crud.data,'请求描述')"
/>
<el-table-column
prop="request_type"
label="请求类型"
:min-width="flexWidth('request_type',crud.data,'请求类型')"
/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column
prop="is_finish"
label="是否处理完成"
:min-width="flexWidth('is_finish',crud.data,'是否处理完成')"
/>
<el-table-column
prop="workshop_code"
label="车间编码"
:min-width="flexWidth('workshop_code',crud.data,'车间编码')"
/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column
prop="create_time"
label="创建时间"
:min-width="flexWidth('create_time',crud.data,'创建时间')"
/>
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',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 crudSchBaseAcsandlmsinteractivelog from './schBaseAcsandlmsinteractivelog'
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 = {
log_id: null,
request_name: null,
request_param: null,
response_param: null,
acs_trace_id: null,
request_desc: null,
request_type: null,
remark: null,
is_finish: null,
workshop_code: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
update_name: null,
update_time: null
}
export default {
name: 'InteractiveLog',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: 'ACS和LMS交互日志表',
url: 'api/schBaseAcsandlmsinteractivelog',
idField: 'log_id',
sort: 'log_id,desc',
crudMethod: { ...crudSchBaseAcsandlmsinteractivelog }
})
},
data() {
return {
permission: {},
rules: {}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js Normal file
View File

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

219
nladmin-ui/src/views/wms/sch/point/ViewDialog.vue Normal file
View File

@@ -0,0 +1,219 @@
<template>
<el-dialog
title="点位详情"
append-to-body
fullscreen
:visible.sync="dialogVisible"
@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>
</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.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-dialog>
</template>
<script>
import crudGroupVehicle from '@/views/wms/sch/group/schBaseVehiclematerialgroup'
import { crud } from '@crud/crud'
export default {
name: 'ViewDialog',
components: {},
dicts: ['group_bind_material_status'],
mixins: [crud()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
classes3: [],
parentData: {},
form: {
point_code: null,
point_name: null,
region_code: null,
region_name: null,
point_type: null,
point_status: null,
can_material_type: null,
can_vehicle_type: null,
vehicle_max_qty: null,
vehicle_type: null,
vehicle_code: null,
vehicle_qty: 0,
block_num: null,
row_num: null,
col_num: null,
layer_num: null,
in_order_seq: null,
out_order_seq: null,
in_empty_seq: null,
out_empty_seq: null,
parent_point_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
workshop_code: null,
is_auto: 'true',
remark: null,
is_used: 'true',
can_vehicle_types: null
},
groups: {
group_id: null,
vehicle_code: null,
material_id: null,
child_vehicle_code: null,
source_vehicle_code: null,
point_code: null,
point_name: null,
is_full: true,
pcsn: null,
instorage_time: null,
standing_time: null,
material_qty: null,
material_weight: null,
workorder_code: null,
group_number: null,
task_code: null,
ext_data: null,
workshop_code: null,
group_status: null,
table_name: null,
group_bind_material_status_name: null,
table_fk: null,
table_fk_id: null,
buss_move_id: null,
is_first_flow_task: true,
flow_code: null,
flow_num: null,
before_task_code: null,
next_task_code: null,
remark: null,
is_delete: false
},
workprocedureList: [],
tableData: [],
rules: {}
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
},
close() {
this.$emit('AddChanged')
},
setParentData(parentData) {
if (parentData) {
console.log(parentData)
this.dialogVisible = true
this.form = parentData
// 根据载具编码获取信息
const param = {
vehicle_code: parentData.vehicle_code,
vehicle_type: parentData.vehicle_type
}
crudGroupVehicle.getGroup(param).then(res => {
this.groups = res
})
}
}
}
}
</script>
<style scoped>
::v-deep .el-card__header {
padding: 5px 0 5px 10px;
background-color: #f8f8f9;
}
::v-deep .el-card__body {
padding: 10px 0 10px 0;
}
</style>

27
nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -281,18 +281,29 @@
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',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">
<el-table-column v-permission="[]" label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
/>
<el-button
v-if="showButton(scope.row.point_status)"
size="mini"
type="text"
icon="el-icon-view"
@click="toView(scope.row)"
>
查看详情
</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<ViewDialog ref="viewDialog"/>
</div>
</template>
@@ -305,6 +316,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue'
const defaultForm = {
point_code: null,
@@ -340,7 +352,7 @@ const defaultForm = {
export default {
name: 'SchBasePoint',
dicts: ['vehicle_type', 'TrueOrFalse'],
components: { pagination, crudOperation, rrOperation, udOperation },
components: { ViewDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -453,6 +465,17 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
showButton(point_status) {
if (point_status && point_status === '2') {
return true
}
return false
},
toView(row) {
if (row) {
this.$refs.viewDialog.setParentData(row)
}
}
}
}

28
nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -151,6 +151,20 @@
<el-form-item label="终点前缀">
<el-input v-model="form.next_region_pre" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务方向" prop="acs_task_type">
<el-select
v-model="form.task_direction"
size="mini"
placeholder="任务方向"
style="width: 240px;"
>
<el-option
v-for="item in dict.task_direction"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否校验工单">
<el-radio-group v-model="form.is_check_workorder" style="width: 240px">
<el-radio :label="true">是</el-radio>
@@ -211,6 +225,9 @@
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="路由编码" prop="config_code">
<el-input v-model="form.route_plan_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="未完成通知时间" prop="unfinish_notify_time">
<el-input-number
v-model.number="form.unfinish_notify_time"
@@ -272,6 +289,12 @@
</el-table-column>
<el-table-column prop="start_point_pre" label="起点前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点前缀')" />
<el-table-column prop="next_region_pre" label="终点前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点前缀')" />
<el-table-column prop="route_plan_code" label="路由编码" :min-width="flexWidth('route_plan_code',crud.data,'终点前缀')" />
<el-table-column prop="task_direction" label="任务方向" :min-width="flexWidth('task_direction',crud.data,'终点前缀')" >
<template slot-scope="scope">
{{ dict.label.task_direction[scope.row.task_direction] }}
</template>
</el-table-column>
<el-table-column prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')">
<template slot-scope="scope">
{{ scope.row.is_check_workorder?'是':'否' }}
@@ -354,6 +377,7 @@ import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
const defaultForm = {
config_id: null,
config_code: null,
config_name: null,
task_qf_type: null,
@@ -381,7 +405,9 @@ const defaultForm = {
is_group_congrol_issue_seq: false,
unfinish_notify_time: null,
sql_param: null,
route_plan_code: null,
workshop_code: null,
task_direction: null,
remark: null,
is_used: true,
is_delete: false,
@@ -390,7 +416,7 @@ const defaultForm = {
}
export default {
name: 'TaskConfig',
dicts: ['task_qf_type', 'acs_task_type'],
dicts: ['task_qf_type', 'acs_task_type', 'task_direction'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

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

@@ -39,43 +39,16 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="任务类型">-->
<!-- <treeselect-->
<!-- v-model="query.task_type"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes1"-->
<!-- style="width: 180px"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成方式">-->
<!-- <el-select-->
<!-- v-model="query.finished_type"-->
<!-- style="width: 180px"-->
<!-- placeholder="完成方式"-->
<!-- class="filter-item"-->
<!-- clearable-->
<!-- @change="hand"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in finishTypeList"-->
<!-- :key="item.code"-->
<!-- clearable-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@change="crud.toQuery">
</el-date-picker>
</el-form-item>
<el-form-item label="任务状态">
<el-select