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

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

@ -19,12 +19,12 @@
<rrOperation :crud="crud"/> <rrOperation :crud="crud"/>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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-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 ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="单据类型ID"> <el-form-item label="单据类型">
<el-input v-model="form.billTypeId" style="width: 370px;" /> <el-input v-model="form.billType" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="订单来源"> <el-form-item label="订单来源">
<el-input v-model="form.orderOrigin" style="width: 370px;" /> <el-input v-model="form.orderOrigin" style="width: 370px;" />
@ -66,15 +66,14 @@
</div> </div>
</el-dialog> </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 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="relatedBill1" label="系统单号" />
<el-table-column prop="relatedBill2" 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="订单状态"> <el-table-column prop="status" label="订单状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.pick_status[scope.row.status] }} {{ dict.label.pick_status[scope.row.status] }}
@ -105,7 +104,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' 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 { export default {
name: 'Pick', name: 'Pick',
components: { pagination, crudOperation, rrOperation, udOperation }, components: { pagination, crudOperation, rrOperation, udOperation },
@ -121,6 +120,7 @@ export default {
edit: ['admin', 'pick:edit'], edit: ['admin', 'pick:edit'],
del: ['admin', 'pick:del'] del: ['admin', 'pick:del']
}, },
tableKey: 'api/pick',
rules: { rules: {
}, },
queryTypeOptions: [ queryTypeOptions: [

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

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