diff --git a/src/views/modules/pms/order/components/BatchDialog--detail.vue b/src/views/modules/pms/order/components/BatchDialog--detail.vue index 1670683..1de729c 100644 --- a/src/views/modules/pms/order/components/BatchDialog--detail.vue +++ b/src/views/modules/pms/order/components/BatchDialog--detail.vue @@ -2,17 +2,17 @@ - + import BaseListTable from "@/components/BaseListTable.vue"; -import TableTextComponent from "@/components/noTemplateComponents/detailComponent"; -import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import { timeFilter } from "@/utils/filters"; export default { name: "BatchDialog--detail", components: { BaseListTable }, - props: { - configs: { - type: Object, - default: () => ({ - clickModalToClose: false, - forms: null, - }), - }, - }, + props: [], data() { return { visible: false, - blenderOrderId: null, // 用来获取批次列表 + batchId: null, loading: false, limit: 20, page: 1, @@ -92,7 +81,7 @@ export default { init(id) { this.visible = true; console.log("[BatchDialog--detail] init", id); - this.blenderOrderId = id; + this.batchId = id; this.getBatchDetailList(); }, @@ -102,11 +91,11 @@ export default { try { const { data: { code, data, msg }, - } = await this.$http.get("/pms/blenderBatch/pageView", { + } = await this.$http.get("/pms/blenderDetail/pageView", { params: { page: this.page, limit: this.limit, - blenderOrderId: this.blenderOrderId, + batchId: this.batchId, }, }); console.log("[BatchDialog] getBatchList", data); @@ -119,7 +108,7 @@ export default { // this.dataList = data; this.tableLoading = false; } catch (err) { - this.$message.error("message" in err ? err.message : err); + this.$message.error(typeof err == "object" && "message" in err ? err.message : err); } }, @@ -132,6 +121,6 @@ export default { diff --git a/src/views/modules/pms/order/components/BatchDialog.vue b/src/views/modules/pms/order/components/BatchDialog.vue index 20f503b..60eab6b 100644 --- a/src/views/modules/pms/order/components/BatchDialog.vue +++ b/src/views/modules/pms/order/components/BatchDialog.vue @@ -45,7 +45,6 @@ @@ -194,7 +193,11 @@ export default { this.$refs.batchDialogEdit.init(); }); break; - case "查看详情": + case "view-blender-batch-details": + this.detailDialogVisible = true; + this.$nextTick(() => { + this.$refs.batchDialogDetail.init(data); + }); break; case "edit": this.editDialogVisible = true;