From 2d33e0c0fb91fbf58f7d7f415d56dffd96d6263b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 23 十月 2023 14:07:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/overview/AddOverviewDialog.vue | 5 +++--
src/views/overview/OverviewListView.vue | 3 ++-
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue | 4 +++-
src/views/overview/index.vue | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 8e9290c..ff723a9 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -31,7 +31,8 @@
searchOptions: [],
keyword: "",
locationId: 0,
- productId: ""
+ productId: "",
+ baseOperationType:""
}
},
created() {
@@ -130,6 +131,7 @@
// 璇锋眰鏁版嵁
async getData() {
await historyInventoryAdjustment({
+ baseOperationType:this.baseOperationType,
locationId: this.locationId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index c101f61..19c0ba2 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -144,7 +144,7 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -158,7 +158,7 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -374,6 +374,7 @@
async getLocationList() {
await getLocationList({
keyWord: "",
+ jointName:this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index bb94c95..5ba0d19 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -264,10 +264,11 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.operationTypeId = this.$route.params.id
+ this.editConfig.code=this.$route.params.code
this.editConfig.infomation = {}
+ this.editConfig.visible = true
},
// 鐘舵��
getStatus(val) {
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 19c34c8..68f17c7 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -90,7 +90,7 @@
console.log(item)
this.$router.push({
name: "overviewList",
- params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status }
+ params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
})
},
async getData() {
--
Gitblit v1.8.0