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 | 128 +++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 59 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 7738753..965c592 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -3,8 +3,9 @@
<div class="rightContent">
<div class="top">
<SearchCommonView
+ :showAdd="false"
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
+ :placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉版垨浜у搧绫诲埆'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -21,11 +22,11 @@
v-for="(item, index) in warehouseList"
:key="index"
v-model="stashRadio"
- :label="item.name"
+ :label="item.code"
@change="radioHandleChange"
>{{ item.name }}</el-radio
>
- <!-- <el-radio v-model="stashRadio" label="2">澶囬�夐」</el-radio> -->
+ <!-- @click.prevent.native="checkRadio(item.code)" 鍙栨秷鍗曢�夐」 -->
</template>
</div>
<p style="margin-top: 30px">绫诲埆</p>
@@ -45,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>
@@ -85,7 +86,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"
export default {
- name: "InboundOutboundDetail",
+ name: "inventoryReport",
props: {},
components: { AddOverviewDialog },
mixins: [pageMixin],
@@ -145,7 +146,8 @@
pageSizes: [15, 30],
oldRadioBtn: "",
metaTitle: this.$route.meta.title,
- };
+ searchStr: this.$route.params.name ?? ''
+ }
},
created() {
this.setTable()
@@ -158,21 +160,28 @@
},
methods: {
checkListHandler(e) {
- this.categoryListId = e;
- this.getData();
+ this.categoryListId = e
+ this.getData()
},
radioHandleChange(e) {
- this.warehouseListName = e;
- this.getData();
+ this.warehouseListName = e
+ this.getData()
},
+ // checkRadio(val){
+ // console.log(val)
+ // val == this.stashRadio ? this.stashRadio = '' : this.stashRadio = val
+ // this.warehouseListName = val
+ // this.getData()
+ // },
setTable() {
if (this.isIconIndex === "1") {
- this.pageSizes = [30, 60];
- this.pagerOptions.pageSize = 30;
+ this.pageSizes = [30, 60]
+ this.pagerOptions.pageSize = 30
}
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
countcol: this.countcol,
allcol: [],
@@ -266,7 +275,12 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
getList(val) {
- console.log(val)
+ this.searchStr = val
+ this.getInventoryData({
+ page: 1,
+ pageSize: this.pagerOptions.pageSize,
+ keyWord: val
+ })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -278,8 +292,8 @@
// 鏂板缓
addBtnClick() {
// this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓"
- this.getData()
+ // this.editConfig.title = "鏂板缓"
+ // this.getData()
},
// 鐘舵��
getStatus(val) {
@@ -290,37 +304,29 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- name: this.metaTitle,
- product: {
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- produceId: row.produceId,
- productName: row.productName,
- unit: row.unit,
- },
- pageName:"鎶ヨ〃",
- paramsKey: {
- amount: "amount",
- status: "status", //鐘舵��
- productName:"productName", //浜у搧鍚嶇О
- contactedName: "contactedName",
- date: "date",
- fromLocation: "fromLocation",
- number: "number",
- toLocation: "toLocation",
- unit: "unit",
- },
- },
- });
+ keyWord:row.productType,
+ produceId:row.produceId,
+ unit:row.unit,
+ productName:row.productName,
+ name: "鎶ヨ〃"
+ }
+ })
},
// 琛ヨ揣
handleAddGoods(row) {
- console.log(row);
+ 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() {},
@@ -337,35 +343,39 @@
inStorage: item.inStorage, // 鍏ュ簱
toStore: item.toStore, // 鍑哄簱
forecast: item.forecast, //棰勬祴
- unit: item.unit, //鍗曚綅
- };
- this.testArr.push(obj);
- });
+ unit: item.unit //鍗曚綅
+ }
+ this.testArr.push(obj)
+ })
},
//鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
// 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
- async getData() {
+ 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
+ }
+ })
+ },
+ getData() {
let params = {
+ keyWord: this.searchStr,
categoryIds: this.categoryListId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
warehouseCode: this.warehouseListName
}
- await getInventoryData(params).then((res) => {
- if (res.code === 200) {
- const list = res.data;
- this.tableList.tableInfomation = list || [];
- this.pagerOptions.totalCount = res.total;
- }
- })
+ this.getInventoryData(params)
},
// 鑾峰彇浜у搧绫诲瀷鍒楄〃鏁版嵁
async getProductCategoryList() {
await getProductCategoryList({
keyWord: "",
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
+ pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
this.categoryList = res.data
@@ -377,10 +387,10 @@
await getWarehouseList({
keyword: "",
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
+ pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.data.code === 200) {
- this.warehouseList = res.data.data;
+ this.warehouseList = res.data.data
}
})
}
--
Gitblit v1.8.0