From 06f7dd2d977d6633f69ca109bf1bd91b59e1734c Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 20 Apr 2023 17:49:09 +0800
Subject: [PATCH] =?UTF-8?q?2023-04-20=20=E5=9C=A8=E9=80=94=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=B1=87=E6=80=BB=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/inventorySummary/inventorySummary.js  |  6 +--
 .../views/reportCenter/inTransitSummary.vue   | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
index b76f80f7..32596aef 100644
--- a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
+++ b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
@@ -18,7 +18,7 @@ export function countinfo() {
 // 商品到货明细表
 export function in112PagerList(data) {
   return request({
-    url: '/ruku/in112PagerList',
+    url: '/supplierarrivalreport/arrivalGoods',
     data,
     method: 'post',
     headers: {
@@ -39,10 +39,10 @@ export function inallPagerList(data) {
   })
 }
 
-// 供货商到货汇总
+// 到货汇总表
 export function logPagerList(data) {
   return request({
-    url: '/supplierarrivalreport/listPage',
+    url: '/supplierarrivalreport/supplierArrivalSummary',
     data,
     method: 'post',
     headers: {
diff --git a/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue b/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
index 88fa9229..9b69e63a 100644
--- a/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
+++ b/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
@@ -21,19 +21,19 @@
       </div>
       <el-row style="margin-left: 20px;margin-right: 20px;">
         <el-col>
-          <el-tabs @tab-click="handleOrder">
+          <el-tabs  v-model="tabActiveName" @tab-click="handleOrder">
             <el-tab-pane label="到货汇总表" name="uplog">
               <div>
                 <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
                   <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
-                  <el-table-column prop="createTime" label="供应商名称" align="center" />
-                  <el-table-column prop="orderDate" label="贷款金额" align="center" />
-                  <el-table-column prop="allNum" label="订单金额" align="center" />
-                  <el-table-column prop="validNum" label="实际到货价值" align="center" />
-                  <el-table-column prop="validNum" label="在途货价值" align="center" />
-                  <el-table-column prop="validNum" label="超出货价值" align="center" />
-                  <el-table-column prop="validNum" label="全部到货日期" align="center" />
-                  <el-table-column prop="validNum" label="是否延期到货" align="center" />
+                  <el-table-column prop="supplierName" label="供应商名称" align="center" />
+                  <el-table-column prop="loanAmount" label="贷款金额"  width="150" align="center" />
+                  <el-table-column prop="orderAmount" label="订单金额"  width="150" align="center" />
+                  <el-table-column prop="actualArrival" label="实际到货价值"  width="150"align="center" />
+                  <el-table-column prop="transit" label="在途货价值" width="150" align="center" />
+                  <el-table-column prop="exceed" label="超出货价值"  width="150"align="center" />
+                  <el-table-column prop="arrivalDate" label="全部到货日期" width="150" align="center" />
+                  <el-table-column prop="logo" label="是否延期到货"  width="150" align="center" />
                 </el-table>
               </div>
               <div class="pages">
@@ -47,15 +47,15 @@
                 <el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%">
                   <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" />
                   <el-table-column prop="supplierName" label="供应商名称" align="center" />
-                  <el-table-column prop="code" label="商品编码" align="center" />
-                  <el-table-column prop="proName" label="商品名称" align="center" />
-                  <el-table-column prop="number" label="单品数量" align="center" />
-                  <el-table-column prop="orderAmount" label="订单商品价值" align="center" />
-                  <el-table-column prop="actualArrivalNumber" label="实际到货数量" align="center" />
-                  <el-table-column prop="actualArrival" label="实际到货价值" align="center" />
-                  <el-table-column prop="transitNumber" label="在途货数量" align="center" />
-                  <el-table-column prop="transit" label="在途货价值" align="center" />
-                  <el-table-column prop="exceed" label="超出货价值" align="center" />
+                  <el-table-column prop="code" label="商品编码"  width="120" align="center" />
+                  <el-table-column prop="proName" label="商品名称"  align="center" />
+                  <el-table-column prop="number" label="单品数量"  width="100"align="center" />
+                  <el-table-column prop="orderAmount" label="订单商品价值" width="140" align="center" />
+                  <el-table-column prop="actualArrivalNumber" label="实际到货数量"  width="140"align="center" />
+                  <el-table-column prop="actualArrival" label="实际到货价值" width="120" align="center" />
+                  <el-table-column prop="transitNumber" label="在途货数量" width="120" align="center" />
+                  <el-table-column prop="transit" label="在途货价值"  width="120"align="center" />
+                  <el-table-column prop="exceed" label="超出货价值"  width="120"align="center" />
                 </el-table>
               </div>
               <div class="pages">
@@ -130,7 +130,7 @@
 <script>
   import {
     in112PagerList,
-    inallPagerList, 
+    inallPagerList,
     logPagerList,
     inall4PagerList,
     inall5PagerList,
@@ -147,6 +147,7 @@
     },
     data() {
       return {
+          tabActiveName: 'uplog',
         index: "0",
         isSearchShow: false,
         searchxianshitit: '显示查询条件',