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 | 146 +++++++++++++++++++++++++++---------------------
1 files changed, 82 insertions(+), 64 deletions(-)
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 6c912c4..a4b17f1 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="rightContent">
<div class="top">
- <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉�'" :amount-view="false" @searchClick="getList" />
+ <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ヤ笟鍔＄被鍨�'" :amount-view="false" @searchClick="getList" />
</div>
<div class="content">
<div class="list-view">
@@ -10,37 +10,45 @@
v-for="item in tableList"
:key="item.id"
:class="{
- overview_active: item.status === 'active',
- overview_done: item.status === 'done',
- overview_todo: item.status === 'todo'
+ overview_active: item.baseOperationType === 1,
+ overview_done: item.baseOperationType === 2,
+ overview_todo: item.baseOperationType === 3
}"
+ @click="labelClick(item)"
>
<div class="top">
<div class="label">
- <span style="cursor: pointer" @click="labelClick(item)">{{ item.name }}</span>
+ <span style="cursor: pointer">{{ item.name }}</span>
</div>
- <div class="set">...</div>
+ <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: 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">
- <span>2</span>
- <span style="margin-left: 5px">寰呭鐞�</span>
+ <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">
- <span style="cursor: pointer">2 姝ｅ湪绛夊緟</span>
+ <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">
+ <!-- <div class="right_status" style="margin-top: 5px">
<span style="cursor: pointer">4 寤舵湡</span>
- </div>
+ </div> -->
</div>
</div>
</div>
</div>
<div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <PagerView class="page" :page-sizes="pageSizes" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
</div>
@@ -48,6 +56,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import { getOperationType } from "@/api/overview/overview"
export default {
name: "OverView",
@@ -57,64 +66,66 @@
computed: {},
data() {
return {
- tableList: [
- {
- name: "閲囪喘鍏ュ簱",
- status: "active",
- workType: "鏀惰揣"
- },
- {
- name: "鍐呴儴璋冩嫧",
- status: "done",
- workType: "鍐呴儴璋冩嫧"
- },
- {
- name: "璁㈠崟鍙戣揣鍑哄簱",
- status: "done",
- workType: "鍙戣揣"
- },
- {
- name: "2",
- status: "active",
- workType: "鏀惰揣"
- },
- {
- name: "3",
- status: "todo",
- workType: "鏀惰揣"
- },
- {
- name: "2",
- status: "active",
- workType: "鏀惰揣"
- },
- {
- name: "3",
- status: "todo",
- workType: "鏀惰揣"
- },
- {
- name: "4444444",
- status: "todo",
- workType: "鍙戣揣"
- }
- ],
+ tableList: [],
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
- }
+ infomation: {},
+ keyword: ""
+ },
+ pageSizes: [30, 45]
}
},
- created() {},
+ created() {
+ this.pagerOptions.pageSize = 30
+ this.getData()
+ },
methods: {
getList(val) {
console.log(val)
+ this.keyword = val
+ this.getData()
},
- labelClick(item) {
- this.$router.push({ path: "/overview/overviewList", query: { name: item.name, workType: item.workType } })
+ labelClick(item, status) {
+ console.log(item)
+ this.$router.push({
+ name: "overviewList",
+ params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
+ })
},
- getData() {}
+ async getData() {
+ await getOperationType({
+ keyword: this.keyword,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
+ return {
+ ...item
+ }
+ })
+ this.tableList = list || []
+ this.pagerOptions.totalCount = res.total
+ }
+ })
+ },
+ handleCommand(val) {
+ console.log(val)
+ if (val.command === "鍏ㄩ儴") {
+ this.labelClick(val.item, "")
+ } else {
+ this.labelClick(val.item, val.command)
+ }
+ },
+ // 鏇村
+ moreClick() {},
+ // 鐘舵��
+ statusClick(item, status) {
+ console.log(item)
+ this.labelClick(item, status)
+ }
}
}
</script>
@@ -122,7 +133,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.content {
- height: calc(100% - 150px);
+ height: calc(100% - 112px);
background: #fff;
border-radius: 12px;
.list-view {
@@ -142,6 +153,7 @@
box-shadow: inset 0 0 2px #dee2e6;
-moz-box-shadow: inset 0 0 2px #dee2e6;
-webkit-box-shadow: inset 0 0 2px #dee2e6;
+ cursor: pointer;
.top {
height: 35px;
line-height: 35px;
@@ -153,7 +165,7 @@
margin-left: auto;
margin-right: 20px;
font-size: 20px;
- cursor: no-drop;
+ // cursor: no-drop;
color: #000;
transform: rotate(-90deg);
-moz-transform: rotate(-90deg);
@@ -163,6 +175,7 @@
.bottom {
display: flex;
font-size: 13px;
+ margin-top: 30px;
.left {
width: 50%;
// background: #1d80e2;
@@ -182,6 +195,7 @@
.right {
width: 50%;
.right_status {
+ margin-top: 5px;
}
}
}
@@ -197,4 +211,8 @@
}
}
}
+
+.btn-pager {
+ margin-top: 0;
+}
</style>
--
Gitblit v1.8.0