From b44c4592b31a225e4abfcdd39d4f726b9f6f402d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Fri, 23 Aug 2024 15:54:46 +0800 Subject: [PATCH] no message --- src/api/point.js | 10 +++++++- src/views/business-data/pick/index.vue | 2 +- src/views/business-data/pickDetail/index.vue | 25 ++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/api/point.js b/src/api/point.js index 415c469..3284d41 100644 --- a/src/api/point.js +++ b/src/api/point.js @@ -104,5 +104,13 @@ export function multiAdjust(data) { data }) } +/* 查询单据类型,出库目标点位*/ +export function getPickEnd(billType) { + return request({ + url: 'api/point/getPickEnd', + method: 'post', + data: billType + }) +} -export default { add, edit, del,pointStockCk,getPoints,queryPointList ,fullStockIn,pointCallStock,fullStockOut,pointStockBack,multiAdjust,pointStockRk} +export default { add, edit, del,pointStockCk,getPoints,queryPointList ,fullStockIn,pointCallStock,fullStockOut,pointStockBack,multiAdjust,pointStockRk,getPickEnd} diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue index 72e0b4e..600d2b4 100644 --- a/src/views/business-data/pick/index.vue +++ b/src/views/business-data/pick/index.vue @@ -157,7 +157,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import {getBillType, getByPick } from "@/api/billType"; -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 } +const defaultForm = { id: null, deptId: null, billType: null, orderOrigin: null, priority: null, owner: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: 'OPEN', 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 }, diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue index 15735fe..901b749 100644 --- a/src/views/business-data/pickDetail/index.vue +++ b/src/views/business-data/pickDetail/index.vue @@ -231,7 +231,7 @@ style="width: 135px" > import crudPickDetail from '@/api/pickDetail' +import curdPoint from '@/api/point' import crudPick, { getPickList } from '@/api/pick' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' @@ -279,10 +280,10 @@ const defaultForm = { id: null, pick: { relatedBill1: null,id: null }, item: null, - lineNo: null, + lineNo: 1, po: null, status: 'OPEN', - orderQty: 0, + orderQty: 100, allocatedQty: 0, pickedQty: 0, shippedQty: 0, @@ -292,7 +293,7 @@ const defaultForm = { propC1: null, propC2: null, propC3: null, - propC4: null, + propC4: 'AGV_PT', propC5: null, propC6: null, propD1: null, @@ -309,7 +310,7 @@ export default { name: 'PickDetail', components: { DateRangePicker, PickTask, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['pick_status', 'bill_type'], + dicts: ['pick_status', 'bill_type_pt'], cruds() { return CRUD({ title: '出库明细', @@ -373,6 +374,8 @@ export default { this.getPicks() this.getBillType() this.defaultTableList() + /* 默认AGV出库,过滤目标点位*/ + this.getBillTypePt() }, methods: { // 钩子:在获取表格数据之前执行,false 则代表不获取数据 @@ -389,6 +392,18 @@ export default { }) }) }, + getBillTypePt(){ + const billCode=this.pick.billType.code; + curdPoint.getPickEnd({billCode}).then(res => { + const propC5s = res.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + defaultForm.propC5=propC5s[0].code + }) + }, getItem() { getItemsList({}).then(res => { this.items = res.map(function(obj) {