From d0343f5e1435b45141962d7a90c6c2e3fedb8cbb Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 19 十月 2023 10:28:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/reportForm/locationReport/index.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 2da4e3e..8e357aa 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>
@@ -199,11 +197,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 +206,20 @@
}
})
},
+ getData() {
+ this.getLocationData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ },
// 鎼滅储
getList(val) {
- console.log(val)
+ this.getLocationData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ keyWord: val
+ })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -238,7 +243,8 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- id: row.produceId,
+ row: row,
+ // id: row.produceId,
name: "鎶ヨ〃"
}
})
--
Gitblit v1.8.0