diff --git a/src/api/warehouse/countingReport.js b/src/api/warehouse/countingReport.js new file mode 100644 index 0000000..f806935 --- /dev/null +++ b/src/api/warehouse/countingReport.js @@ -0,0 +1,102 @@ +import http from '@/utils/httpRequest' + +/** + * 查询盘点单列表 + */ +export function countingReportList(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/list'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 根据主键查询盘点单 + */ +export function countingReportInfo(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/info'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 新增盘点单 + */ +export function countingReportSave(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/save'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 修改盘点单 + */ +export function countingReportUpdate(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/update'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 删除盘点单 + */ +export function countingReportDelete(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/delete'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 批量删除盘点单 + */ +export function countingReportBatchDelete(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/batchDelete'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 更新盘点单状态 + */ +export function countingReportUpdateStatus(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/updateStatus'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 批量更新盘点单状态（审核） + */ +export function countingReportBatchUpdateStatus(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/batchUpdateStatus'), + method: 'post', + data: http.adornData(data) + }) +} + +/** + * 查询盘点单明细列表 + */ +export function countingReportDetailList(data) { + return http({ + url: http.adornUrl('/warehouse/countingReport/detailList'), + method: 'post', + data: http.adornData(data) + }) +} + + diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 24bfe81..c7e19e7 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -589,9 +589,14 @@ - - - + + + + + + + + @@ -2815,7 +2820,7 @@ this.modalData.rollNo = item.value this.modalData.seqNo = item.seqNo this.modalData.orderNo = item.orderNo - this.getOperationList() + //this.getOperationList() }, // 获取处置措施列表 @@ -2941,7 +2946,7 @@ this.modalData.orderNo = val.orderno this.modalData.operationDesc = '' this.modalData.resourceId = '' - this.getOperationList() + //this.getOperationList() } if (this.tagNo === 505) { this.modalData.resourceId = val.resource_id @@ -3115,7 +3120,10 @@ this.modalData.qtyrequired = row.qtyrequired this.modalData.rollQty = row.qtyrequired this.modalData.sjzs = row.sjzs - this.getOperationList() + this.modalData.resourceId = row.resourceId + this.modalData.resourceDesc = row.resourceDesc + this.modalData.workCenterNo = row.workCenterNo + //this.getOperationList() this.seqDetailFlag = false }, diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue index f3ea5c1..20d4ba3 100644 --- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue +++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue @@ -24,8 +24,7 @@ - - + @@ -33,7 +32,6 @@ - diff --git a/src/views/modules/warehouse/countingReport.vue b/src/views/modules/warehouse/countingReport.vue new file mode 100644 index 0000000..dac49c2 --- /dev/null +++ b/src/views/modules/warehouse/countingReport.vue @@ -0,0 +1,496 @@ + + + + + + +