From f9b2a039afe6f674908e483bf19915c0ba06eb71 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:19:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/overview/AddOverviewDialog.vue | 19 +++++++--
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 34 +++++++++--------
src/components/makepager/CommonFormTableView.vue | 17 ++++----
3 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index d2d5e5b..9b8d311 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -510,17 +510,16 @@
})
},
selProductNameClick(item) {
- console.log(item)
- this.tableList.tableData.map((ite) => {
+ this.productIndex = this.tableList.tableData.length - 1
+ this.tableList.tableData.map((ite, index) => {
console.log(ite)
- // if (ite.productName === item.name) {
- ite.productId = item.id
- ite.productName = item.name
- ite.amount = item.amount
- ite.unit = item.unit
- // }
+ if (index === this.productIndex) {
+ ite.productId = item.id
+ ite.productName = item.name
+ ite.amount = item.amount
+ ite.unit = item.unit
+ }
})
- console.log(this.tableList.tableData)
},
// 閫夋嫨浜у搧
selProductClick(item) {
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index e11476a..9b2adc0 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -144,7 +144,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :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 +163,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :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,7 +384,7 @@
async getLocationList() {
await getLocationList({
keyWord: "",
- jointName:this.editConfig.code,
+ jointName: this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
@@ -517,7 +527,7 @@
contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
}
let params = {
- baseOperationType:data.baseOperationType,
+ baseOperationType: data.baseOperationType,
comment: data.comment || "",
companyID: companyID,
companyName: companyName,
@@ -589,6 +599,7 @@
},
// 鏂板
addProductClick(value) {
+ console.log(value)
if (value === "鎿嶄綔") {
console.log(this.tableData)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index 63c4f32..b4330aa 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -268,23 +268,25 @@
},
// 鑾峰彇浜у搧鏁伴噺
getProductCount() {
- getProductList({
- keyWord: "",
- categoryId: this.editConfig.title === "鏂板缓" ? null : this.editConfig.infomation.id,
- page: 1,
- pageSize: 1
- })
- .then((res) => {
- if (res.code === 200) {
- this.statisticsMap.product = res?.total ?? 0
- } else {
+ if (this.editConfig.title !== "鏂板缓") {
+ getProductList({
+ keyWord: "",
+ categoryId: this.editConfig.title === "鏂板缓" ? null : this.editConfig.infomation.id,
+ page: 1,
+ pageSize: 1
+ })
+ .then((res) => {
+ if (res.code === 200) {
+ this.statisticsMap.product = res?.total ?? 0
+ } else {
+ this.statisticsMap.product = 0
+ }
+ })
+ .catch((err) => {
+ console.error(err)
this.statisticsMap.product = 0
- }
- })
- .catch((err) => {
- console.error(err)
- this.statisticsMap.product = 0
- })
+ })
+ }
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
--
Gitblit v1.8.0