From 288369dd7487adc61fe45f24d6d141152f5492df Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 08 十月 2025 10:06:58 +0800
Subject: [PATCH] 翻页问题修复
---
src/views/statreport/confirmTablePrint.vue | 6 +-
src/views/statreport/approveTablePrint.vue | 36 +++++-------
src/views/statreport/sendrecord.vue | 14 ++--
src/views/tasks/machinebacktask.vue | 81 +++++++-------------------
src/views/system/user.vue | 2
src/views/statreport/newprogramming.vue | 15 ----
6 files changed, 53 insertions(+), 101 deletions(-)
diff --git a/src/views/statreport/approveTablePrint.vue b/src/views/statreport/approveTablePrint.vue
index 91c7f2c..f6fa2c5 100644
--- a/src/views/statreport/approveTablePrint.vue
+++ b/src/views/statreport/approveTablePrint.vue
@@ -8,7 +8,7 @@
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
- @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
<!--
<el-button type="primary" :disabled="this.selection.length==0" plain @click="handleDelBatch">鎵归噺鍒犻櫎</el-button>
@@ -33,12 +33,12 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
export default {
- name: 'MachineReturnFileOp',
+ name: 'approveTablePrint',
data() {
return {
page: {
- size: 10,
- current: 1,
+ pageSize: 10,//
+ currentPage: 1,
total: 0,
},
form: {},
@@ -58,7 +58,7 @@
// tree: true,
border: true,
index: true,
- selection: true,
+ selection: false,
// viewBtn: true,
menuWidth: 140,
menu: true,
@@ -117,17 +117,12 @@
hide: false,
}
],
- selection: [],
},
selection: [],
}
},
methods: {
- selectionChange (list) {
- this.selection = list;
- },
-
handleExport(row,index) {
//瀹℃壒琛ㄤ笅杞�
this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
@@ -143,7 +138,7 @@
let name = res.headers['content-disposition'].split('filename=')[1]
//console.log(res.headers['content-disposition'].split('filename=')[1]);
name = decodeURI(name)
- console.log(name)
+ //console.log(name)
downloadFile(res.data, `${name}`);
NProgress.done();
});
@@ -153,8 +148,8 @@
searchChange(params, done) {
let data = {}
this.query = params;
- this.page.currentPage = 1;
- console.log('searchChange', params);
+ this.page.current = 1;
+ //console.log('searchChange', params);
params.createTimeBegin = params?.createTime?.[0] || '';
params.createTimeEnd = params?.createTime?.[1] || '';
@@ -179,12 +174,11 @@
this.onLoad(this.page, data);
done();
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- // this.onLoad();
+ currentChange(current) {
+ this.page.currentPage = current;
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ sizeChange(size) {
+ this.page.pageSize = size;
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -192,7 +186,7 @@
/** * 椤甸潰鍔犺浇鏃惰幏鍙栨暟鎹�
*/
onLoad(page, params = {}) {
- console.log('onLoad', page, params);
+ //console.log('onLoad', page, params);
const query = {
...this.query,
// category: params.category ? flowCategory(params.category) : null,
@@ -203,9 +197,9 @@
} catch (error) {
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
-
+ //alert(page.size)
this.loading = true;
- getDispatchTaskList(page.current, page.size, Object.assign(query, params)).then(res => {
+ getDispatchTaskList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
diff --git a/src/views/statreport/confirmTablePrint.vue b/src/views/statreport/confirmTablePrint.vue
index b71f77e..1f0bdf4 100644
--- a/src/views/statreport/confirmTablePrint.vue
+++ b/src/views/statreport/confirmTablePrint.vue
@@ -80,8 +80,8 @@
hide: true,
},
{
- label: '鍏抽敭瀛�',
- prop: 'keyword',
+ label: '闆剁粍浠跺彿',
+ prop: 'drawingNo',
search: true,
searchType: 'input',
hide: true,
@@ -238,7 +238,7 @@
data = {
createTimeBegin: params.createTimeBegin || undefined,
createTimeEnd: params.createTimeEnd || undefined,
- keyword: params.keyword || undefined,
+ drawingNo: params.drawingNo || undefined,
myProcessName: params.myProcessName || undefined
}
this.query = data
diff --git a/src/views/statreport/newprogramming.vue b/src/views/statreport/newprogramming.vue
index ff9f104..dece841 100644
--- a/src/views/statreport/newprogramming.vue
+++ b/src/views/statreport/newprogramming.vue
@@ -11,14 +11,7 @@
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionChange">
- <!--v-model:search="search"
- <template #search="{ size }">
- <el-tag>鏍囬</el-tag>
- <el-input placeholder="鑷畾涔夎緭鍏ユ"
- :size="size"
- style="width: 200px"
- v-model:value="search.slot"></el-input>
- </template> -->
+
</avue-crud>
</basic-container>
@@ -39,7 +32,7 @@
//tableData: [],
viewRow: {},
page: {
- pageSize: 10,
+ pageSize: 10,//
currentPage: 1,
total: 0,
},
@@ -132,15 +125,11 @@
],
},
- selectedList: [],
dialogVisible: false,
}
},
mounted() {
- //this.option.column[0].disabled = true;
- //this.option.column[0].value = '2025-08-31';
-
getDeptData().then(res => {
this.option.column[1].dicData = res.data.data;
}, () => {
diff --git a/src/views/statreport/sendrecord.vue b/src/views/statreport/sendrecord.vue
index f8941c7..761294f 100644
--- a/src/views/statreport/sendrecord.vue
+++ b/src/views/statreport/sendrecord.vue
@@ -88,8 +88,8 @@
},
loading: true,
mypage: {
- size: 10,
- current: 1,
+ pageSize: 10,
+ currentPage: 1,
total: 0,
},
fileViewModel:false,
@@ -177,7 +177,7 @@
},
nodeClick(data) {
//this.treeDeptId = data.id;
- this.mypage.current = 1;
+ this.mypage.currentPage = 1;
this.onLoad(this.page);
},
getQueryObj(){
@@ -187,6 +187,8 @@
param.createTimeBegin = param.createTime[0];
param.createTimeEnd = param.createTime[1];
}
+ param.current = this.mypage.currentPage;
+ param.size = this.mypage.pageSize;
return param;
},
handleExport() {
@@ -217,15 +219,15 @@
//this.onLoad(this.mypage);
},
searchChange(params, done) {
- this.mypage.current = 1;
+ this.mypage.currentPage = 1;
this.onLoad();
done();
},
currentChange(current) {
- this.mypage.current = current;
+ this.mypage.currentPage = current;
},
sizeChange(size) {
- this.mypage.size = size;
+ this.mypage.pageSize = size;
},
refreshChange() {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ed0a41f..19b2eda 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -41,6 +41,7 @@
@click="$refs.crud.rowAdd()"
>鏂� 澧�
</el-button>
+ <!--
<el-button
type="danger"
plain
@@ -49,6 +50,7 @@
@click="handleDelete"
>鍒� 闄�
</el-button>
+ -->
<el-button
type="primary"
plain
diff --git a/src/views/tasks/machinebacktask.vue b/src/views/tasks/machinebacktask.vue
index 4dc46c4..3bc7eb7 100644
--- a/src/views/tasks/machinebacktask.vue
+++ b/src/views/tasks/machinebacktask.vue
@@ -16,17 +16,9 @@
@selection-change="selectionChange"
@on-load="onLoad"
>
- <template #menu-left>
- <!-- el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
- <el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">鎺ユ敹宸查��</el-button>
--->
- </template>
- <!--
<template #menu="scope">
- <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-delete" @click.stop="rejectBtn(scope.row, scope.index)">鎷掔粷</el-button>
- <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-add" @click.stop="acceptBtn(scope.row, scope.index)">鎺ユ敹</el-button>
+ <el-button type="primary" v-if="scope.row.status==1" text size="default" icon="el-icon-delete" @click.stop="handleDel(scope.row)">鍒犻櫎</el-button>
</template>
- -->
</avue-crud>
</basic-container>
</template>
@@ -67,7 +59,7 @@
emptyBtn: false,
searchLabelWidth: "80",
searchSpan: 4,
- menu:false,
+ menu:true,
width:'100%',
column: [
{
@@ -143,55 +135,28 @@
this.selection = selection;
},
- receiveAll() {
- //鎺ユ敹绗﹀悎鏉′欢鐨勬墍鏈夋暟鎹�
- this.$confirm('纭畾瑕佹帴鏀剁鍚堟潯浠剁殑鎵�鏈夋枃浠跺悧?', { //鍚屾帴鏀舵帴鍙ｇ浉鍚�
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- }).then(() => {
- //璋冪敤鎺ュ彛
- this.loading = true;
- axios({
- url: '/blade-mdm/machinefile/file/temp-accept-all',
- method: 'post',
- params: {}
- }).then(
- res => {
- this.loading = false;
- this.onLoad();
- }
- );
- })
+ handleDel(row) {
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/gkw/machinebacktask/remove',
+ method: 'post',
+ params: {ids: row.id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+ this.onLoad();
+ done();
+ },
+ error => {
+ this.loading = false;
+ }
+ );
},
-
- receiveBtn() {
- if(this.selection.length == 0) {
- ElMessage({message: '璇烽�夋嫨鏁版嵁',type: 'error'})
- }
- var ids = [];
- this.selection.forEach(item=> {
- ids.push(item.id);
- })
- this.$confirm('纭畾瑕佹帴鏀跺悧?', { //鍚屾帴鏀舵帴鍙ｇ浉鍚�
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- }).then(() => {
- //璋冪敤鎺ュ彛
- this.loading = true;
- axios({
- url: '/blade-mdm/machinefile/collect/temp-accept',
- method: 'post',
- params: {ids: ids.join(',')},
- }).then(
- res => {
- this.loading = false;
- this.onLoad();
- }
- );
- })
- },
+
searchReset() {
//this.onLoad(this.mypage);
--
Gitblit v1.9.3