Browse Source

修复三方物料导出bug

dev-xx
qb 6 months ago
parent
commit
d10cc0441c
  1. 13
      src/api/finance/MerchantDepositSlip.js
  2. 2
      src/api/finance/TransactionInformation.js
  3. 4
      src/option/basicdata/basicdataVehicleInfo.js
  4. 2
      src/views/basicdata/TripartiteMaterial/list.vue
  5. 2
      src/views/basicdata/vehicle/basicdataVehicleInfo.vue
  6. 24
      src/views/finance/MerchantDepositSlip.vue

13
src/api/finance/MerchantDepositSlip.js

@ -37,3 +37,16 @@ export const postReal = data => {
method: 'patch', method: 'patch',
}); });
}; };
/**
* 查询订单详情列表
* @param {*} data
* @returns
*/
export const postFindOrderDetail = data => {
return request({
url: `/api/logpm-statisticsdata/merchantStatistics/findOrderDetail`,
method: 'post',
data
});
};

2
src/api/finance/TransactionInformation.js

@ -14,7 +14,7 @@ export const postFindOrderDetail = data => {
}; };
/** /**
* 获取订单异动记录列表 * 查询异动信息 -- 对账单
* @param {*} data * @param {*} data
* @returns * @returns
*/ */

4
src/option/basicdata/basicdataVehicleInfo.js

@ -15,9 +15,9 @@ export const columnList = [
fixed: true, fixed: true,
}, },
{ {
prop: 'vehicleModelName', prop: 'vehicleModel',
label: '车辆类型', label: '车辆类型',
type: 3, type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],

2
src/views/basicdata/TripartiteMaterial/list.vue

@ -626,7 +626,7 @@ const handleDownloadTemplate = async () => {
if (status !== 200) return; if (status !== 200) return;
downloadXls(data, '三方物料导入模板'); downloadXls(data, '三方物料导入模板.xlsx');
console.log('res :>> ', res); console.log('res :>> ', res);
} catch (error) { } catch (error) {

2
src/views/basicdata/vehicle/basicdataVehicleInfo.vue

@ -279,7 +279,7 @@ const initData = async () => {
} }
}; };
initData(); // initData();
/** 请求页面数据 */ /** 请求页面数据 */
const onLoad = async (page?: any, params = {}) => { const onLoad = async (page?: any, params = {}) => {

24
src/views/finance/MerchantDepositSlip.vue

@ -49,6 +49,10 @@
<el-text @click="() => ViewTransactionInformation(slotProps.scope)"> <el-text @click="() => ViewTransactionInformation(slotProps.scope)">
异动信息 异动信息
</el-text> </el-text>
<el-text @click="() => ViewOrderList(slotProps.scope)">
订单详情
</el-text>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -88,7 +92,7 @@ import dayjs from 'dayjs';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
/** 获取字典 */ /** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { postPageReconciliationList, postCheckBalance, postReal } from '@/api/finance/MerchantDepositSlip'; import { postPageReconciliationList, postCheckBalance,postFindOrderDetail } from '@/api/finance/MerchantDepositSlip';
import { import {
downloadXls, downloadXls,
setNodeHeight, setNodeHeight,
@ -314,7 +318,7 @@ const handleConfirm = () => {
details.loadingObj.pageLoading = true; details.loadingObj.pageLoading = true;
const submitData = { const submitData = {
orderInfoIds: _arr, reconciliationOrderIds: _arr,
}; };
const res = await postCheckBalance(submitData); const res = await postCheckBalance(submitData);
@ -354,6 +358,22 @@ const ViewTransactionInformation = ({ row }) => {
query: { reconciliationOrderId: row.id }, 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> </script>
<style scoped lang="scss"> <style scoped lang="scss">

Loading…
Cancel
Save