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

任务模块更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-27 10:32:25 +08:00
parent 3d021c44e7
commit 4ff5944d5d
47 changed files with 1639 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
@@ -19,6 +19,23 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="区域类型">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="getPointStatusAndTypeList"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型">
<el-select
v-model="query.point_type"
@@ -29,31 +46,12 @@
@change="hand"
>
<el-option
v-for="item in dict.sch_point_type"
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="区域类型">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in reginoList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
@@ -65,45 +63,68 @@
@change="hand"
>
<el-option
v-for="item in dict.sch_point_status"
v-for="item in pointStatusList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
v-model="query.lock_type"
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
<el-input
v-model="query.block_num"
clearable
size="mini"
placeholder="锁定类型"
class="filter-item"
placeholder="块"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="排">
<el-input
v-model="query.row_num"
clearable
size="mini"
placeholder="排"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="列">
<el-input
v-model="query.col_num"
clearable
size="mini"
placeholder="列"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="层">
<el-input
v-model="query.layer_num"
clearable
size="mini"
placeholder="层"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-switch
v-model="query.lock_type"
active-value="2"
inactive-value="1"
active-color="#409EFF"
inactive-color="#C0CCDA"
@change="hand"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<el-form-item label="是否启用">
<el-select
<el-switch
v-model="query.is_used"
clearable
size="mini"
placeholder="是否启用"
class="filter-item"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"
@change="hand"
>
<el-option
v-for="item in dict.is_used"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<rrOperation />
</el-form>
@@ -112,15 +133,52 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 0"
slot="right"
class="filter-item"
type="info"
:loading="syncLoading"
icon="el-icon-refresh"
size="mini"
@click="sync()"
type="primary"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 1)"
>
仓位同步
启用
</el-button>
<el-button
v-if="crud.query.is_used == 1"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 0)"
>
禁用
</el-button>
<el-button
v-if="crud.query.lock_type == 1"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 2)"
>
锁定
</el-button>
<el-button
v-if="crud.query.lock_type == 2"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 1)"
>
解锁
</el-button>
</crudOperation>
<!--表单组件-->
@@ -135,6 +193,20 @@
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
@change="getPointStatusAndTypeList"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
@@ -148,9 +220,10 @@
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
clearable
>
<el-option
v-for="item in dict.sch_point_status"
v-for="item in pointStatusList"
:label="item.label"
:value="item.value"
/>
@@ -171,16 +244,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备点位类型" prop="device_point_type">
<el-form-item label="点位类型" prop="device_point_type">
<el-select
v-model="form.device_point_type"
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.device_point_type"
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
@@ -189,51 +262,7 @@
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="是否专机" prop="is_host">
<el-radio-group v-model="form.is_host">
<el-radio
v-for="item in dict.IS_OR_NOT"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="点位类型" prop="point_type">
<el-radio-group v-model="form.point_type">
<el-radio
v-for="item in dict.sch_point_type"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in reginoList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位位置">
<el-select
v-model="form.point_location"
filterable
style="width: 370px"
class="filter-item"
>
<el-option
v-for="item in dict.point_location"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
@@ -255,37 +284,24 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="100" />
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="region_name" label="所属区域" width="110" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="taskdtl_type" label="锁定任务类型" width="110" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_code" label="锁定任务编码" width="100" />
<el-table-column prop="inv_code" label="锁定单据编码" width="130" />
<el-table-column prop="inv_type" label="锁定单据类型" width="110" :formatter="invtypeFormat" />
<el-table-column prop="vehicle_type" label="托盘类型">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="vehicle_type" label="是否专机">
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_host] }}
{{ scope.row.is_used=='1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
v-permission="[]"
@@ -309,39 +325,18 @@
</template>
<script>
import crudPoint, { changeActive } from '@/views/wms/sch/point/point'
import crudRegion from '@/views/wms/sch/region'
import crudPoint, { changeActive } from '@/views/wms/sch/point'
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 = {
device_point_type: null,
point_id: null,
is_host: null,
point_code: null,
point_name: null,
area_type: null,
point_type: '00',
point_status: '00',
lock_type: '00',
vehicle_code: null,
source_id: null,
remark: null,
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
point_location: null
}
const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'Point',
dicts: ['sch_point_type', 'point_location', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_OR_NOT', 'device_point_type'],
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -356,7 +351,6 @@ export default {
download: false,
reset: true
},
crudMethod: { ...crudPoint }
})
},
@@ -365,8 +359,10 @@ export default {
return {
syncLoading: false,
invtypelist: [],
pointStatusList: [],
pointTypesList: [],
options: [],
reginoList: [],
regionList: [],
permission: {},
rules: {
point_code: [
@@ -381,25 +377,16 @@ export default {
region_id: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
],
is_host: [
{ required: true, message: '是否专机不能为空', trigger: 'blur' }
]
}
}
},
created() {
/* checkoutbill.getInvTypes().then(res => {
this.invtypelist = res
})*/
crudPoint.getRegion().then(res => {
this.reginoList = res
this.regionList = res
})
},
methods: {
@@ -407,19 +394,14 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_id) {
this.getPointStatusAndTypeList(this.form.region_id)
}
},
hand(value) {
this.crud.toQuery()
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
invtypeFormat(row) {
for (const item of this.invtypelist) {
if (item.code === row.inv_type) {
return item.name
}
}
},
format_is_used(is_used) {
return is_used === '1'
},
@@ -442,14 +424,39 @@ export default {
}).catch(() => {
})
},
sync() {
this.syncLoading = true
crudPoint.syncStruct().then(() => {
getPointStatusAndTypeList(id) {
if (id) {
this.getPointStatusList(id)
this.getPointTypeList(id)
this.crud.toQuery()
}
},
getPointStatusList(id) {
crudRegion.getPointStatusSelectById(id).then(res => {
this.pointStatusList = res
})
},
getPointTypeList(id) {
crudRegion.getPointTypeSelectById(id).then(res => {
this.pointTypesList = res
})
},
changeUsed(data, flag) { // 更改启用状态
const param = {}
param.data = data
param.used = flag
crudPoint.changeUsed(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.syncLoading = false
}).catch(err => {
console.log(err.response.data.message)
this.crud.toQuery()
})
},
changeLock(data, flag) { // 更改锁定状态
const param = {}
param.data = data
param.lock_type = flag
crudPoint.changeLock(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}

26
lms/nladmin-ui/src/views/wms/sch/point/point.js
View File

@@ -23,14 +23,6 @@ export function edit(data) {
data
})
}
export function syncStruct() {
return request({
url: 'api/point/syncStruct',
method: 'put'
})
}
export function findPoints(area_type) {
return request({
url: 'api/point/area_type/' + area_type
@@ -60,4 +52,20 @@ export function getRegion() {
})
}
export default { add, edit, del, syncStruct, changeActive, findPoints, getPoint, getRegion }
export function changeUsed(data) {
return request({
url: 'api/point/changeUsed',
method: 'post',
data: data
})
}
export function changeLock(data) {
return request({
url: 'api/point/changeLock',
method: 'post',
data: data
})
}
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }

71
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -23,31 +23,23 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="区域编码" prop="region_code">
<el-input v-model="form.region_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="区域名称" prop="region_name">
<el-input v-model="form.region_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="form.product_area"
filterable
style="width: 370px"
class="filter-item"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item label="点位类型说明">
<el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位状态说明">
<el-input v-model="form.point_status_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-input v-model="form.remark" type="textarea" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -66,23 +58,13 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="region_id" label="区域标识" />
<el-table-column prop="region_code" label="区域编码" />
<el-table-column prop="region_name" label="区域名称" />
<el-table-column prop="region_code" label="区域编码" min-width="120" />
<el-table-column prop="region_name" label="区域名称" min-width="130" />
<el-table-column prop="point_type_explain" label="点位类型说明" min-width="150" />
<el-table-column prop="point_status_explain" label="点位状态说明" min-width="120" />
<el-table-column prop="remark" label="备注" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" min-width="140" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -99,7 +81,7 @@
</template>
<script>
import crudRegion, { changeActive } from '@/views/wms/sch/region/region'
import crudRegion, { changeActive } from '@/views/wms/sch/region'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -110,9 +92,7 @@ const defaultForm = {
region_id: null,
region_code: null,
region_name: null,
product_area: null,
remark: null,
is_used: null,
create_id: null,
create_name: null,
create_time: null,
@@ -124,7 +104,6 @@ export default {
name: 'Region',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['product_area'],
cruds() {
return CRUD({
title: '区域管理',
@@ -158,28 +137,6 @@ export default {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
format_is_used(is_used) {
return is_used === '1'
},
changeEnabled(data, val) {
let msg = '此操作将停用点位，是否继续！'
if (val !== '1') {
msg = '此操作将启用点位，是否继续！'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
}
}
}

18
lms/nladmin-ui/src/views/wms/sch/region/region.js
View File

@@ -32,4 +32,20 @@ export function changeActive(data) {
})
}
export default { add, edit, del, changeActive }
export function getPointStatusSelectById(id) {
return request({
url: 'api/region/getPointStatusSelectById',
method: 'post',
data: id
})
}
export function getPointTypeSelectById(id) {
return request({
url: 'api/region/getPointTypeSelectById',
method: 'post',
data: id
})
}
export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }

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

@@ -30,67 +30,22 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起始点位">
<el-form-item label="点位编码">
<el-input
v-model="query.start_point_code"
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="下一点位">
<el-input
v-model="query.next_point_code"
clearable
style="width: 180px"
placeholder="终点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务类型">
<el-select
<treeselect
v-model="query.task_type"
filterable
:load-options="loadChildNodes"
:options="classes1"
style="width: 180px"
placeholder="任务类型"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in dict.SCH_TASK_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务明细">
<el-select
v-model="query.taskdtl_type"
filterable
style="width: 180px"
placeholder="任务类型"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in dict.SCH_TASK_TYPE_DTL"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="完成方式">
@@ -112,6 +67,18 @@
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-select
v-model="query.task_status"
@@ -146,49 +113,59 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
<el-table-column prop="task_code" label="任务编码" />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column prop="taskdtl_type_name" label="任务明细" />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<!--
<el-table-column v-if="false" prop="finished_type" label="完成方式" />
-->
<!-- <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="85" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="point_code1" label="点位1" width="100" />
<el-table-column prop="point1_region_name" label="区域1" width="100" />
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
label="操作"
width="80px"
width="160px"
align="center"
>
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">下发</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
<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')"
>完成</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
</el-table>
@@ -204,7 +181,7 @@
<!-- 组件-->
<component
:is="currentComponent"
:task-uuid="taskdtl_id"
:task-uuid="task_id"
:dialog-visible="viewDialogVisible"
/>
<span slot="footer" class="dialog-footer">
@@ -216,28 +193,32 @@
</template>
<script>
import crudTask from '@/views/wms/sch/task/task'
import crudTask from '@/views/wms/sch/task'
import CRUD, { crud, 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'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/views/wms/basedata/master/class/classstandard'
export default {
name: 'Task',
dicts: ['SCH_TASK_TYPE', 'SCH_TASK_TYPE_DTL'],
dicts: ['acs_task_type', 'vehicle_type'],
components: {
pagination, crudOperation, rrOperation
pagination, crudOperation, rrOperation, Treeselect, udOperation
},
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '任务',
url: 'api/task',
idField: 'taskdtl_id',
sort: 'taskdtl_id,desc',
idField: 'task_id',
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', taskdtl_type: '', finished_type: '', task_status: ''
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
},
optShow: {
add: false,
@@ -252,7 +233,6 @@ export default {
return {
viewDialogVisible: false,
fullscreen: false,
taskdtl_id: '',
currentComponent: '',
openParam: {},
create_time: [],
@@ -262,10 +242,12 @@ export default {
permission: {
},
rules: {}
rules: {},
classes1: []
}
},
created() {
this.initClass1()
crudTask.getTaskStatus().then(data => {
this.taskStatusList = data
})
@@ -276,6 +258,42 @@ export default {
this.crud.toQuery()
},
methods: {
initClass1() {
const param = {
parent_class_code: 'task_type'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes1 = data
})
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
this.buildTree(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null // 重点代码
}
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
},
hand(value) {
this.crud.toQuery()
},
@@ -293,46 +311,28 @@ export default {
}
return ''
},
formatFinishTypeName(row, column) {
for (const item of this.finishTypeList) {
if (item.code === row.finished_type) {
return item.name
}
}
return ''
},
beforeHandleCommand(index, row, command) {
return {
'index': index,
'row': row,
'command': command
}
},
handleCommand(command) {
doOperate(row, command) {
let method_name = ''
switch (command.command) {
switch (command) {
case 'a':// 完成
method_name = 'forceFinish'
break
case 'b':// 取消
method_name = 'cancel'
break
case 'c':// 拉回
method_name = 'pullBack'
case 'c':// 下发
method_name = 'immediateNotifyAcs'
break
case 'd':// 下发
method_name = 'renotifyAcs'
break
case 'e':// 详情
case 'd':// 详情
method_name = 'view'
break
}
if (method_name === 'view') {
this.view(command.row)
this.view(row)
return
}
const data = {
task_id: command.row.task_id,
task_id: row.task_id,
method_name: method_name
}
crudTask.operation(data).then(res => {
@@ -343,7 +343,7 @@ export default {
})
},
view(row) {
this.taskdtl_id = row.taskdtl_id
this.task_id = row.task_id
switch (row.task_type) {
case '01':// 入库
this.fullscreen = true