From d7557c1681b2da87df6509b3faf5dc4cefac1da2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 13:45:30 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/reportForm/inventoryReport/index.vue | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index eace0e9..965c592 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -46,20 +46,20 @@
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="220" align="center">
<template slot-scope="scope">
- <span @click="handleHistoryClick(scope.row)">
+ <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
<i class="el-icon-refresh-left"></i>
<span>鍘嗗彶</span>
</span>
- <span @click="handleAddGoods(scope)" class="margin_left_5px">
+ <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
<i class="el-icon-refresh"></i>
<span>琛ヨ揣</span>
</span>
<template>
- <span @click="handleLocation(scope)" class="margin_left_5px">
+ <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor">
<i class="el-icon-menu"></i>
<span>浣嶇疆</span>
</span>
- <span @click="handleForecast(scope)" class="margin_left_5px">
+ <span @click="handleForecast(scope)" class="margin_left_5px no-cursor">
<i class="el-icon-s-data"></i>
<span>棰勬祴</span>
</span>
@@ -86,7 +86,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"
export default {
- name: "InboundOutboundDetail",
+ name: "inventoryReport",
props: {},
components: { AddOverviewDialog },
mixins: [pageMixin],
@@ -146,7 +146,7 @@
pageSizes: [15, 30],
oldRadioBtn: "",
metaTitle: this.$route.meta.title,
- searchStr:""
+ searchStr: this.$route.params.name ?? ''
}
},
created() {
@@ -275,11 +275,11 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
getList(val) {
- this.searchStr=val
+ this.searchStr = val
this.getInventoryData({
- page: this.pagerOptions.currPage,
+ page: 1,
pageSize: this.pagerOptions.pageSize,
- keyWord:val,
+ keyWord: val
})
},
// 琛岀偣鍑�
@@ -304,7 +304,10 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- id: row.produceId,
+ keyWord:row.productType,
+ produceId:row.produceId,
+ unit:row.unit,
+ productName:row.productName,
name: "鎶ヨ〃"
}
})
@@ -315,8 +318,15 @@
console.log(row)
},
// 浣嶇疆
- handleLocation() {
- this.$router.push("/reportForm/locationReport")
+ handleLocation(row) {
+ console.log(row,"rowwww")
+ this.$router.push({
+ name:"locationReport",
+ params:{
+ keyWord:row.row.productName,
+ name:"搴撳瓨鎶ヨ〃"
+ }
+ })
},
// 棰勬祴
handleForecast() {},
@@ -341,18 +351,18 @@
//鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
// 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
- async getInventoryData(params){
+ async getInventoryData(params) {
await getInventoryData(params).then((res) => {
- if (res.code === 200) {
- const list = res.data
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
- }
- })
+ if (res.code === 200) {
+ const list = res.data
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.total
+ }
+ })
},
getData() {
let params = {
- keyWord:this.searchStr,
+ keyWord: this.searchStr,
categoryIds: this.categoryListId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
--
Gitblit v1.8.0