diff --git a/src/api/emis/emisBatchGroupLog.js b/src/api/emis/emisBatchGroupLog.js new file mode 100644 index 00000000..a9efe5f7 --- /dev/null +++ b/src/api/emis/emisBatchGroupLog.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 查询批次操作日志列表 +export function listEmisBatchOperLog(batchNo) { + return request({ + url: '/emis/emisTmsSiteBatchLog/getTmsSiteBatchLogList', + method: 'get', + params: { + batchNo: batchNo + } + }) +} diff --git a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue index df477afb..93282bf5 100644 --- a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue +++ b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue @@ -12,7 +12,9 @@ - + + + @@ -22,13 +24,14 @@ import BigBatchListPanel from '@/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue'; import BigBatchEditForm from '@/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue'; import BigBatchViewOnly from '@/views/emis/emisTmsSiteBatch/panel/BigBatchViewOnly.vue'; - +import BatchLogList from '@/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue'; export default { name: "BigBatchGroupMgnt", components: { BigBatchListPanel, BigBatchEditForm, - BigBatchViewOnly + BigBatchViewOnly, + BatchLogList, }, dicts: [ ], @@ -39,6 +42,7 @@ export default { openEditForm:false, openViewForm:false, batchId:null, + batchNo:null, isCopy:false, editTabTitle:'批次编辑', }; @@ -71,8 +75,9 @@ export default { this.editTabTitle='批次复制'; this.activeTab='batchEdit'; }, - onViewBatch(batchId){ - this.batchId=batchId; + onViewBatch(val){ + this.batchId=val.id; + this.batchNo =val.batchNo; this.isCopy = false; this.openViewForm=true; this.activeTab='batchView'; diff --git a/src/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue b/src/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue new file mode 100644 index 00000000..0e261143 --- /dev/null +++ b/src/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue @@ -0,0 +1,121 @@ + + + + + + diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue index 567cde2b..6f415d47 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue @@ -574,7 +574,7 @@ export default { this.$emit("onCopy",this.ids); }, handleShowBatchInfo(row){ - this.$emit("onView",row.id); + this.$emit("onView",row); }, handleFormChanged(){ this.openForm = false; diff --git a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue index 5fed38e3..4a1c8dbf 100644 --- a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue +++ b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue @@ -92,7 +92,7 @@ import { timeDiffTime, excelDateToJSDate } from '@/utils/dateUtils' import XLSX from 'xlsx' export default { - name: "BatchWaybillRecord", + name: "DraftSubmitReview", data() { return { resetRefreshId: null,