From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/overview/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 0985bf7..a4b17f1 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">
@@ -90,7 +90,7 @@
console.log(item)
this.$router.push({
name: "overviewList",
- params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status }
+ params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
})
},
async getData() {
@@ -99,15 +99,15 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- console.log(res.data.data)
- if (res.data.code === 200) {
- const list = res.data.data.map((item) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
...item
}
})
this.tableList = list || []
- this.pagerOptions.totalCount = res.data.total
+ this.pagerOptions.totalCount = res.total
}
})
},
--
Gitblit v1.8.0