diff --git a/src/api/qc/Inbound_notification.js b/src/api/qc/Inbound_notification.js index f29f5fa..2391341 100644 --- a/src/api/qc/Inbound_notification.js +++ b/src/api/qc/Inbound_notification.js @@ -4,6 +4,8 @@ import { createAPI } from "@/utils/httpRequest.js"; export const searchInboundNotification = data => createAPI('/inbound/searchInboundNotification','post',data) // 新增收获入库单 export const saveInboundNotification = data => createAPI('/inbound/saveInboundNotification','post',data) +// 编辑收获入库单 +export const updateInboundNotification = data => createAPI('/inbound/updateInboundNotification','post',data) // 删除收获入库单 export const deleteInboundNotification = data => createAPI('/inbound/deleteInboundNotification','post',data) // 关闭收获入库单 diff --git a/src/api/qc/outbound_notification.js b/src/api/qc/outbound_notification.js new file mode 100644 index 0000000..717b39e --- /dev/null +++ b/src/api/qc/outbound_notification.js @@ -0,0 +1,28 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 查询拣货出库单 +export const searchOutboundNotification = data => createAPI('/outbound/searchOutboundNotification','post',data) +// 新增拣货出库单 +export const saveOutboundNotification = data => createAPI('/outbound/saveOutboundNotification','post',data) +// 编辑拣货出库单 +export const updateOutboundNotification = data => createAPI('/outbound/updateOutboundNotification','post',data) +// 删除拣货出库单 +export const deleteOutboundNotification = data => createAPI('/outbound/deleteOutboundNotification','post',data) +// 关闭拣货出库单 +export const closeOutboundNotification = data => createAPI('/outbound/closeOutboundNotification','post',data) +// 下达拣货出库单 +export const issueOutboundNotification = data => createAPI('/outbound/issueOutboundNotification','post',data) + +// 查询拣货出库单明细 +export const getOutboundDetail = data => createAPI('/outbound/getOutboundDetail','post',data) +// 新增拣货出库单明细 +export const saveOutboundDetail = data => createAPI('/outbound/saveOutboundDetail','post',data) +// 查物料 +export const getOutboundPartList = data => createAPI('/outbound/getOutboundPartList','post',data) +// 删除拣货出库单明细 +export const deleteOutboundDetail = data => createAPI('/outbound/deleteOutboundDetail','post',data) +// 批量编辑明细 +export const updateOutboundDetail = data => createAPI('/outbound/updateOutboundDetail','post',data) +// 获取出库明细 +export const getOutboundDetail2 = data => createAPI('/outbound/getOutboundDetail2','post',data) + diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue index 22cf3ce..1f98395 100644 --- a/src/views/modules/qc/inboundNotification.vue +++ b/src/views/modules/qc/inboundNotification.vue @@ -13,7 +13,7 @@ - + @@ -589,6 +589,7 @@ import { searchInboundNotification, // 查询收获入库单 saveInboundNotification, // 新增收获入库单 + updateInboundNotification, // 编辑收获入库单 deleteInboundNotification, // 删除收获入库单 closeInboundNotification, // 关闭收获入库单 issueInboundNotification, // 下达收获入库单 @@ -607,10 +608,8 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import excel from "@/utils/excel-util.js" import {verifyData} from "@/api/chooselist/chooselist.js" - import qcSOPUploadFile from "./qc_SOP_upload_file" export default { components: { - qcSOPUploadFile, Chooselist, }, data () { @@ -620,8 +619,8 @@ favorite: false, // 导出 start exportData: [], - exportName: "根据物料设置检验模板" + this.dayjs().format('YYYYMMDDHHmmss'), - exportHeader: ["根据物料设置检验模板"], + exportName: "收货入库" + this.dayjs().format('YYYYMMDDHHmmss'), + exportHeader: ["收货入库"], exportFooter: [], exportList: [], // 导出 end @@ -632,7 +631,8 @@ userName: this.$store.state.user.name, orderNo: '', orderType: '', - orderStatus: '草稿', + orderStatus: '', + orderStatusList: ['草稿'], startDate: '', endDate: '', page: 1, @@ -1054,7 +1054,8 @@ menuId: this.$route.meta.menuId, tempWareHouseRow: {}, detailList2: [], - detailModal2: false + detailModal2: false, + currentRow: {} } }, @@ -1099,6 +1100,7 @@ getDataList () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex + this.searchData.orderStatus = this.searchData.orderStatusList.join(',') this.searchLoading = true searchInboundNotification(this.searchData).then(({data}) => { if (data.code === 0) { @@ -1193,18 +1195,40 @@ this.$message.warning('请选择BU！') return } + if (this.modalData.orderType === '' || this.modalData.orderType == null) { + this.$message.warning('请选择单据类型！') + return + } + if (this.modalData.requiredInboundDate === '' || this.modalData.requiredInboundDate == null) { + this.$message.warning('请选择要求入库日期！') + return + } this.saveLoading = true - saveInboundNotification(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.getDataList() - this.modalFlag = false - this.$message.success('操作成功') - } else { - this.$message.error(data.msg) - } - }).finally(()=>{ - this.saveLoading = false - }) + if (this.modalData.flag === '1') { // 新增 + saveInboundNotification(this.modalData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.modalFlag = false + this.$message.success('操作成功') + } else { + this.$message.error(data.msg) + } + }).finally(()=>{ + this.saveLoading = false + }) + } else { // 修改 + updateInboundNotification(this.modalData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.modalFlag = false + this.$message.success('操作成功') + } else { + this.$message.error(data.msg) + } + }).finally(()=>{ + this.saveLoading = false + }) + } }, // 删除 diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue new file mode 100644 index 0000000..582cd61 --- /dev/null +++ b/src/views/modules/qc/outboundNotification.vue @@ -0,0 +1,1707 @@ + + + +