diff --git a/src/api/pms/inventoryStock.js b/src/api/pms/inventoryStock.js new file mode 100644 index 0000000..84241f9 --- /dev/null +++ b/src/api/pms/inventoryStock.js @@ -0,0 +1,10 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 查询呆滞品/临期品库存列表 +export const queryStagnationExpiredStock = data => createAPI(`/pms/inventorystock/queryStagnationExpiredStock`, 'post', data); + +// 查询袋装明细列表 +export const queryPrintLabelBagList = data => createAPI(`/pms/inventorystock/queryPrintLabelBagList`, 'post', data); + +// 批量送检临期品 +export const batchSendExpiredForInspection = data => createAPI(`/pms/inventorystock/batchSendExpiredForInspection`, 'post', data); diff --git a/src/views/modules/qc/SQCResultEntry.vue b/src/views/modules/qc/SQCResultEntry.vue index 97aaef9..573ea42 100644 --- a/src/views/modules/qc/SQCResultEntry.vue +++ b/src/views/modules/qc/SQCResultEntry.vue @@ -161,12 +161,13 @@ fixed="right" header-align="center" align="center" - width="130" + width="200" label="操作"> @@ -288,9 +289,6 @@ - - 批次明细 -
0) { + this.saveInformationData.itemList.forEach(item => { + item.refInfo1 = this.detailData.refInfo1 + item.refInfo2 = this.detailData.refInfo2 + }) + } this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty @@ -2672,14 +2688,23 @@ getBaseData () {}, // 显示批次明细 - showBatchDetails () { - if (!this.detailData.refInfo1) { + showBatchDetails (row) { + const rowData = row || this.detailData + if (!rowData.refInfo1) { this.$message.warning('实验室单号(refInfo1)不能为空！') return } this.batchDetailLoading = true this.batchDetailFlag = true - getBatchDetailsByLaboratoryOrder({ laboratoryOrderNo: this.detailData.refInfo1 }).then(({data}) => { + const params = { + laboratoryOrderNo: rowData.refInfo1, + site: rowData.site, + partNo: rowData.partNo, + batchNo: rowData.batchNo, + warehouseId: rowData.warehouseId, + locationId: rowData.locationId + } + getBatchDetailsByLaboratoryOrder(params).then(({data}) => { this.batchDetailLoading = false if (data && data.code === 0) { this.batchDetailList = data.rows || [] @@ -2700,6 +2725,8 @@ created () { this.getButtonAuthData() this.disposalMeasuresSearch() + // 默认查询未开始和待检验状态 + this.searchData.states = ['未开始', '待检验'] if (!this.authSearch) { this.getDataList() } diff --git a/src/views/modules/qc/stagnationExpiredStock.vue b/src/views/modules/qc/stagnationExpiredStock.vue new file mode 100644 index 0000000..80f76c1 --- /dev/null +++ b/src/views/modules/qc/stagnationExpiredStock.vue @@ -0,0 +1,333 @@ + + + + +