From 4e4e3042f9240816d49332f19ca85a68cb89c2e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/distribute/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 142e0dc..89e48d7 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -64,8 +64,8 @@
</el-form>
<el-button slot="reference" type="primary" size="small">蹇嵎涓嬪彂</el-button>
</el-popover>
- <el-button size="small" type="primary" @click="page">鍒锋柊</el-button>
- <el-button size="small" type="primary" @click="handleAdd">鏂板</el-button>
+ <el-button size="small" type="success" @click="handleAdd">鎵嬪姩鏂板宸ュ崟</el-button>
+ <el-button icon="el-icon-refresh" circle @click="page"></el-button>
</el-col>
</el-row>
@@ -202,7 +202,7 @@
queryParams: {
unitId: null,
pageNum: 1,
- pageSize: 20,
+ pageSize: 10,
},
// 鎬绘潯鏁�
total: 0,
@@ -266,7 +266,7 @@
this.loading = true;
this.selectUnit();
distributeWorkOrder(this.queryParams).then(res => {
- this.workOrderList = res.data;
+ this.workOrderList = res.data.records;
this.total = res.total;
this.loading = false;
})
@@ -306,14 +306,14 @@
this.page();
})
}
- })
+ })
},
// 閫変腑宸ュ崟涓嬪彂
selectedDistribute() {
if (this.multipleSelection.length < 1) {
this.$message.warning("璇峰厛閫夋嫨瑕佷笅鍙戠殑宸ュ崟")
return
- }
+ }
this.selectedIdsDistributeForm.unitId = this.unitId;
this.selectedIdsDistributeForm.ids = this.multipleSelection;
selectedIdsDistribute(this.selectedIdsDistributeForm).then(res => {
--
Gitblit v1.8.0