BaoBingLin
/
nrwms_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出库单添加是否AGV出库业务类型，目标点位

main
bbl\baobl 2024-03-12 13:08:57 +08:00
parent f56d162af3
commit 623e3acb39
2 changed files with 189 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/business-data/pick/index.vue
View File

@ -16,15 +16,15 @@
end-placeholder="erTimeStart"
class="date-item"
/>
<rrOperation :crud="crud" />
<rrOperation :crud="crud"/>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission" :tableKey="tableKey"/>
<!--表单组件-->
<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="small" label-width="80px">
<el-form-item label="单据类型ID">
<el-input v-model="form.billTypeId" style="width: 370px;" />
<el-form-item label="单据类型">
<el-input v-model="form.billType" style="width: 370px;" />
</el-form-item>
<el-form-item label="订单来源">
<el-input v-model="form.orderOrigin" style="width: 370px;" />
@ -66,15 +66,14 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table ref="table" border v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="billTypeId" label="单据类型ID" />
<el-table-column prop="orderOrigin" label="订单来源" />
<el-table-column prop="priority" label="优先级" />
<el-table-column prop="owner" label="货主" />
<el-table-column prop="relatedBill1" label="系统单号" />
<el-table-column prop="relatedBill2" label="客户订单号" />
<el-table-column prop="sourceName" label="来源名称" />
<el-table-column prop="billType.name" label="单据类型" />
<el-table-column prop="priority" label="优先级" />
<el-table-column prop="owner" label="货主" />
<el-table-column prop="address" label="整合地址" />
<el-table-column prop="status" label="订单状态">
<template slot-scope="scope">
{{ dict.label.pick_status[scope.row.status] }}
@ -105,7 +104,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { id: null, deptId: null, billTypeId: null, orderOrigin: null, priority: null, owner: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: null, address: null, dispatchDate: null, erTime: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
const defaultForm = { id: null, deptId: null, billType: null, orderOrigin: null, priority: null, owner: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: null, address: null, dispatchDate: null, erTime: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
export default {
name: 'Pick',
components: { pagination, crudOperation, rrOperation, udOperation },
@ -121,6 +120,7 @@ export default {
edit: ['admin', 'pick:edit'],
del: ['admin', 'pick:del']
},
tableKey: 'api/pick',
rules: {
},
queryTypeOptions: [

295
src/views/business-data/pickDetail/index.vue
View File

@ -5,16 +5,17 @@
<!-- 查询操作-->
<el-form ref="form" :inline="true" :model="form" label-width="70px">
<el-form-item label="物料编码">
<!-- <el-input v-model="query.itemCode" clearable placeholder="请输入物料编码" style="width: 140px;"-->
<!-- class="filter-item"-->
<!-- @keyup.enter.native="crud.toQuery"/>-->
<!-- <el-input v-model="query.itemCode" clearable placeholder="请输入物料编码" style="width: 140px;"-->
<!-- class="filter-item"-->
<!-- @keyup.enter.native="crud.toQuery"/>-->
<el-select v-model="query.itemCode" placeholder="物料代码" style="width: 140px;" class="filter-item">
<el-option
@keyup.enter.native="crud.toQuery"
v-for="item in this.itemListData"
:key="item.code"
:label="item.code"
:value="item.code">
:value="item.code"
@keyup.enter.native="crud.toQuery"
>
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
@ -22,39 +23,48 @@
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<el-input
v-model="query.itemName"
clearable
placeholder="请输入物料名称"
style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务号">
<el-input v-model="query.po" clearable placeholder="请输入任务号" style="width: 140px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<el-input
v-model="query.po"
clearable
placeholder="请输入任务号"
style="width: 140px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<date-range-picker v-model="query.createTime" class="date-item" style="width: 100px" />
<!-- 搜索-->
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
<!-- 重置-->
<el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
</el-button>
</el-form>
<div class="statusButton" style="border-bottom: solid lightgray 1px;">
<el-radio-group v-model="radio3" @change="clickChange" size="small">
<el-radio-group v-model="radio3" size="small" @change="clickChange">
<el-radio-button label="全部"> 全部</el-radio-button>
<el-radio-button label="打开"> 打开</el-radio-button>
<el-radio-button label="已分配">已分配</el-radio-button>
<el-radio-button label="拣货完成"> 拣货完成</el-radio-button>
</el-radio-group>
</div>
<!-- 业务操作-->
<crudOperation :permission="permission" :tableKey="this.$options.name">
<crudOperation :permission="permission" :table-key="tableKey">
<el-button
slot="right"
class="filter-item"
@ -94,11 +104,17 @@
</el-button>
</crudOperation>
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small"
style="width: 100%;"
height="58vh"
@selection-change="selectionChangeHandlerTwo">
<el-table-column type="selection" width="50"/>
<el-table
ref="table"
v-loading="crud.loading"
border
:data="crud.data"
size="small"
style="width: 100%;"
height="58vh"
@selection-change="selectionChangeHandlerTwo"
>
<el-table-column type="selection" width="50" />
<el-table-column
prop="date"
align="center"
@ -107,9 +123,7 @@
type="index"
width="50"
/>
<el-table-column prop="po" width="120" label="任务号"/>
<el-table-column prop="pick.relatedBill1" width="120" label="系统单号" />
<el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码">
<template slot-scope="scope">
<div>{{ scope.row.item.code }}</div>
@ -125,27 +139,42 @@
{{ dict.label.pick_status[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="orderQty" label="订单数量"/>
<el-table-column prop="allocatedQty" label="分配数量"/>
<el-table-column prop="pickedQty" label="拣货数量"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="propC1" label="中标批次名称" />
<el-table-column prop="propC2" label="成品物料编码" />
<el-table-column prop="propC3" :show-overflow-tooltip="true" label="序列号" />
<el-table-column prop="orderQty" label="订单数量" />
<el-table-column prop="allocatedQty" label="分配数量" />
<el-table-column prop="pickedQty" label="拣货数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="propC4" label="出库方式" />
<el-table-column prop="propC5" label="目标点位" />
<el-table-column prop="createBy" label="创建人"/>
<el-table-column prop="createTime" width="150px" label="创建时间"/>
<el-table-column label="操作" width="150px" align="center">
<el-table-column prop="createBy" label="创建人" />
<el-table-column prop="createTime" width="150px" label="创建时间" />
<el-table-column label="操作" width="150px" fixed="right" align="center">
<template slot-scope="scope">
<el-button size="mini" :disabled="scope.row.status!='OPEN'" type="primary" icon="el-icon-edit"
@click="editPick(scope.row)"/>
<el-button
size="mini"
:disabled="scope.row.status!='OPEN'"
type="primary"
icon="el-icon-edit"
@click="editPick(scope.row)"
/>
<template>
<el-popconfirm
title="确定删除吗？"
icon='el-icon-delete'
icon-color='red'
icon="el-icon-delete"
icon-color="red"
@confirm="deletePick(scope.row)"
>
<el-button slot="reference" :disabled="scope.row.status!='OPEN'" size="mini" type="danger"
icon="el-icon-delete"/>
<el-button
slot="reference"
:disabled="scope.row.status!='OPEN'"
size="mini"
type="danger"
icon="el-icon-delete"
/>
</el-popconfirm>
</template>
@ -153,15 +182,26 @@
</el-table-column>
</el-table>
<!--拣货确认界面-->
<PickTask ref="pickTask"/>
<PickTask ref="pickTask" />
<!--表单组件-->
<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="small" label-width="80px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="580px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="物料" prop="item">
<el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id"
style="width: 370px;">
<el-select
v-model="form.item"
filterable
placeholder="请选择物料"
value-key="id"
style="width: 405px;"
@focus="getItem"
>
<el-option
v-for="item in items"
:key="item.id"
@ -171,12 +211,38 @@
</el-select>
</el-form-item>
<el-form-item label="订单数量">
<el-input v-model="form.orderQty" style="width: 370px;"/>
<el-input v-model="form.orderQty" style="width: 135px;" />
</el-form-item>
<el-form-item label="中标批次名称">
<el-input v-model="form.propC1" style="width: 135px;" />
</el-form-item>
<el-form-item label="成品物料编码">
<el-input v-model="form.propC2" style="width: 135px;" />
</el-form-item>
<el-form-item label="序列号">
<el-input v-model="form.propC3" style="width: 135px;" />
</el-form-item>
<el-form-item label="业务类型">
<el-select
v-model="form.propC4"
size="small"
placeholder="业务类型"
class="filter-item"
style="width: 135px"
>
<el-option
v-for="item in dict.bill_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="目标点位">
<el-input v-model="form.propC5" style="width: 135px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 370px;"/>
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -188,7 +254,7 @@
<!--分页组件-->
<div style="float: right;">
<pagination/>
<pagination />
</div>
</div>
</div>
@ -196,18 +262,18 @@
<script>
import crudPickDetail from '@/api/pickDetail'
import CRUD, {presenter, header, form, crud} from '@crud/crud'
import CRUD, { presenter, header, form, crud } 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 {getItems, getItemsList} from "@/api/item"
import PickTask from "@/views/business-data/pickDetail/pickTicketTask.vue"
import DateRangePicker from "@/components/DateRangePicker/index.vue";
import { getItems, getItemsList } from '@/api/item'
import PickTask from '@/views/business-data/pickDetail/pickTicketTask.vue'
import DateRangePicker from '@/components/DateRangePicker/index.vue'
const defaultForm = {
id: null,
pickId: null,
pick: null,
item: null,
lineNo: null,
po: null,
@ -237,16 +303,16 @@ const defaultForm = {
}
export default {
name: 'PickDetail',
components: {DateRangePicker, PickTask, pagination, crudOperation, rrOperation, udOperation},
components: { DateRangePicker, PickTask, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['pick_status'],
dicts: ['pick_status', 'bill_type'],
cruds() {
return CRUD({
title: '出库明细',
url: 'api/pickDetail',
idField: 'id',
sort: 'id,desc',
crudMethod: {...crudPickDetail},
crudMethod: { ...crudPickDetail },
optShow: {
add: true,
edit: false,
@ -268,25 +334,25 @@ export default {
edit: ['admin', 'pickDetail:edit'],
del: ['admin', 'pickDetail:del']
},
tableKey: 'api/pickDetail',
rules: {
item: [
{required: true, message: '物料必填', trigger: 'blur'}
{ required: true, message: '物料必填', trigger: 'blur' }
]
},
queryTypeOptions: [
{key: 'itemCode', display_name: '物料编码'},
{key: 'itemName', display_name: '物料名称'},
{key: 'po', display_name: '任务号'},
{key: 'status', display_name: '状态'}
{ key: 'itemCode', display_name: '物料编码' },
{ key: 'itemName', display_name: '物料名称' },
{ key: 'po', display_name: '任务号' },
{ key: 'status', display_name: '状态' }
],
itemListData: []
}
},
mounted() {
//初始化数据
this.getItem();
this.itemDataGet();
// 初始化数据
this.getItem()
this.itemDataGet()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@ -295,7 +361,7 @@ export default {
},
getItem() {
getItems({}).then(res => {
this.items = res.content.map(function (obj) {
this.items = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
@ -306,37 +372,35 @@ export default {
selectionChangeHandlerTwo(val) {
this.crud.selections = val
if (this.crud.selections.length == 0) {
this.show_jh = true;
this.show_fp = true;
this.show_cancelfp = true;
return;
if (this.crud.selections.length === 0) {
this.show_jh = true
this.show_fp = true
this.show_cancelfp = true
return
}
const status = [];
const status = []
for (let i = 0; i < val.length; i++) {
status.push(this.crud.selections[i].status)
}
if (this.isAllEqual(status) && status[0] == "OPEN") {
this.show_jh = true;
this.show_fp = false;
return;
if (this.isAllEqual(status) && status[0] == 'OPEN') {
this.show_jh = true
this.show_fp = false
return
}
if (this.isAllEqual(status) && status[0] == "ALLOCATE") {
this.show_jh = true;
this.show_fp = true;
this.show_cancelfp = false;
if (this.isAllEqual(status) && status[0] == 'ALLOCATE') {
this.show_jh = true
this.show_fp = true
this.show_cancelfp = false
}
//拣货
// 拣货
if (this.crud.selections.length == 1 && this.crud.selections[0].orderQty == this.crud.selections[0].allocatedQty) {
this.show_jh = false;
this.show_fp = true;
return;
this.show_jh = false
this.show_fp = true
return
}
},
allocate(datas) {
this.$confirm(`选中的${datas.length}条数据分配确认?`, '提示', {
@ -344,22 +408,21 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const ids = [];
const ids = []
for (let i = 0; i < datas.length; i++) {
ids.push(datas[i].id)
}
console.log('ids:' + ids)
crudPickDetail.allocate(ids).then(res => {
this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
this.crud.toQuery();
this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(() => {
})
}).catch(() => {
this.$refs.table.clearSelection()
this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
});
this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
cancelAllocate(datas) {
this.$confirm(`选中的${datas.length}条数据取消分配确认?`, '提示', {
@ -367,47 +430,45 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const ids = [];
const ids = []
for (let i = 0; i < datas.length; i++) {
ids.push(datas[i].id)
}
crudPickDetail.cancelAllocate(ids).then(res => {
this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
this.crud.toQuery();
this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(() => {
})
}).catch(() => {
this.$refs.table.clearSelection()
this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
});
this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
getPickTask(id) {
this.$refs.pickTask.dialog = true
this.$refs.pickTask.queryPickTask(id)
},
shuaxin() {
this.crud.toQuery();
this.crud.toQuery()
},
clickChange(lab) {
if (lab === "全部") {
this.crud.resetQuery();
this.crud.toQuery();
} else if (lab === "打开") {
if (lab === '全部') {
this.crud.resetQuery()
this.crud.toQuery()
} else if (lab === '打开') {
this.query.status = 'OPEN'
this.crud.toQuery();
} else if (lab === "已分配") {
this.crud.toQuery()
} else if (lab === '已分配') {
this.query.status = 'ALLOCATE'
this.crud.toQuery();
} else if (lab === "拣货完成") {
this.crud.toQuery()
} else if (lab === '拣货完成') {
this.query.status = 'PICK_ALL'
this.crud.toQuery();
this.crud.toQuery()
}
},
resetQuery() {
this.radio3 = '全部';
this.radio3 = '全部'
this.crud.resetQuery()
},
editPick(data) {
@ -417,23 +478,23 @@ export default {
this.crud.doDelete(data)
}, isAllEqual(array) {
if (array.length > 0) {
return !array.some(function (value, index) {
return value !== array[0];
});
return !array.some(function(value, index) {
return value !== array[0]
})
} else {
return true;
return true
}
},
//物料数据
// 物料数据
itemDataGet() {
getItemsList().then(res => {
this.itemListData = res;
this.itemListData = res
}).catch(e => {
this.$message({
showClose: true,
message: '物料加载失败',
type: 'error'
});
})
})
}
}