diff --git a/src/api/wms/inventorymoveRecordDetail/index.ts b/src/api/wms/inventorymoveRecordDetail/index.ts index 4a3928c30..8becf545e 100644 --- a/src/api/wms/inventorymoveRecordDetail/index.ts +++ b/src/api/wms/inventorymoveRecordDetail/index.ts @@ -73,4 +73,5 @@ export const exportInventorymoveRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-record-detail/get-import-template' }) -} \ No newline at end of file +} + diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 03e2f36a3..b096c3511 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -148,3 +148,14 @@ export const importTemplate = () => { export const importTemplateExceptMove = () => { return request.download({ url: '/wms/inventorymove-record-main/get-import-template-exceptMove' }) } + + +// 接收隔离收货 +export const receive = (id) => { + return request.put({ url: '/wms/inventorymove-record-main/receive?id=' + id }) +} + +// 拒收隔离收货 +export const refuse = (id) => { + return request.put({ url: '/wms/inventorymove-record-main/refuse?id=' + id }) +} \ No newline at end of file diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue index d90541a2a..882a4d953 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue @@ -149,7 +149,7 @@ const buttonBaseClick = (val, item) => { } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val.indexOf(row.status) > -1) { + if (val.indexOf(row.receiveStatus) > -1) { return false } else { return true @@ -197,20 +197,36 @@ const buttonTableClick = async (val, row) => { } } // 拒收 -const handleRefusal = async () => { +const handleRefusal = async (row) => { try { loadStart() // 接口 + InventorymoveRecordMainApi.refuse(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + buttonBaseClick('refresh',null) + }).catch(err => { + tableObject.loading = false + console.log(err) + }) } catch { } finally { loadDone() } } // 接收 -const handleRecept = async () => { +const handleRecept = async (row) => { try { loadStart() // 接口 + InventorymoveRecordMainApi.receive(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + buttonBaseClick('refresh',null) + }).catch(err => { + tableObject.loading = false + console.log(err) + }) } catch { } finally { loadDone() diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 0cca3e6b5..64c986e44 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -393,6 +393,15 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + if (!Array.isArray(searchData.filters)) { + searchData.filters = []; + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters