|
@@ -18,7 +18,7 @@
|
|
|
</template>
|
|
|
</BasicForm>
|
|
|
</div>
|
|
|
- <a-list item-layout="vertical" size="large" :pagination="pagination" :loading="loading" :data-source="listData">
|
|
|
+ <a-list item-layout="vertical" size="large" :loading="loading" :data-source="listData">
|
|
|
<template #renderItem="{ item, index }">
|
|
|
<a-list-item key="item.heatNo">
|
|
|
<a-list-item-meta>
|
|
@@ -29,7 +29,7 @@
|
|
|
<span style="padding: 0 20px"> 开始时间:{{ item.createTime }} </span>
|
|
|
</template>
|
|
|
<template #avatar>
|
|
|
- <a-tag color="#108ee9">{{ (page - 1) * pageSize + index + 1 }}</a-tag>
|
|
|
+ <a-tag color="#108ee9">{{ index + 1 }}</a-tag>
|
|
|
</template>
|
|
|
</a-list-item-meta>
|
|
|
<div class="flex heat-wrapper">
|
|
@@ -186,8 +186,6 @@
|
|
|
* @param values
|
|
|
*/
|
|
|
function handleSubmit() {
|
|
|
- console.log(getFieldsValue());
|
|
|
- page.value = 1;
|
|
|
getList();
|
|
|
}
|
|
|
|
|
@@ -201,21 +199,6 @@
|
|
|
{ title: '重量/t', dataIndex: 'weight' },
|
|
|
];
|
|
|
|
|
|
- // 分页请求
|
|
|
- const pageSize = ref(10);
|
|
|
- const page = ref(1);
|
|
|
-
|
|
|
- const pagination = ref({
|
|
|
- onChange: (p: number, ps: number) => {
|
|
|
- page.value = p;
|
|
|
- pageSize.value = ps;
|
|
|
- getList();
|
|
|
- },
|
|
|
- pageSize: 10,
|
|
|
- current: 1,
|
|
|
- total: 0,
|
|
|
- });
|
|
|
-
|
|
|
const getList = async () => {
|
|
|
try {
|
|
|
loading.value = true;
|
|
@@ -226,32 +209,14 @@
|
|
|
}
|
|
|
console.log('values', values);
|
|
|
|
|
|
- const params = Object.assign(
|
|
|
- {},
|
|
|
- {
|
|
|
- pageNo: page.value,
|
|
|
- pageSize: pageSize.value,
|
|
|
- },
|
|
|
- values,
|
|
|
- {
|
|
|
- createTimeBegin: values.createTime_begin,
|
|
|
- createTimeEnd: values.createTime_end,
|
|
|
- storageTimeBegin: values.storageTime_begin,
|
|
|
- storageTimeEnd: values.storageTime_end,
|
|
|
- }
|
|
|
- );
|
|
|
-
|
|
|
- const res = await getStorageCenterInvoicingInfo(params);
|
|
|
-
|
|
|
- const { records, current, total, size } = res;
|
|
|
-
|
|
|
- pagination.value = {
|
|
|
- ...pagination.value,
|
|
|
- current,
|
|
|
- total,
|
|
|
- pageSize: size,
|
|
|
- };
|
|
|
+ const params = Object.assign({}, values, {
|
|
|
+ createTimeBegin: values.createTime_begin,
|
|
|
+ createTimeEnd: values.createTime_end,
|
|
|
+ storageTimeBegin: values.storageTime_begin,
|
|
|
+ storageTimeEnd: values.storageTime_end,
|
|
|
+ });
|
|
|
|
|
|
+ const records = await getStorageCenterInvoicingInfo(params);
|
|
|
if (records && isArray(records)) {
|
|
|
const list = records.map((item: any) => {
|
|
|
let content: any[] = [];
|
|
@@ -329,13 +294,7 @@
|
|
|
values.ccmNo = '5';
|
|
|
}
|
|
|
|
|
|
- const params = Object.assign(
|
|
|
- {
|
|
|
- pageNo: page.value,
|
|
|
- pageSize: pageSize.value,
|
|
|
- },
|
|
|
- values
|
|
|
- );
|
|
|
+ const params = Object.assign({}, values);
|
|
|
|
|
|
let queryParams = Object.keys(params)
|
|
|
.filter((v) => params[v])
|