From 03c046189b4c4cdf59043990b3a21d0908eb8032 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 28 四月 2024 17:18:46 +0800
Subject: [PATCH] 采购订单模块 判断供应商和产品是否匹配的数据来源对应的接口修改和联调+供应商列表 搜索功能的问题修改
---
src/views/purchaseManage/purchase/components/AddPurchase.vue | 10 +++++-----
src/components/makepager/SearchCommonView.vue | 16 ++++++++--------
src/components/makepager/CommonFormTableView.vue | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index c022770..6eec853 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -494,7 +494,7 @@
}
},
commonInputChange(val, prop, row, scope) {
- if (prop === "amount") {
+ if (prop === "amount"||prop=='purchasePrice') {
this.tableList.tableData.map((ite) => {
if (ite.name === row.name) {
ite.total = row.amount * row.purchasePrice
diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index a4f107a..51003ab 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -174,7 +174,7 @@
}
.el-input__prefix,
.el-input__suffix {
- height: 30px;
+ // height: 30px;
}
.el-input__icon {
line-height: 30px;
@@ -188,13 +188,13 @@
}
.el-input__suffix {
// 澶勭悊鍓嶇紑鍥炬爣涓嶅瀭鐩村眳涓殑闂
- height: auto;
- font-size: 15px;
- &-inner {
- flex-direction: row-reverse;
- -webkit-flex-direction: row-reverse;
- display: flex;
- }
+ // height: auto;
+ // font-size: 15px;
+ // &-inner {
+ // flex-direction: row-reverse;
+ // -webkit-flex-direction: row-reverse;
+ // display: flex;
+ // }
}
.el-input--suffix .el-input__inner {
padding-right: 45px;
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index 1985dc6..59482de 100644
--- a/src/views/purchaseManage/purchase/components/AddPurchase.vue
+++ b/src/views/purchaseManage/purchase/components/AddPurchase.vue
@@ -339,7 +339,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import BomDialog from "@/components/makepager/BomDialog"
-import { getProductList } from "@/api/productManage/product"
+import { getProductListTwo } from "@/api/productManage/product"
import {
addPurchase,
updatePurchase,
@@ -637,7 +637,7 @@
}
} else {
// 缂栬緫
- getProductList({
+ getProductListTwo({
supplierId: this.editConfig.infomation.supplierId,
page: 1,
pageSize: 100
@@ -761,7 +761,7 @@
this.supplierId = item.id
this.editConfig.infomation.supplierId = item.id
}
- await getProductList({
+ await getProductListTwo({
supplierId: item.id,
page: 1,
pageSize: 100
@@ -778,7 +778,7 @@
},
async selClient(row) {
this.$refs.tableRef.supplierId=row.id
- await getProductList({
+ await getProductListTwo({
supplierId: row.id,
page: 1,
pageSize: 100
@@ -800,7 +800,7 @@
this.$set(this.editConfig.infomation, "supplierName", "")
this.supplierId = null
this.$forceUpdate()
- await getProductList({
+ await getProductListTwo({
page: 1,
pageSize: 100
}).then((res) => {
--
Gitblit v1.8.0