From 9096f93e806b44a06eb8a7c41d0bb2e21830bc3c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 28 九月 2023 15:03:32 +0800
Subject: [PATCH] 编辑库存接口修改、公共组件高度调整
---
src/components/makepager/CommonFormTableView.vue | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 997cf9e..c569190 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,9 +1,16 @@
<template>
- <div class="page-view">
- <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
+ <div class="page-view" :class="{ setHeight: isinventory || islistingrules }">
+ <el-form
+ ref="form"
+ :model="tableList"
+ :show-message="false"
+ label-position="right"
+ :class="{ setHeight: isinventory || islistingrules }"
+ >
<el-table
:data="tableList.tableData"
style="width: 100%"
+ :class="{ setHeight: isinventory || islistingrules }"
:header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
:row-class-name="tableRowClassName"
@row-click="tableRowClick"
@@ -154,8 +161,8 @@
"
>
<el-option
- v-for="item in selLocationOptions"
- :key="item.id"
+ v-for="(item, index) in selLocationOptions"
+ :key="index"
:label="item.name"
:value="{ value: item.id, label: item.name }"
>
@@ -249,6 +256,7 @@
import { getProductList } from "@/api/product/product"
import { getLocationList } from "@/api/warehouseManage/warehouse"
import { getCompanyList } from "@/api/common/other"
+import { getRuleList } from "@/api/operate/inventoryAdjustment"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
@@ -307,9 +315,10 @@
}
},
created() {
- this.getProductList()
if (this.isinventory) {
- this.getLocationList()
+ this.getRuleList()
+ } else {
+ this.getProductList()
}
if (this.islistingrules) {
this.getLocationList()
@@ -335,6 +344,20 @@
if (res.data && res.data.length > 0) {
this.productNameOptions = res.data
}
+ }
+ })
+ },
+ // 搴撳瓨璋冩暣鑾峰彇浣嶇疆鍜屼骇鍝�
+ async getRuleList() {
+ await getRuleList({
+ locationId: 0,
+ productId: ""
+ }).then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.selLocationOptions = list.locationList
+ this.productNameOptions = list.productList
}
})
},
@@ -384,6 +407,18 @@
ite.unit = item.unit
}
})
+ if (this.isinventory) {
+ getRuleList({
+ locationId: 0,
+ productId: item.value
+ }).then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.selLocationOptions = list.locationList
+ }
+ })
+ }
console.log(this.tableList.tableData)
this.$emit("selProductClick", item)
},
@@ -391,6 +426,19 @@
selLocationClick(item, prop) {
console.log(item)
console.log(this.tableList.tableData)
+ if (this.isinventory) {
+ getRuleList({
+ locationId: item.value,
+ productId: ""
+ }).then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ // this.selLocationOptions = list.locationList
+ this.productNameOptions = list.productList
+ }
+ })
+ }
this.$emit("selLocationClick", item, prop)
},
// 閫夋嫨鍗曚綅/鐢ㄦ埛
@@ -493,8 +541,12 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
+.setHeight {
+ height: 100%;
+}
.page-view {
min-width: 100px;
+
.el-form-item {
margin-bottom: 0;
.custom-name {
--
Gitblit v1.8.0