From b940c9b89391d68736f44d26c19c8d633d0b8c66 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 19 十月 2023 17:10:57 +0800
Subject: [PATCH] bug修复（5311）
---
src/views/reportForm/inventoryReport/index.vue | 105 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 29 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8b7c852..fe52f42 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -5,7 +5,7 @@
<SearchCommonView
:showAdd="false"
:add-title="'鏂板缓'"
- :placeholder="''"
+ :placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉版垨浜у搧绫诲埆'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -22,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>
@@ -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],
@@ -145,7 +145,8 @@
stashRadio: "1",
pageSizes: [15, 30],
oldRadioBtn: "",
- metaTitle: this.$route.meta.title
+ metaTitle: this.$route.meta.title,
+ searchStr: this.$route.params.name ?? ''
}
},
created() {
@@ -166,6 +167,12 @@
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]
@@ -173,7 +180,8 @@
}
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
countcol: this.countcol,
allcol: [],
@@ -209,42 +217,48 @@
label: "鍗曚綅鎴愭湰",
prop: "cost",
default: false,
- isShowColumn: showcol.includes("鍗曚綅鎴愭湰")
+ isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
+ textAlign:"left"
},
{
label: "鎬讳环鍊�",
prop: "value",
default: false,
isShowColumn: showcol.includes("鎬讳环鍊�"),
- unit: "锟�"
+ unit: "锟�",
+ textAlign:"left"
},
{
label: "鍦ㄥ簱",
prop: "amount",
default: true,
isShowColumn: true,
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "鍙敤搴撳瓨",
prop: "availableNumber",
default: true,
isShowColumn: true,
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "鍏ュ簱",
prop: "in",
default: false,
isShowColumn: showcol.includes("鍏ュ簱"),
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "鍑哄簱",
prop: "out",
isShowColumn: showcol.includes("鍑哄簱"),
default: false,
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "棰勬祴",
@@ -267,7 +281,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) {
@@ -279,8 +298,8 @@
// 鏂板缓
addBtnClick() {
// this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓"
- this.getData()
+ // this.editConfig.title = "鏂板缓"
+ // this.getData()
},
// 鐘舵��
getStatus(val) {
@@ -291,7 +310,10 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- id: row.produceId,
+ keyWord:row.productType,
+ produceId:row.produceId,
+ unit:row.unit,
+ productName:row.productName,
name: "鎶ヨ〃"
}
})
@@ -302,8 +324,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() {},
@@ -328,13 +357,7 @@
//鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
// 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
- async getData() {
- let params = {
- categoryIds: this.categoryListId,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- warehouseCode: this.warehouseListName
- }
+ async getInventoryData(params) {
await getInventoryData(params).then((res) => {
if (res.code === 200) {
const list = res.data
@@ -342,6 +365,16 @@
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
+ }
+ this.getInventoryData(params)
},
// 鑾峰彇浜у搧绫诲瀷鍒楄〃鏁版嵁
async getProductCategoryList() {
@@ -392,4 +425,18 @@
flex: 1;
}
}
+
+::v-deep .el-table__body-wrapper{
+ height: unset !important;
+ // height: 100%;
+}
+::v-deep .table-view{
+ height:unset !important;
+}
+.el-table__cell{
+ text-align: unset !important;
+}
+::v-deep .el-table__cell.is-left{
+ text-align: left !important;
+}
</style>
--
Gitblit v1.8.0