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/reportForm/locationReport/index.vue | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 2da4e3e..6efd9ed 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -2,17 +2,15 @@
<template>
<div class="rightContent">
<div class="top">
- <div>
- <SearchCommonView
- :add-title="'鏂板缓'"
- :showAdd="false"
- :placeholder="''"
- :amount-view="false"
- @addCommonClick="addBtnClick"
- @searchClick="getList"
- :isDisabled="true"
- />
- </div>
+ <SearchCommonView
+ :add-title="'鏂板缓'"
+ :showAdd="false"
+ :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'"
+ :amount-view="false"
+ @addCommonClick="addBtnClick"
+ @searchClick="getList"
+ :isDisabled="true"
+ />
</div>
<div class="list-view">
<div class="table">
@@ -26,11 +24,11 @@
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="210" 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>
@@ -167,14 +165,16 @@
prop: "amount",
isShowColumn: true,
default: true,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
isShowColumn: true,
default: true,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "鍗曚綅",
@@ -189,6 +189,7 @@
width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
+ textAlign:"right",
unit: "锟�"
}
]
@@ -199,11 +200,8 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData() {
- await getLocationData({
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- }).then((res) => {
+ async getLocationData(params) {
+ await getLocationData(params).then((res) => {
if (res.code === 200) {
const list = res.data
this.tableList.tableInfomation = list || []
@@ -211,10 +209,29 @@
}
})
},
+ getData() {
+ if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){
+ this.getLocationData({
+ wareHouseCode:this.$route.params.wareHouseCode,
+ productId:this.$route.params.productId,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ }else{
+ this.getLocationData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ }
+ },
// 鎼滅储
getList(val) {
- console.log(val)
+ this.getLocationData({
+ page: 1,
+ pageSize: this.pagerOptions.pageSize,
+ keyWord: val
+ })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -235,10 +252,14 @@
},
// 鍘嗗彶
handleHistoryClick(row) {
+ console.log(row)
this.$router.push({
name: "inboundOutboundDetail",
params: {
- id: row.produceId,
+ keyWord:row.productTypeName,
+ produceId:row.produceId,
+ productName:row.productName,
+ unit:row.unit,
name: "鎶ヨ〃"
}
})
@@ -250,4 +271,5 @@
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
--
Gitblit v1.8.0