From 63d0167b5ae04c6ac096cea8b983ba654afd8bfe Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 26 Nov 2024 09:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E6=96=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E9=85=8D=E8=BD=BD=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/TripartiteTransfer.js | 22 ++++++------
 .../artery/TripartiteTransfer.vue             |  4 +--
 .../artery/truckLoadingDetails.vue            | 34 +++++++++----------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index 334238bc..13dc7a02 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -915,17 +915,17 @@ export const TripartiteTransferColumnList = [
     isshowSummary: true,
     sortable: true,
   },
-  {
-    prop: 'openPrice',
-    label: '运单开单价格',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    isColumnMerge: true,
-    sortable: true,
-  },
+  // {
+  //   prop: 'openPrice',
+  //   label: '运单开单价格',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isColumnMerge: true,
+  //   sortable: true,
+  // },
   {
     prop: 'weight',
     label: '重量(KG)',
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 91189c97..f840250b 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -166,9 +166,9 @@
           </el-button>
 
           <!-- 取消配载 -->
-          <!-- <el-button type="primary" icon="CircleClose" @click="handleCancelCarsLoad">
+          <el-button type="primary" icon="CircleClose" @click="handleCancelCarsLoad">
             取消配载
-          </el-button> -->
+          </el-button>
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index c7e24127..40ced330 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -193,24 +193,22 @@
       </tablecmt>
 
       <!-- 分页模块 -->
-      <el-row class="el-fy">
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-          <!-- 分页模块 -->
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.pageNum"
-            :page-sizes="[30, 50, 80, 120, 500]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
-        </div>
-      </el-row>
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.pageNum"
+          :page-sizes="[30, 50, 80, 120, 500]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
     </div>
   </basic-container>