diff --git a/src/api/inventory.js b/src/api/inventory.js index e3cf83a..b3b5b1c 100644 --- a/src/api/inventory.js +++ b/src/api/inventory.js @@ -24,6 +24,26 @@ export function updateInvQueuedQty(data) { }) } +//制造入库 +export function zzrkInv(data) { + return request({ + url: 'api/inventory/zzrkInv', + method: 'post', + data + }) +} + + +//箱单移位 +export function xdMoveInv(data) { + return request({ + url: 'api/inventory/xdMoveInv', + method: 'post', + data + }) +} + + export function del(ids) { return request({ url: 'api/inventory/', @@ -48,4 +68,11 @@ export function downloadXb(data) { }) } -export default { add, edit, del,knywInventory,downloadXb} +export function queryPickDetailXd(id) { + return request({ + url: 'api/inventory/queryPickDetailXd?pickDetailId='+id , + method: 'get' + }) +} + +export default { add, edit, del,knywInventory,downloadXb,queryPickDetailXd,zzrkInv} diff --git a/src/api/pickDetail.js b/src/api/pickDetail.js index 7de8f39..a46a7f6 100644 --- a/src/api/pickDetail.js +++ b/src/api/pickDetail.js @@ -40,9 +40,9 @@ export function allocatePickDetail(ids) { }) } -export function cancelAllocate(ids) { +export function cancelAllocatePickDetail(ids) { return request({ - url: 'api/pickDetail/cancelAllocate', + url: 'api/pickDetail/cancelAllocatePickDetail', method: 'post', data: ids }) @@ -91,4 +91,4 @@ export function zzjl(data) { }) } -export default { add, edit, del,allocatePickDetail,cancelAllocate,picking,pickBarBack,autoBcbl,sbPickdetail ,zzjl} +export default { add, edit, del,allocatePickDetail,picking,pickBarBack,autoBcbl,sbPickdetail ,zzjl} diff --git a/src/api/pickTicket.js b/src/api/pickTicket.js index 9062f2e..7a952de 100644 --- a/src/api/pickTicket.js +++ b/src/api/pickTicket.js @@ -27,7 +27,21 @@ export function add(data) { data }) } +export function xdckAllocate(data) { + return request({ + url: 'api/pickTicket/xdckAllocate', + method: 'post', + data + }) +} +export function xdckCancelAllocate(data) { + return request({ + url: 'api/pickTicket/xdckCancelAllocate', + method: 'post', + data + }) +} /** * 拣货操作 * @param data @@ -64,6 +78,19 @@ export function pickBatch(data) { data }) } + +/** + * 拣货操作-箱单拣货 + * @param data + * @returns {AxiosPromise} + */ +export function xdckPickOut(data) { + return request({ + url: 'api/pickTicket/xdckPickOut', + method: 'post', + data + }) +} /** * 拣货操作-单一 * @param data @@ -196,4 +223,4 @@ export function xdckPick(data) { }) } -export default { add, edit, del ,pickingOperations,queryDetails,shipmentRegistration,xppPickGoods,xbjsVerify,pickWhole,pickBatch,pickSingle,pickForXpp,xdckPick} +export default { add, edit, del ,xdckPickOut,xdckAllocate,xdckCancelAllocate,pickingOperations,queryDetails,shipmentRegistration,xppPickGoods,xbjsVerify,pickWhole,pickBatch,pickSingle,pickForXpp,xdckPick} diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue index 4898f30..5c09a44 100644 --- a/src/components/Crud/UD.operation.vue +++ b/src/components/Crud/UD.operation.vue @@ -2,20 +2,6 @@
- - 入场 - - - - - - 出场 - - - -

{{ msg }}

