no message

main
暴炳林 2024-08-23 15:54:46 +08:00
parent cee9dce6db
commit b44c4592b3
3 changed files with 30 additions and 7 deletions

View File

@ -104,5 +104,13 @@ export function multiAdjust(data) {
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}

View File

@ -157,7 +157,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import {getBillType, getByPick } from "@/api/billType"; 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 { export default {
name: 'Pick', name: 'Pick',
components: { pagination, crudOperation, rrOperation, udOperation }, components: { pagination, crudOperation, rrOperation, udOperation },

View File

@ -231,7 +231,7 @@
style="width: 135px" style="width: 135px"
> >
<el-option <el-option
v-for="item in dict.bill_type" v-for="item in dict.bill_type_pt"
:key="item.id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@ -262,6 +262,7 @@
<script> <script>
import crudPickDetail from '@/api/pickDetail' import crudPickDetail from '@/api/pickDetail'
import curdPoint from '@/api/point'
import crudPick, { getPickList } from '@/api/pick' import crudPick, { getPickList } from '@/api/pick'
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 rrOperation from '@crud/RR.operation'
@ -279,10 +280,10 @@ const defaultForm = {
id: null, id: null,
pick: { relatedBill1: null,id: null }, pick: { relatedBill1: null,id: null },
item: null, item: null,
lineNo: null, lineNo: 1,
po: null, po: null,
status: 'OPEN', status: 'OPEN',
orderQty: 0, orderQty: 100,
allocatedQty: 0, allocatedQty: 0,
pickedQty: 0, pickedQty: 0,
shippedQty: 0, shippedQty: 0,
@ -292,7 +293,7 @@ const defaultForm = {
propC1: null, propC1: null,
propC2: null, propC2: null,
propC3: null, propC3: null,
propC4: null, propC4: 'AGV_PT',
propC5: null, propC5: null,
propC6: null, propC6: null,
propD1: null, propD1: null,
@ -309,7 +310,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', 'bill_type'], dicts: ['pick_status', 'bill_type_pt'],
cruds() { cruds() {
return CRUD({ return CRUD({
title: '出库明细', title: '出库明细',
@ -373,6 +374,8 @@ export default {
this.getPicks() this.getPicks()
this.getBillType() this.getBillType()
this.defaultTableList() this.defaultTableList()
/* 默认AGV出库过滤目标点位*/
this.getBillTypePt()
}, },
methods: { methods: {
// false // 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() { getItem() {
getItemsList({}).then(res => { getItemsList({}).then(res => {
this.items = res.map(function(obj) { this.items = res.map(function(obj) {