From c71c49151c00f1c1ecbcd965482e5f09f6f45b0b Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 21 Jul 2023 16:47:33 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AD=90=E8=AE=A2=E5=8D=95=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6-=E6=9F=A5=E7=9C=8B=E6=89=B9=E6=AC=A1-=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/components/BatchDialog--detail.vue  | 31 ++++++-------------
 .../pms/order/components/BatchDialog.vue      |  7 +++--
 2 files changed, 15 insertions(+), 23 deletions(-)

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 @@
   <el-dialog
     class="batch-dialog"
     title="批次详情"
-    width="85%"
+    width="65%"
     :visible="visible"
     @close="handleClose"
     @closed="$emit('destroy')"
     :append-to-body="true"
     :close-on-click-modal="false">
-    <el-row>
+    <!-- <el-row>
       <el-col style="text-align: right">
         <el-button type="text" @click="handleOperate({ type: 'create' })" icon="el-icon-plus">新增</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
     <!-- list  -->
     <BaseListTable
       :key="Math.random()"
@@ -21,7 +21,6 @@
       :table-data="dataList"
       :current-page="page"
       :current-size="limit"
-      @operate-event="handleOperate"
       :refresh-layout-key="refreshLayoutKey" />
 
     <el-pagination
@@ -41,26 +40,16 @@
 
 <script>
 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 {
 
 <style scoped>
 .batch-dialog >>> .el-dialog__body {
-  padding: 0 20px;
+  padding: 8px 20px !important;
 }
 </style>
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 @@
     <BatchDialogDetail
       v-if="detailDialogVisible"
       ref="batchDialogDetail"
-      :blender-order-id="blenderOrderId"
       @refreshDataList="getBatchList"
       @destroy="detailDialogVisible = false" />
 
@@ -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;