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/inventoryReport/index.vue | 53 +++++++++++------
src/views/reportForm/inboundOutboundDetail/index.vue | 5 +
src/components/makepager/CommonFormTableView.vue | 1
src/views/reportForm/locationReport/index.vue | 46 ++++++++------
src/views/operate/inventoryAdjustment/index.vue | 16 +++-
5 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 263508c..5bd8931 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -121,7 +121,6 @@
v-else
v-model="scope.row[item.prop]"
placeholder=""
- :min="0"
:precision="2"
:controls="false"
size="mini"
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 48c3806..d31d459 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -87,7 +87,8 @@
productId: 0,
differenceAmount: 0,
amount: 0,
- operationId: 0
+ operationId: 0,
+ adjustAmount:0,
}
},
created() {
@@ -121,6 +122,7 @@
if (res.code === 200) {
console.log(res)
const list = res.data.map((item) => {
+ item.adjustAmount=0
return {
...item,
isSet: false,
@@ -138,7 +140,10 @@
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
console.log(val, prop, row)
- this.differenceAmount = val
+ console.log(val-row.amount,"缁撴灉")
+ this.adjustAmount=val-row.amount
+ this.tableList.tableData[row.index].adjustAmount=this.adjustAmount
+ // this.differenceAmount = val
},
// 鏂板
addProductClick() {
@@ -174,8 +179,9 @@
this.showDiscard = false
let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
requestUrl({
- amount: this.amount,
- differenceAmount: this.differenceAmount,
+ // amount: this.amount,
+ adjustAmount:this.adjustAmount,
+ // differenceAmount: this.differenceAmount,
locationId: this.locationId,
operationId: this.operationId,
productId: this.productId
@@ -262,7 +268,7 @@
},
// 琛岀偣鍑�
tableRowClick(row, rowIndex) {
- console.log("11111")
+ this.rowIndex=rowIndex
this.isSel()
if (!this.isNoProduct && this.currentRowId === 0) {
this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 46a21b5..c31f520 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -168,7 +168,10 @@
async getData() {
if (this.params.name === "鎶ヨ〃") {
await getHistory({
- productId: this.params.id,
+ keyWord:this.params.row.productTypeName,
+ produceId:this.params.row.id,
+ productName:this.params.row.productName,
+ unit:this.params.row.unit,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index b03195f..8f96fb2 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>
@@ -145,7 +145,8 @@
stashRadio: "1",
pageSizes: [15, 30],
oldRadioBtn: "",
- metaTitle: this.$route.meta.title
+ metaTitle: this.$route.meta.title,
+ searchStr: ""
}
},
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]
@@ -268,7 +275,12 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
getList(val) {
- console.log(val)
+ this.searchStr = val
+ this.getInventoryData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ keyWord: val
+ })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -280,8 +292,8 @@
// 鏂板缓
addBtnClick() {
// this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓"
- this.getData()
+ // this.editConfig.title = "鏂板缓"
+ // this.getData()
},
// 鐘舵��
getStatus(val) {
@@ -329,14 +341,7 @@
//鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
// 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
- async getData() {
- let params = {
- categoryIds: this.categoryListId,
- keyWord:this.productName,
- 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
@@ -345,6 +350,16 @@
}
})
},
+ 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() {
await getProductCategoryList({
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