From c35ccb51c02c8852e345b831ef5d2dd96c2cf500 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 30 八月 2023 16:39:33 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/views/other/commonDialog/SelectCommonDialog.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 34cde2a..cfe8f7b 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -39,7 +39,7 @@
</template>
<script>
-import { getProductList } from "@/api/common/other"
+import { getProductListFromGrpc,getProductList } from "@/api/productManage/product"
export default {
name: "EditSelCommonDialog",
props: {
@@ -52,6 +52,10 @@
tableInfomation: []
}
}
+ },
+ sign:{
+ type:String,
+ default:''
}
},
components: {},
@@ -105,16 +109,16 @@
},
// 浜у搧鍚嶇О
async getProductList() {
- await getProductList({
- productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
- productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
+
+ let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc;
+ await fn({
page: 1,
- pageSize: 5
+ pageSize: 100
}).then((res) => {
console.log(res.data)
if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- const list = res.data.data.data.map((item) => {
+ if (res.data.data.list && res.data.data.list.length > 0) {
+ const list = res.data.data.list.map((item) => {
return {
...item
}
--
Gitblit v1.8.0