From 4e309cdd2dc5fe3899b47f37a27a87ae1b2ab04a Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 21 十月 2023 17:52:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/overview/OverviewListView.vue | 3 ++-
src/views/overview/index.vue | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 9519c51..bb94c95 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -230,7 +230,8 @@
number: this.keyword,
operationTypeId: this.params.id,
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ pageSize: this.pagerOptions.pageSize,
+ status: this.params.status
}).then((res) => {
console.log(res.data)
if (res.code === 200) {
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 0985bf7..19c34c8 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -23,21 +23,21 @@
<el-dropdown class="set" placement="bottom" trigger="click" @command="handleCommand">
<div @click.stop="moreClick()">...</div>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item :command="{ command: '鍏ㄩ儴', item }">鍏ㄩ儴</el-dropdown-item>
- <el-dropdown-item :command="{ command: '灏辩华', item }">灏辩华</el-dropdown-item>
- <el-dropdown-item :command="{ command: '瀹屾垚', item }">瀹屾垚</el-dropdown-item>
+ <el-dropdown-item :command="{ command: 0, item }">鍏ㄩ儴</el-dropdown-item>
+ <el-dropdown-item :command="{ command: 3, item }">灏辩华</el-dropdown-item>
+ <el-dropdown-item :command="{ command: 4, item }">瀹屾垚</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="bottom">
<div class="left">
- <div class="left_view" @click.stop="statusClick(item, '灏辩华')">
+ <div class="left_view" @click.stop="statusClick(item, 3)">
<span>{{ item.readyCount }}</span>
<span style="margin-left: 5px">灏辩华</span>
</div>
</div>
<div class="right">
- <div class="right_status" @click.stop="statusClick(item, '瀹屾垚')">
+ <div class="right_status" @click.stop="statusClick(item, 4)">
<span style="cursor: pointer">{{ item.finishCount + " 瀹屾垚" }}</span>
</div>
<!-- <div class="right_status" style="margin-top: 5px">
--
Gitblit v1.8.0