dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/partner/CustomerInfo.vue
View File

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

6
src/views/partner/delWorkOrder.vue
View File

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

10
src/views/partner/ordermanagement/ordermanagement.vue
View File

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

14
src/views/partner/workOrder.vue
View File

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