From 578ae3d1120cc376b476b7e30a190c1db83ca1c6 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 11 Apr 2023 14:15:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E7=AA=91=E8=BD=A6=E8=BD=BD=E7=A0=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DialogCarPayload.vue           |  3 +-
 .../components/DialogWithMenu.vue             |  5 +-
 .../components/tabs/carDetail.vue             | 49 ++++++++++++-------
 src/views/modules/pms/finishedOrder/config.js |  1 +
 src/views/modules/pms/order/config.js         |  3 +-
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/components/DialogCarPayload.vue b/src/components/DialogCarPayload.vue
index dfa4e6c..1a35963 100644
--- a/src/components/DialogCarPayload.vue
+++ b/src/components/DialogCarPayload.vue
@@ -81,7 +81,7 @@ export default {
       totalPage: 0,
       dataList: [],
       tableLoading: false,
-      refreshLayoutKey: "",
+      refreshLayoutKey: 0,
       id: null,
       showPaination: false,
     };
@@ -110,7 +110,6 @@ export default {
       }
       this.showPaination = false;
       this.id = id;
-      this.tableLoading = true;
       this.getList();
     },
 
diff --git a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
index 18784f5..f3f022c 100644
--- a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
+++ b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
@@ -6,14 +6,13 @@
     :visible="visible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
-  >
+    :close-on-click-modal="configs.clickModalToClose ?? true">
     <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
       <el-tab-pane name="sub" label="子订单进度">
         <SubOrderDetail v-if="order !== null" :order="order" />
       </el-tab-pane>
       <el-tab-pane name="car" label="窑车详情">
-        <CarDetail v-if="order !== null" :order-id="order.id" />
+        <CarDetail v-if="order !== null" :order-id="order.id" :table-layout="carLayoutKey" />
       </el-tab-pane>
       <el-tab-pane name="tray" label="托盘详情">
         <TrayDetail />
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
index 0fd0b30..78ca2d2 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
@@ -7,8 +7,7 @@
       :column-config="tableConfig"
       :table-data="dataList"
       @operate-event="handleOperate"
-      :refresh-layout-key="refreshLayoutKey"
-    />
+      :refresh-layout-key="refreshLayoutKey" />
 
     <el-pagination
       @size-change="handleSizeChange"
@@ -17,15 +16,13 @@
       :page-sizes="[1, 5, 10, 20]"
       :page-size="listQuery.limit"
       :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
+      layout="total, sizes, prev, pager, next, jumper"></el-pagination>
 
-    <!-- <DialogCarPayload
+    <DialogCarPayload
       ref="car-payload-dialog"
       v-if="!!carPayloadDialogConfigs"
       :dialog-visible.sync="carPayloadDialogVisible"
-      :configs="carPayloadDialogConfigs"
-    /> -->
+      :configs="carPayloadDialogConfigs" />
     <!-- @refreshDataList="getList" -->
   </div>
 </template>
@@ -37,7 +34,6 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC
 import { timeFilter } from "@/utils/filters";
 import DialogCarPayload from "@/components/DialogCarPayload.vue";
 
-
 export default {
   name: "CarDetailTag",
   components: { BaseListTable, DialogCarPayload },
@@ -46,6 +42,10 @@ export default {
       type: String,
       default: null,
     },
+    tableLayout: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
@@ -60,17 +60,17 @@ export default {
         { prop: "posCode", label: "位置" },
         { prop: "startTime", label: "开始时间", filter: timeFilter },
         { prop: "endTime", label: "结束时间", filter: timeFilter },
-        // {
-        //   prop: "operations",
-        //   name: "操作",
-        //   fixed: "right",
-        //   width: 90,
-        //   subcomponent: TableOperaionComponent,
-        //   options: [
-        //     { name: "to-car-payload", label: "装载详情", icon: "document" },
-        //     { name: "delete", label: "删除", icon: "delete", emitFull: true, promptField: "code" },
-        //   ],
-        // },
+        {
+          prop: "operations",
+          name: "操作",
+          fixed: "right",
+          width: 90,
+          subcomponent: TableOperaionComponent,
+          options: [
+            { name: "to-car-payload", label: "装载详情", icon: "shopping-cart-full" }, // or  el-icon-box
+            // { name: "delete", label: "删除", icon: "delete", emitFull: true, promptField: "code" },
+          ],
+        },
       ],
       refreshLayoutKey: null,
       tableLoading: false,
@@ -111,8 +111,19 @@ export default {
       },
       immediate: true,
     },
+    tableLayout() {
+      this.doLayout()
+    }
   },
+  // activated() {
+  //   console.log("hhh");
+  //   this.refreshLayoutKey = Math.random();
+  // },
   methods: {
+    doLayout() {
+      this.refreshLayoutKey = Math.random();
+    },
+
     handleOperate({ type, data }) {
       switch (type) {
         case "delete": {
diff --git a/src/views/modules/pms/finishedOrder/config.js b/src/views/modules/pms/finishedOrder/config.js
index 091e7e4..10af710 100644
--- a/src/views/modules/pms/finishedOrder/config.js
+++ b/src/views/modules/pms/finishedOrder/config.js
@@ -353,6 +353,7 @@ export default function () {
       base: '/pms/order',
       page: "/pms/order/pageEnd",
       pageIsPostApi: true,
+      payload: '/pms/carHandle'
     },
   };
 }
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index cb7878f..10d4066 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -527,7 +527,8 @@ export default function () {
       finishedOrder: "/pms/order/pageEnd",
       unConfirmedOrder: "/pms/order/pageUnCom",
       base: "/pms/order",
-      importOrderUrl: "/pms-am/pms/order/importExcelOrder"
+      importOrderUrl: "/pms-am/pms/order/importExcelOrder",
+      payload: '/pms/carHandle'
       // base: "/pms/material",
       // page: "/pms/material/page",
       // tree: "/pms/material/tree",