一些bug的修复

This commit is contained in:
夕阳微笑1 2024-11-20 13:38:11 +08:00
parent 92cb8ec9d9
commit ba9095178b
7 changed files with 70 additions and 22 deletions

View File

@ -93,22 +93,42 @@ export const tinyDelivery = ({
page, page,
page_len, page_len,
order_num, order_num,
// delivery_id,
driver_name, driver_name,
driver_account, driver_account,
// driver_phone,
start_time, start_time,
end_time, end_time,
supplier_name, supplier_name,
site_name // transit_name,
// variety_num,
site_name,
// product_type,
// order_ton,
// over_ton,
// post_fee,
// create_time
enterprise_id,
}) => fetch('/admin/order/tiny_delivery', { }) => fetch('/admin/order/tiny_delivery', {
page, page,
page_len, page_len,
order_num, order_num,
// delivery_id,
driver_name, driver_name,
driver_account, driver_account,
// driver_phone,
start_time, start_time,
end_time, end_time,
supplier_name, supplier_name,
site_name // transit_name,
// variety_num,
site_name,
// product_type,
// order_ton,
// over_ton,
// post_fee,
// create_time
enterprise_id,
}, 'POST') }, 'POST')
// 录入运费 // 录入运费
@ -224,14 +244,16 @@ export const listDriverTiny = ({
// driver_name, // driver_name,
// driver_account, // driver_account,
start_time, start_time,
end_time end_time,
enterprise_id
}) => fetch('/admin/order/list_head_order', { }) => fetch('/admin/order/list_head_order', {
page, page,
page_len, page_len,
head_id, head_id,
head_name, head_name,
start_time, start_time,
end_time end_time,
enterprise_id
}, 'POST') }, 'POST')
// 编辑运费 // 编辑运费
@ -289,7 +311,12 @@ export const listCost = ({
}, 'POST') }, 'POST')
//运费成本详情 //运费成本详情
export const detailCost = (cost_id) => fetch('/admin/order/detail_cost', {cost_id}, 'POST') export const detailCost = ({
cost_id,
enterprise_id
}
) => fetch('/admin/order/detail_cost', {cost_id,enterprise_id}, 'POST')
// 运费成本删除 // 运费成本删除
export const deleteCost = (cost_id) => fetch('/admin/order/delete_cost', {cost_id}, 'POST') export const deleteCost = (cost_id) => fetch('/admin/order/delete_cost', {cost_id}, 'POST')
@ -499,13 +526,15 @@ export const listClientAccount = ({
page_len, page_len,
client_name, client_name,
client_company, client_company,
account_date account_date,
enterprise_id
}) => fetch('/admin/order/list_client_account', { }) => fetch('/admin/order/list_client_account', {
page, page,
page_len, page_len,
client_name, client_name,
client_company, client_company,
account_date account_date,
enterprise_id
}, 'POST') }, 'POST')
// 客户账款-收款明细 // 客户账款-收款明细
@ -672,12 +701,14 @@ export const listSupplierAccount = ({
page, page,
page_len, page_len,
supplier_name, supplier_name,
account_date account_date,
enterprise_id,
}) => fetch('/admin/order/list_supplier_account', { }) => fetch('/admin/order/list_supplier_account', {
page, page,
page_len, page_len,
supplier_name, supplier_name,
account_date account_date,
enterprise_id
}, 'POST') }, 'POST')
// 供应商账款-付款明细 // 供应商账款-付款明细

View File

@ -1,3 +1,4 @@
//
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索 --> <!-- 搜索 -->
@ -108,7 +109,9 @@ export default {
searchForm: { searchForm: {
page: 1, page: 1,
page_len: 10, page_len: 10,
start_time: '' craet_time: '',
// 'transit name':'',
enterprise_id:1
}, },
downloadLoading: false, // downloadLoading: false, //
dialogEntry: false, // dialogEntry: false, //
@ -127,19 +130,27 @@ export default {
this.fetchData() this.fetchData()
}, },
methods: { methods: {
// //
fetchData(obj={}) { fetchData(obj={}) {
if(obj.page) { if(obj.page) {
this.searchForm.page = obj.page this.searchForm.page = obj.page
this.searchForm.page_len = obj.page_len this.searchForm.page_len = obj.page_len
} }
this.searchForm.start_time = this.$route.query.start_time?this.$route.query.start_time:this.searchForm.start_time; this.searchForm.start_time = this.$route.query.start_time || this.searchForm.start_time;
this.listLoading = true
this.$http(tinyDelivery(this.searchForm), (res) => { this.$http(tinyDelivery(this.searchForm), (res) => {
this.firmList = res.data.result if (res.code === 0) {
this.total = res.data.data_sum this.firmList = res.data.result; // firmList
this.listLoading = false // console.log(':', this.firmList);
})
this.total = res.data.data_sum; // total data_sum
this.listLoading = false;
} else {
console.error('获取数据出错:', res.message);
this.listLoading = true;
}
}).catch(error => {
console.error('请求失败:', error);
});
}, },
// //
handleEntry(id) { handleEntry(id) {

View File

@ -224,7 +224,8 @@ export default {
// //
searchForm: { searchForm: {
page: 1, page: 1,
page_len: 100000000 page_len: 100000000,
enterprise_id:1
}, },
baseUrl, baseUrl,
percentage: 0, // percentage: 0, //

View File

@ -97,7 +97,8 @@ export default {
// //
searchForm: { searchForm: {
page: 1, page: 1,
page_len: 10 page_len: 10,
enterprise_id:1
}, },
dialogEntry: false, dialogEntry: false,
entryInfo: { entryInfo: {

View File

@ -94,7 +94,8 @@ export default {
// //
searchForm: { searchForm: {
page: 1, page: 1,
page_len: 10 page_len: 10,
enterprise_id:1
}, },
dialogEntry: false, dialogEntry: false,
entryInfo: { entryInfo: {

View File

@ -139,6 +139,7 @@ export default {
listLoading: true, listLoading: true,
chilTotal: 0, // chilTotal: 0, //
msgListLoading: false, msgListLoading: false,
enterprise_id:1,
// //
searchForm: { searchForm: {
page: 1, page: 1,
@ -233,7 +234,8 @@ export default {
cost_id ? this.title = '编辑司机成本记录' : this.title = '新增司机成本记录' cost_id ? this.title = '编辑司机成本记录' : this.title = '新增司机成本记录'
this.fetchDriver() this.fetchDriver()
if(cost_id) { if(cost_id) {
this.$http(detailCost(cost_id), res => {
this.$http(detailCost(cost_id,enterprise_id), res => {
this.entryInfo = res.data this.entryInfo = res.data
this.dialog = true this.dialog = true
}) })

View File

@ -182,7 +182,8 @@ export default {
// //
searchForm: { searchForm: {
page: 1, page: 1,
page_len: 100000000 page_len: 100000000,
enterprise_id: 1
}, },
baseUrl, baseUrl,
clientHeight: 0, // clientHeight: 0, //