区域、点位、任务管理基础功能;表数据结构更新;代码生成功能代码
This commit is contained in:
@@ -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
|
||||
@@ -53,4 +45,27 @@ export function getPoint(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, syncStruct, changeActive, findPoints, getPoint }
|
||||
export function getRegion() {
|
||||
return request({
|
||||
url: '/api/point/getRegion',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
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 }
|
||||
|
||||
@@ -32,21 +32,20 @@ export function changeActive(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export function getPointStatusSelectById(id) {
|
||||
export function getPointStatusSelectByCode(code) {
|
||||
return request({
|
||||
url: 'api/region/getPointStatusSelectById',
|
||||
url: 'api/region/getPointStatusSelectByCode',
|
||||
method: 'post',
|
||||
data: id
|
||||
data: code
|
||||
})
|
||||
}
|
||||
|
||||
export function getPointTypeSelectById(id) {
|
||||
export function getPointTypeSelectByCode(code) {
|
||||
return request({
|
||||
url: 'api/region/getPointTypeSelectById',
|
||||
url: 'api/region/getPointTypeSelectByCode',
|
||||
method: 'post',
|
||||
data: id
|
||||
data: code
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }
|
||||
export default { add, edit, del, changeActive, getPointStatusSelectByCode, getPointTypeSelectByCode }
|
||||
|
||||
155
mes/qd/src/views/wms/sch/point/MaterialDialog.vue
Normal file
155
mes/qd/src/views/wms/sch/point/MaterialDialog.vue
Normal file
@@ -0,0 +1,155 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="物料选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<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.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="物料名称"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
|
||||
@select="handleSelectionChange"
|
||||
@select-all="onSelectAll"
|
||||
@current-change="clickChange"
|
||||
>
|
||||
<el-table-column v-if="!isSingle" type="selection" width="55" />
|
||||
<el-table-column v-if="isSingle" label="选择" width="55">
|
||||
<template slot-scope="scope">
|
||||
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="material_code" label="物料编码" width="160" />
|
||||
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="140" />
|
||||
<el-table-column prop="material_model" label="物料型号" />
|
||||
<el-table-column prop="class_name" label="物料分类" width="140" />
|
||||
<el-table-column prop="unit_name" label="计量单位" />
|
||||
<el-table-column prop="standing_time" label="静置时间(分钟)" width="130px" />
|
||||
<el-table-column prop="product_series_name" label="系列" />
|
||||
<el-table-column prop="update_optname" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" width="135" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
|
||||
export default {
|
||||
name: 'MaterialDialog',
|
||||
components: { rrOperation, pagination },
|
||||
dicts: ['is_used'],
|
||||
cruds() {
|
||||
return CRUD({ title: '生产任务', url: 'api/Materialbase', optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
isSingle: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
tableRadio: null,
|
||||
tableData: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
clickChange(item) {
|
||||
this.tableRadio = item
|
||||
},
|
||||
open() {
|
||||
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
} else {
|
||||
this.checkrow = row
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
// 处理单选
|
||||
if (this.isSingle && this.tableRadio) {
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged3', this.tableRadio)
|
||||
return
|
||||
}
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料')
|
||||
return
|
||||
}
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged3', this.rows)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
212
mes/qd/src/views/wms/sch/point/ViewDialog.vue
Normal file
212
mes/qd/src/views/wms/sch/point/ViewDialog.vue
Normal file
@@ -0,0 +1,212 @@
|
||||
<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.lock_type_name" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="载具类型">
|
||||
<el-input v-model="form.lock_type_name" 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="form" :rules="rules" size="mini" label-width="100px">
|
||||
<el-form-item label="物料柜号">
|
||||
<el-input v-model="form.material_code" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
<el-input v-model="form.material_name" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="物料规格">
|
||||
<el-input v-model="form.material_spec" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料批次">
|
||||
<el-input v-model="form.pcsn" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="库存量">
|
||||
<el-input v-model="form.ivt_qty" 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.instorage_time" style="width: 200px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="静置时间(分)">
|
||||
<el-input v-model="form.standing_time" 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-table
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
style="width: 100%;"
|
||||
max-height="300"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column prop="device_code" label="设备编码" align="center"/>
|
||||
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
|
||||
<el-table-column prop="produce_qty" label="生产数量" align="center"/>
|
||||
<el-table-column prop="init_qty" label="期初数量" align="center"/>
|
||||
<el-table-column prop="finish_qty" label="期末数量" align="center"/>
|
||||
<el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
|
||||
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
|
||||
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
|
||||
<el-table-column prop="nick_name" label="操作人" align="center"/>
|
||||
</el-table>
|
||||
</el-card>-->
|
||||
<!--<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="dialogVisible = false">确定</el-button>
|
||||
</span>-->
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { crud } from '@crud/crud'
|
||||
|
||||
export default {
|
||||
name: 'ViewDialog',
|
||||
components: {},
|
||||
dicts: [],
|
||||
mixins: [crud()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
classes3: [],
|
||||
parentData: {},
|
||||
form: {
|
||||
sale_id: null,
|
||||
workorder_id: null,
|
||||
produceorder_code: null,
|
||||
producedeviceorder_code: null,
|
||||
shift_type_scode: null,
|
||||
workprocedure_id: null,
|
||||
produce_date: null,
|
||||
plan_qty: null,
|
||||
real_qty: null,
|
||||
material_id: null,
|
||||
material_code: null,
|
||||
material_weight: null,
|
||||
planproducestart_date: null,
|
||||
planproduceend_date: null,
|
||||
realproducestart_date: null,
|
||||
realproduceend_date: null,
|
||||
order_status: null,
|
||||
is_needmove: null,
|
||||
order_type_scode: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_optid: null,
|
||||
update_optname: null,
|
||||
update_time: null,
|
||||
sysdeptid: null,
|
||||
syscompanyid: null,
|
||||
is_delete: null,
|
||||
material_name: null,
|
||||
device_id: null,
|
||||
is_canupdate_update: null,
|
||||
material_spec: null
|
||||
},
|
||||
workprocedureList: [],
|
||||
tableData: [],
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
|
||||
},
|
||||
close() {
|
||||
this.$emit('AddChanged')
|
||||
},
|
||||
setParentData(parentData) {
|
||||
if (parentData) {
|
||||
this.dialogVisible = true
|
||||
this.form = parentData
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</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>
|
||||
158
mes/qd/src/views/wms/sch/point/WorkOrderDialog.vue
Normal file
158
mes/qd/src/views/wms/sch/point/WorkOrderDialog.vue
Normal file
@@ -0,0 +1,158 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="工单选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<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.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="物料名称"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
|
||||
@select="handleSelectionChange"
|
||||
@select-all="onSelectAll"
|
||||
@current-change="clickChange"
|
||||
>
|
||||
<el-table-column v-if="!isSingle" type="selection" width="55" />
|
||||
<el-table-column v-if="isSingle" label="选择" width="55">
|
||||
<template slot-scope="scope">
|
||||
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="workorder_code" label="工单编号" width="120px"/>
|
||||
<el-table-column v-if="false" prop="material_id" label="物料标识" />
|
||||
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="update_optname" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" width="150" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
|
||||
export default {
|
||||
name: 'WorkOrderDialog',
|
||||
components: { rrOperation, pagination },
|
||||
dicts: ['is_used', 'vehicle_type'],
|
||||
cruds() {
|
||||
return CRUD({ title: '生产工单', url: 'api/produceWorkorder', optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
isSingle: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
tableRadio: null,
|
||||
tableData: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
clickChange(item) {
|
||||
this.tableRadio = item
|
||||
},
|
||||
open() {
|
||||
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
} else {
|
||||
this.checkrow = row
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
// 处理单选
|
||||
if (this.isSingle && this.tableRadio) {
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged4', this.tableRadio)
|
||||
return
|
||||
}
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料')
|
||||
return
|
||||
}
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged4', this.rows)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -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_code"
|
||||
clearable
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="区域类型"
|
||||
class="filter-item"
|
||||
@change="getPointStatusAndTypeList(query.region_code, 1)"
|
||||
>
|
||||
<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-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.area_type"
|
||||
clearable
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="区域类型"
|
||||
class="filter-item"
|
||||
@change="hand"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.sch_area_type"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="点位状态">
|
||||
<el-select
|
||||
v-model="query.point_status"
|
||||
@@ -65,45 +63,80 @@
|
||||
@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="1"
|
||||
inactive-value="0"
|
||||
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 +145,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 == 0"
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-circle-check"
|
||||
:disabled="crud.selections.length === 0"
|
||||
@click="changeLock(crud.selections, 1)"
|
||||
>
|
||||
锁定
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="crud.query.lock_type == 1"
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-circle-close"
|
||||
:disabled="crud.selections.length === 0"
|
||||
@click="changeLock(crud.selections, 0)"
|
||||
>
|
||||
解锁
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表单组件-->
|
||||
@@ -129,28 +199,84 @@
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:title="crud.status.title"
|
||||
width="500px"
|
||||
width="540px"
|
||||
>
|
||||
<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="110px">
|
||||
<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_code">
|
||||
<el-select
|
||||
v-model="form.region_code"
|
||||
placeholder="请选择"
|
||||
style="width: 370px;"
|
||||
@change="getPointStatusAndTypeList(form.region_code, 2)"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in regionList"
|
||||
:label="item.region_name"
|
||||
:value="item.region_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一区域" prop="pre_region_code">
|
||||
<el-select
|
||||
v-model="form.pre_region_code"
|
||||
placeholder="请选择"
|
||||
style="width: 370px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in regionList"
|
||||
:label="item.region_name"
|
||||
:value="item.region_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="下一区域" prop="next_region_code">
|
||||
<el-select
|
||||
v-model="form.next_region_code"
|
||||
placeholder="请选择"
|
||||
style="width: 370px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in regionList"
|
||||
:label="item.region_name"
|
||||
:value="item.region_code"
|
||||
/>
|
||||
</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-input v-model="form.point_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位名称" prop="point_name">
|
||||
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
|
||||
<el-input v-model="form.point_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位状态" prop="point_status">
|
||||
<el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
|
||||
<el-select
|
||||
v-model="form.point_status"
|
||||
size="mini"
|
||||
placeholder="点位状态"
|
||||
class="filter-item"
|
||||
style="width: 370px;"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.sch_point_status"
|
||||
v-for="item in pointStatusDialogList"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="点位位置" prop="point_location">
|
||||
<el-select
|
||||
v-model="form.point_location"
|
||||
size="mini"
|
||||
placeholder="点位位置"
|
||||
class="filter-item"
|
||||
style="width: 370px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.point_location"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
@@ -171,32 +297,60 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<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="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="area_type">
|
||||
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
|
||||
<el-select
|
||||
v-model="form.area_type"
|
||||
placeholder="请选择"
|
||||
v-model="form.point_type"
|
||||
size="mini"
|
||||
placeholder="设备点位类型"
|
||||
class="filter-item"
|
||||
style="width: 370px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.sch_area_type"
|
||||
v-for="item in pointTypesDialogList"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
|
||||
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="已放载具类型" prop="vehicle_type">
|
||||
<!-- <el-input v-model="" clearable style="width: 370px;" />-->
|
||||
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
|
||||
<el-option
|
||||
v-for="item in dict.storagevehicle_type"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="可放载具类型" prop="can_vehicle_types">
|
||||
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" style="width: 370px;">
|
||||
<el-option
|
||||
v-for="item in dict.storagevehicle_type"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">-->
|
||||
<!-- <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item v-if="form.point_status === '3'" label="物料来源">
|
||||
<el-radio-group v-model="choose" size="mini">
|
||||
<el-radio-button label="物料" />
|
||||
<el-radio-button label="工单" />
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="false" label="物料名称" prop="vehicle_code">
|
||||
<el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
|
||||
<el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
|
||||
</el-form-item>
|
||||
@@ -216,28 +370,38 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<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="point_code" label="点位编码" sortable width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
|
||||
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="point_location" label="位置">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.point_location ? '下' : '上' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="pre_region_name" label="上一区域" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="next_region_name" label="下一区域" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="material_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="area_type_name" label="所属区域" width="110" />
|
||||
<el-table-column prop="vehicle_code" label="载具编码" />
|
||||
<el-table-column label="是否启用" align="center" prop="is_used">
|
||||
<el-table-column prop="vehicle_type" label="载具类型" min-width="120">
|
||||
<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)"
|
||||
/>
|
||||
{{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
|
||||
</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="update_by" label="修改者" />
|
||||
<el-table-column prop="vehicle_code" label="载具编码" min-width="120"/>
|
||||
<el-table-column prop="vehicle_qty" label="载具数量" />
|
||||
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="is_used" label="是否启用">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.is_used == '1' ? '是' : '否' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="update_name" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" width="150" />
|
||||
<el-table-column
|
||||
v-permission="[]"
|
||||
@@ -257,23 +421,70 @@
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged" />
|
||||
<WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged" />
|
||||
<ViewDialog ref="viewDialog" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudRegion from '@/api/wms/sch/region'
|
||||
import crudPoint, { changeActive } from '@/api/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'
|
||||
/*import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill'*/
|
||||
import ViewDialog from '@/views/wms/sch/point/ViewDialog'
|
||||
import MaterialDialog from '@/views/wms/sch/point/MaterialDialog'
|
||||
import WorkOrderDialog from '@/views/wms/sch/point/WorkOrderDialog'
|
||||
|
||||
const defaultForm = { point_id: 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 }
|
||||
const defaultForm = {
|
||||
point_id: null,
|
||||
point_code: null,
|
||||
point_name: null,
|
||||
product_area: null,
|
||||
region_code: null,
|
||||
pre_region_code: null,
|
||||
next_region_code: null,
|
||||
point_type: null,
|
||||
point_status: null,
|
||||
lock_type: '0',
|
||||
material_id: null,
|
||||
material_code: null,
|
||||
device_code: null,
|
||||
can_vehicle_type: null,
|
||||
can_vehicle_types: null,
|
||||
vehicle_max_qty: null,
|
||||
vehicle_type: null,
|
||||
vehicle_code: null,
|
||||
vehicle_qty: null,
|
||||
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,
|
||||
point_group_code: null,
|
||||
task_id: null,
|
||||
point_location: null,
|
||||
remark: null,
|
||||
source_id: null,
|
||||
is_used: null,
|
||||
is_delete: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'Point',
|
||||
dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL'],
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location'],
|
||||
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
@@ -287,7 +498,6 @@ export default {
|
||||
download: false,
|
||||
reset: true
|
||||
},
|
||||
|
||||
crudMethod: { ...crudPoint }
|
||||
})
|
||||
},
|
||||
@@ -295,8 +505,16 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
syncLoading: false,
|
||||
materialDialog: false,
|
||||
workOrderDialog: false,
|
||||
choose: '物料',
|
||||
invtypelist: [],
|
||||
pointStatusList: [],
|
||||
pointStatusDialogList: [],
|
||||
pointTypesList: [],
|
||||
pointTypesDialogList: [],
|
||||
options: [],
|
||||
regionList: [],
|
||||
permission: {},
|
||||
rules: {
|
||||
point_code: [
|
||||
@@ -308,42 +526,43 @@ export default {
|
||||
point_type: [
|
||||
{ required: true, message: '点位类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
area_type: [
|
||||
region_code: [
|
||||
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
point_status: [
|
||||
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
|
||||
pre_region_code: [
|
||||
{ required: true, message: '上一区域类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
next_region_code: [
|
||||
{ required: true, message: '下一区域类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
lock_type: [
|
||||
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
can_vehicle_types: [
|
||||
{ required: true, message: '载具存放类型不能为空', trigger: 'blur' }
|
||||
]
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
/* checkoutbill.getInvTypes().then(res => {
|
||||
this.invtypelist = res
|
||||
})*/
|
||||
crudPoint.getRegion().then(res => {
|
||||
this.regionList = res
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
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
|
||||
}
|
||||
[CRUD.HOOK.afterToCU]() {
|
||||
if (this.form.region_code) {
|
||||
this.getPointStatusAndTypeList(this.form.region_code, 2)
|
||||
}
|
||||
},
|
||||
hand() {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
format_is_used(is_used) {
|
||||
return is_used === '1'
|
||||
},
|
||||
@@ -366,17 +585,68 @@ export default {
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
sync() {
|
||||
this.syncLoading = true
|
||||
crudPoint.syncStruct().then(() => {
|
||||
getPointStatusAndTypeList(code, flag) {
|
||||
if (code) {
|
||||
this.getPointStatusList(code, flag)
|
||||
this.getPointTypeList(code, flag)
|
||||
}
|
||||
if (flag === 1) {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.syncLoading = false
|
||||
}).catch(err => {
|
||||
console.log(err.response.data.message)
|
||||
}
|
||||
},
|
||||
getPointStatusList(code, flag) {
|
||||
crudRegion.getPointStatusSelectByCode(code).then(res => {
|
||||
if (flag === 1) {
|
||||
this.pointStatusList = res
|
||||
} else {
|
||||
this.pointStatusDialogList = res
|
||||
}
|
||||
})
|
||||
},
|
||||
getPointTypeList(code, flag) {
|
||||
crudRegion.getPointTypeSelectByCode(code).then(res => {
|
||||
if (flag === 1) {
|
||||
this.pointTypesList = res
|
||||
} else {
|
||||
this.pointTypesDialogList = 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.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()
|
||||
})
|
||||
},
|
||||
toView(row) {
|
||||
debugger
|
||||
if (row) {
|
||||
this.$refs.viewDialog.setParentData(row)
|
||||
}
|
||||
},
|
||||
getMaterial() {
|
||||
if (this.choose == '物料') {
|
||||
this.materialDialog = true
|
||||
} else {
|
||||
this.workOrderDialog = true
|
||||
}
|
||||
},
|
||||
tableChanged(row) {
|
||||
this.form.material_name = row.material_name
|
||||
this.form.material_id = row.material_id
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -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
|
||||
filterable
|
||||
<treeselect
|
||||
v-model="query.task_type"
|
||||
: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
|
||||
filterable
|
||||
v-model="query.taskdtl_type"
|
||||
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,17 @@
|
||||
</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
|
||||
@@ -147,49 +113,68 @@
|
||||
@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 prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.task_finished_type[scope.row.finished_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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="product_area" 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="remark" label="备注" width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="update_by" label="修改者" v-if="false"/>
|
||||
<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="point_code1" label="起点" width="100" />
|
||||
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
|
||||
<el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="point_code3" label="等待点" min-width="100" show-overflow-tooltip />-->
|
||||
<!-- <el-table-column prop="point3_region_name" label="等待点区域" 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_code4" label="点位4" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
|
||||
<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,'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,'d')">重发</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>
|
||||
@@ -203,11 +188,11 @@
|
||||
width="30%"
|
||||
>
|
||||
<!-- 组件-->
|
||||
<component
|
||||
:is="currentComponent"
|
||||
:task-uuid="taskdtl_id"
|
||||
:dialog-visible="viewDialogVisible"
|
||||
/>
|
||||
<!-- <component-->
|
||||
<!-- :is="currentComponent"-->
|
||||
<!-- :task-uuid="task_id"-->
|
||||
<!-- :dialog-visible="viewDialogVisible"-->
|
||||
<!-- />-->
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="viewDialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
|
||||
@@ -221,24 +206,34 @@ import crudTask from '@/api/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 '@/api/wms/basedata/master/classstandard'
|
||||
|
||||
export default {
|
||||
name: 'Task',
|
||||
dicts: ['SCH_TASK_TYPE', 'SCH_TASK_TYPE_DTL'],
|
||||
dicts: ['acs_task_type', 'vehicle_type', 'task_finished_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,
|
||||
@@ -253,7 +248,6 @@ export default {
|
||||
return {
|
||||
viewDialogVisible: false,
|
||||
fullscreen: false,
|
||||
taskdtl_id: '',
|
||||
currentComponent: '',
|
||||
openParam: {},
|
||||
create_time: [],
|
||||
@@ -263,26 +257,65 @@ export default {
|
||||
permission: {
|
||||
|
||||
},
|
||||
rules: {}
|
||||
rules: {},
|
||||
classes1: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.initClass1()
|
||||
crudTask.getTaskStatus().then(data => {
|
||||
this.taskStatusList = data
|
||||
})
|
||||
crudTask.getFinishType().then(data => {
|
||||
this.finishTypeList = data
|
||||
})
|
||||
this.crud.query.task_status = ['-1']
|
||||
this.crud.toQuery()
|
||||
// this.crud.query.task_status = ['-1']
|
||||
// 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()
|
||||
},
|
||||
handTaskStatus(value) {
|
||||
this.crud.query.more_task_status = null
|
||||
if (value) {
|
||||
this.query.task_status = this.task_status.toString()
|
||||
this.crud.query.more_task_status = value.toString()
|
||||
}
|
||||
this.crud.toQuery()
|
||||
},
|
||||
@@ -294,46 +327,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 = {
|
||||
taskdtl_id: command.row.taskdtl_id,
|
||||
task_id: row.task_id,
|
||||
method_name: method_name
|
||||
}
|
||||
crudTask.operation(data).then(res => {
|
||||
@@ -344,7 +359,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
|
||||
|
||||
Reference in New Issue
Block a user