From e7290cec178e4b6fe7257e3784cefdf7b3c01fb1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 17:45:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/distribute/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index b5aa33d..2ee5b45 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -61,7 +61,6 @@
<span style="font-weight: bold;font-size: 16px">蹇嵎涓嬪彂</span>
<el-form ref="fastDistributeForm" :model="fastDistributeForm" :rules="fastDistributeRules" label-width="80px">
<el-form-item label="蹇嵎鏂瑰紡" prop="fastWay">
- <el-radio v-model="fastDistributeForm.fastWay" label="LAST_HALF_HOUR">鏈�杩�30鍒嗛挓</el-radio>
<el-radio v-model="fastDistributeForm.fastWay" label="LAST_HOUR">鏈�杩�1灏忔椂</el-radio>
<el-radio v-model="fastDistributeForm.fastWay" label="LAST_TWO_HOUR">鏈�杩�2灏忔椂</el-radio>
<el-radio v-model="fastDistributeForm.fastWay" label="LAST_DAY">鏈�杩�1澶�</el-radio>
@@ -312,11 +311,13 @@
},
page() {
this.loading = true;
- this.selectUnit();
- distributeWorkOrder(this.queryParams).then(res => {
- this.workOrderList = res.data.records;
- this.total = res.total;
- this.loading = false;
+ distributeWorkOrder(this.queryParams).then(data => {
+ workList(this.queryParams).then(res => {
+ this.unitList = res.data;
+ this.workOrderList = data.data.records;
+ this.total = data.total;
+ this.loading = false;
+ })
})
},
changeUnit(unitId, unitName) {
@@ -418,7 +419,7 @@
},
// 杩愮淮鍏徃涓嬫媺鏁版嵁
selectUnit() {
- workList().then(res => {
+ workList(this.queryParams).then(res => {
this.unitList = res.data;
})
},
--
Gitblit v1.8.0