Merge remote-tracking branch 'origin/master'

This commit is contained in:
13405411873 2024-09-20 01:41:06 +08:00
commit ba4d3db00d
4 changed files with 16 additions and 16 deletions

View File

@ -445,7 +445,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */

View File

@ -529,8 +529,8 @@
this.queryParams.endTime = this.queryParams.jcTime[1]
}
listDelWorkOrder(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = response.total;
this.infoList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
workOrderData(this.queryParams).then(response => {
@ -544,7 +544,7 @@
}
getWorker(data).then(res =>{
console.log(res)
this.workerList = res.rows
this.workerList = res.data.records
})
getBankAccountList().then(res=>{
res.data.forEach(it=>{

View File

@ -171,7 +171,7 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@ -221,7 +221,7 @@
open: false,
//
queryParams: {
pageNum: 1,
pageNo: 1,
pageSize: 10,
orderNo: null,
goodsTitle: null,
@ -263,8 +263,8 @@
this.queryParams.endTime = moment(this.queryParams.endTime).format('YYYY-MM-DD HH:mm');
}
listInfo(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = response.total;
this.infoList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
},
@ -308,7 +308,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */

View File

@ -399,7 +399,7 @@
inspectionId:'',
size:'',
workId:'',
workerList:[],
// workerList:[],
value: '',
options:[],
//
@ -601,8 +601,8 @@
this.queryParams.endTime = this.queryParams.jcTime[1]
}
listWorkOrder(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = response.total;
this.infoList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
workOrderData(this.queryParams).then(response => {
@ -614,10 +614,10 @@
pageNum:1,
pageSize:100,
}
getWorker(data).then(res =>{
console.log(res)
this.workerList = res.rows
})
// getWorker(data).then(res =>{
// console.log(res)
// this.workerList = res.rows
// })
getBankAccountList().then(res=>{
res.data.forEach(it=>{
let temp={}