diff --git a/src/views/base-data/area/index.vue b/src/views/base-data/area/index.vue index 1944dda..5d7e716 100644 --- a/src/views/base-data/area/index.vue +++ b/src/views/base-data/area/index.vue @@ -64,23 +64,24 @@ - --> + + + + + + + + --> - - - - - - - +
@@ -101,12 +102,13 @@ - + + + --> - + - + + + @@ -146,9 +148,10 @@ - + - + + + + diff --git a/src/views/business-pick/pickDetailPlan/index.vue b/src/views/business-pick/pickDetailPlan/index.vue index 17c94cf..c5d936e 100644 --- a/src/views/business-pick/pickDetailPlan/index.vue +++ b/src/views/business-pick/pickDetailPlan/index.vue @@ -19,7 +19,7 @@ {{ item.name }} - - + --> - - + --> @@ -52,10 +52,10 @@ - +
@@ -93,8 +93,8 @@ type="success" icon="el-icon-edit" size="mini" - :disabled="show_fp" v-permission="permission.allocate" + :disabled="crud.selections.length <= 0||crud.selections[0].status != 'OPEN'" @click="allocateBtn(crud.selections)" > 审核 @@ -104,9 +104,9 @@ class="filter-item" type="success" size="mini" - :disabled="crud.selections.length != 1||crud.selections[0].status != 'ALLOCATE'" + :disabled="crud.selections.length<=0||crud.selections[0].status != 'ALLOCATE'" v-permission="permission.cancelPick" - @click="cancelPick(crud.selections[0])" + @click="cancelAllocateBtn(crud.selections)" > 取消审核 @@ -206,31 +206,6 @@ - - - - - - - - - - 确认 - - 取消 - - - - + @@ -526,9 +501,9 @@ {{ dict.label.pick_status[scope.row.status] }} - - + @@ -582,7 +557,7 @@ import crudPickTicket, { queryTaskLogDataS, xppPickGoods, pickStatusUpdate, - xdckPick,pickWhole + xdckPick,pickWhole,xdckAllocate,xdckCancelAllocate } from '@/api/pickTicket' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation.vue' @@ -879,16 +854,46 @@ export default { this.crud.toQuery() }) }, + //创建箱单出库 xdckBtn() { - crudPickTicket.xdckPick(this.xdckFrom.stockCode).then(res => { + xdckPick(this.xdckFrom.stockCode).then(res => { this.xdckVisible = false + this.$message.success(res) this.crud.toQuery() this.resetForm() - },e=>{ - this.xdckVisible=false; + + }).catch(() => { + }) + }, +//箱单出库分配 + allocateBtn(datas) { + console.log(datas) + let list = [] + for (const datum of datas) { + list.push(datum.id) + } + xdckAllocate(list).then(res => { + this.$message.success(res) + this.crud.toQuery() + }).catch(() => { }) }, + //箱单出库取消分配 + cancelAllocateBtn(datas) { + console.log(datas) + let list = [] + for (const datum of datas) { + list.push(datum.id) + } + xdckCancelAllocate(list).then(res => { + this.$message.success(res) + this.crud.toQuery() + }).catch(() => { + }) + }, + + //重置表单 resetForm() { this.$refs['xdckFrom'].resetFields() @@ -931,30 +936,7 @@ export default { return true } }, - allocateBtn(datas) { - this.$confirm(`选中${datas.length}条数据确认是否分配?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const ids = [] - for (let i = 0; i < datas.length; i++) { - ids.push(datas[i].id) - } - crudPickDetail.allocatePick(ids).then(res => { - this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - }).catch(() => { - this.crud.notify('分配失败！', CRUD.NOTIFICATION_TYPE.ERROR) - this.crud.toQuery() - }) - - }).catch(() => { - this.$refs.table.clearSelection() - this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - }) - }, pickStatusUpdateBtn(data){ this.loading_add=true; let ids = []; @@ -1189,16 +1171,6 @@ export default { }, queryData(id){ this.key=this.key+1; - // let data_ = {pickTicketId:null}; - // data_.pickTicketId=id; - // crudPickTicket.queryDetails(data.id).then(res=>{ - // //查询出库明细 - // this.viewDetailsDatas.outboundDetailsData = res.pickDetailList; - // //查询分配记录 - // this.viewDetailsDatas.allocationRecords = res.pickDetailAllocateList; - // //查询拣货记录 - // this.viewDetailsDatas.pickingRecords=res.pickDetailPickingList; - // }) } } } diff --git a/src/views/generic-component/BomAccountPointSelect.vue b/src/views/generic-component/BomAccountPointSelect.vue index 7297552..4f5508d 100644 --- a/src/views/generic-component/BomAccountPointSelect.vue +++ b/src/views/generic-component/BomAccountPointSelect.vue @@ -7,6 +7,7 @@ :value-key="valueKey" :style="style" @change="onChange" + :filterMethod="filterMethod" > { this.items = res + this.filteredItems = [...this.items]; }) } }, onChange(val) { - console.log(1111) this.$emit('change', val) - } + }, + filterMethod(query) { + if (!query) { + this.filteredItems = [...this.items]; + return; + } + + const lowerQuery = query.toLowerCase(); + this.items = this.filteredItems.filter(item => + item.zzkw_code.toLowerCase().includes(lowerQuery) || + item.item_code.toLowerCase().includes(lowerQuery) || + item.gw_code.toLowerCase().includes(lowerQuery) + ); + }, } } diff --git a/src/views/generic-component/PointSelect.vue b/src/views/generic-component/PointSelect.vue new file mode 100644 index 0000000..d564bd4 --- /dev/null +++ b/src/views/generic-component/PointSelect.vue @@ -0,0 +1,86 @@ + + +