|
@@ -215,8 +215,9 @@
|
|
<order-detail :order="row" @updateList="queryList(true)" />
|
|
<order-detail :order="row" @updateList="queryList(true)" />
|
|
</template>
|
|
</template>
|
|
</ProTable>
|
|
</ProTable>
|
|
- <div class="flex-end mt20">
|
|
|
|
|
|
+ <div class="flex-end mt20" style="align-items: center">
|
|
<!-- <el-button class="default-button" @click="onChangeTotal">展示总数</el-button>-->
|
|
<!-- <el-button class="default-button" @click="onChangeTotal">展示总数</el-button>-->
|
|
|
|
+ <span v-loading="totalLoading" class="mr10">共 {{ totalCount }} 条</span>
|
|
<el-pagination
|
|
<el-pagination
|
|
layout="prev, pager, next"
|
|
layout="prev, pager, next"
|
|
:total="state.total"
|
|
:total="state.total"
|
|
@@ -414,7 +415,7 @@ import type { FormInstance } from 'element-plus';
|
|
import { ElMessage, ElMessageBox } from 'element-plus';
|
|
import { ElMessage, ElMessageBox } from 'element-plus';
|
|
import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
|
|
import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
|
|
import { formatDate } from '@/utils/formatTime';
|
|
import { formatDate } from '@/utils/formatTime';
|
|
-import { exportJbOrder, exportOrder, listBaseData, orderList, orderListFixed } from '@/api/business/order';
|
|
|
|
|
|
+import { exportJbOrder, exportOrder, listBaseData, orderList, orderListCount, orderListFixed } from '@/api/business/order';
|
|
import { addObserve } from '@/api/query/observe';
|
|
import { addObserve } from '@/api/query/observe';
|
|
import { addEnd } from '@/api/query/end';
|
|
import { addEnd } from '@/api/query/end';
|
|
import { treeArea } from '@/api/auxiliary/area';
|
|
import { treeArea } from '@/api/auxiliary/area';
|
|
@@ -431,7 +432,7 @@ const OrderReturn = defineAsyncComponent(() => import('@/views/business/return/c
|
|
const state = reactive<any>({
|
|
const state = reactive<any>({
|
|
queryParams: {
|
|
queryParams: {
|
|
PageIndex: 1, // 当前页
|
|
PageIndex: 1, // 当前页
|
|
- PageSize: 20, // 每页条数
|
|
|
|
|
|
+ PageSize: 50, // 每页条数
|
|
// 查询条件
|
|
// 查询条件
|
|
No: null, // 工单编码
|
|
No: null, // 工单编码
|
|
ProvinceNo: null, // 省工单编码
|
|
ProvinceNo: null, // 省工单编码
|
|
@@ -625,6 +626,8 @@ const handleCurrentChange = (val: number) => {
|
|
}
|
|
}
|
|
};
|
|
};
|
|
const requestParams = ref<EmptyObjectType>({});
|
|
const requestParams = ref<EmptyObjectType>({});
|
|
|
|
+const totalCount = ref(0);
|
|
|
|
+const totalLoading = ref(false);
|
|
const queryList = (isQuery: boolean = false) => {
|
|
const queryList = (isQuery: boolean = false) => {
|
|
if (showTotal.value) {
|
|
if (showTotal.value) {
|
|
requestParams.value = Other.deepClone(state.queryParams);
|
|
requestParams.value = Other.deepClone(state.queryParams);
|
|
@@ -662,6 +665,7 @@ const queryList = (isQuery: boolean = false) => {
|
|
requestParams.value.QueryIndex = queryIndex.value; // 数据批次
|
|
requestParams.value.QueryIndex = queryIndex.value; // 数据批次
|
|
requestParams.value.ContentRetrieval = state.ruleForm.content;
|
|
requestParams.value.ContentRetrieval = state.ruleForm.content;
|
|
state.loading = true;
|
|
state.loading = true;
|
|
|
|
+ totalLoading.value = true;
|
|
orderListFixed(requestParams.value)
|
|
orderListFixed(requestParams.value)
|
|
.then((response: any) => {
|
|
.then((response: any) => {
|
|
if (isQuery) {
|
|
if (isQuery) {
|
|
@@ -678,6 +682,16 @@ const queryList = (isQuery: boolean = false) => {
|
|
}
|
|
}
|
|
state.loading = false;
|
|
state.loading = false;
|
|
})
|
|
})
|
|
|
|
+ .then(() => { // 查询总数
|
|
|
|
+ orderListCount(requestParams.value)
|
|
|
|
+ .then((count) => {
|
|
|
|
+ totalCount.value = count.result;
|
|
|
|
+ totalLoading.value = false;
|
|
|
|
+ })
|
|
|
|
+ .catch(() => {
|
|
|
|
+ totalLoading.value = false;
|
|
|
|
+ });
|
|
|
|
+ })
|
|
.catch(() => {
|
|
.catch(() => {
|
|
state.loading = false;
|
|
state.loading = false;
|
|
});
|
|
});
|