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 @@ 异动信息 + + + 订单详情 + @@ -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 + } +}