From d10cc0441c37dfee5bdee9c2d8a6d5778801bf5e Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 27 Sep 2024 10:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=96=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/MerchantDepositSlip.js        | 13 ++++++++++
 src/api/finance/TransactionInformation.js     |  2 +-
 src/option/basicdata/basicdataVehicleInfo.js  |  4 ++--
 .../basicdata/TripartiteMaterial/list.vue     |  2 +-
 .../vehicle/basicdataVehicleInfo.vue          |  2 +-
 src/views/finance/MerchantDepositSlip.vue     | 24 +++++++++++++++++--
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/api/finance/MerchantDepositSlip.js b/src/api/finance/MerchantDepositSlip.js
index 6fdfcd1f..a5305416 100644
--- a/src/api/finance/MerchantDepositSlip.js
+++ b/src/api/finance/MerchantDepositSlip.js
@@ -37,3 +37,16 @@ export const postReal = data => {
     method: 'patch',
   });
 };
+
+/**
+ * 查询订单详情列表
+ * @param {*} data
+ * @returns
+ */
+export const postFindOrderDetail = data => {
+  return request({
+    url: `/api/logpm-statisticsdata/merchantStatistics/findOrderDetail`,
+    method: 'post',
+    data
+  });
+};
diff --git a/src/api/finance/TransactionInformation.js b/src/api/finance/TransactionInformation.js
index e4f341f5..1904bd51 100644
--- a/src/api/finance/TransactionInformation.js
+++ b/src/api/finance/TransactionInformation.js
@@ -14,7 +14,7 @@ export const postFindOrderDetail = data => {
 };
 
 /**
- * 获取订单异动记录列表
+ * 查询异动信息 -- 对账单
  * @param {*} data
  * @returns
  */
diff --git a/src/option/basicdata/basicdataVehicleInfo.js b/src/option/basicdata/basicdataVehicleInfo.js
index 58673a1a..9dc5c836 100644
--- a/src/option/basicdata/basicdataVehicleInfo.js
+++ b/src/option/basicdata/basicdataVehicleInfo.js
@@ -15,9 +15,9 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'vehicleModelName',
+    prop: 'vehicleModel',
     label: '车辆类型',
-    type: 3,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue
index 0063bfa2..d318ac1b 100644
--- a/src/views/basicdata/TripartiteMaterial/list.vue
+++ b/src/views/basicdata/TripartiteMaterial/list.vue
@@ -626,7 +626,7 @@ const handleDownloadTemplate = async () => {
 
     if (status !== 200) return;
 
-    downloadXls(data, '三方物料导入模板');
+    downloadXls(data, '三方物料导入模板.xlsx');
 
     console.log('res :>> ', res);
   } catch (error) {
diff --git a/src/views/basicdata/vehicle/basicdataVehicleInfo.vue b/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
index 975451e1..1d2db13e 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
@@ -279,7 +279,7 @@ const initData = async () => {
   }
 };
 
-initData();
+// initData();
 
 /** 请求页面数据 */
 const onLoad = async (page?: any, params = {}) => {
diff --git a/src/views/finance/MerchantDepositSlip.vue b/src/views/finance/MerchantDepositSlip.vue
index 9e24539e..a3fd993e 100644
--- a/src/views/finance/MerchantDepositSlip.vue
+++ b/src/views/finance/MerchantDepositSlip.vue
@@ -49,6 +49,10 @@
             <el-text @click="() => ViewTransactionInformation(slotProps.scope)">
               异动信息
             </el-text>
+
+             <el-text @click="() => ViewOrderList(slotProps.scope)">
+              订单详情
+            </el-text>
           </template>
         </template>
       </tablecmt>
@@ -88,7 +92,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { postPageReconciliationList, postCheckBalance, postReal } from '@/api/finance/MerchantDepositSlip';
+import { postPageReconciliationList, postCheckBalance,postFindOrderDetail } from '@/api/finance/MerchantDepositSlip';
 import {
   downloadXls,
   setNodeHeight,
@@ -314,7 +318,7 @@ const handleConfirm = () => {
       details.loadingObj.pageLoading = true;
 
       const submitData = {
-        orderInfoIds: _arr,
+        reconciliationOrderIds: _arr,
       };
 
       const res = await postCheckBalance(submitData);
@@ -354,6 +358,22 @@ const ViewTransactionInformation = ({ row }) => {
     query: { reconciliationOrderId: row.id },
   });
 };
+
+/** 查看订单列表 */
+const ViewOrderList =async ({row})=>{
+  try {
+    details.loadingObj.pageLoading = true
+
+    const res = await postFindOrderDetail({ reconciliationOrderId: row.id })
+
+    const {code, data} = res.data
+    if (code !== 200) return
+  } catch (error) {
+    console.log('error :>> ', error);
+  }finally{
+    details.loadingObj.pageLoading = false
+  }
+}
 </script>
 
 <style scoped lang="scss">