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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 63c0a0d..cfe8f7b 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -39,7 +39,7 @@
</template>
<script>
-import { getProductListFromGrpc } from "@/api/productManage/product"
+import { getProductListFromGrpc,getProductList } from "@/api/productManage/product"
export default {
name: "EditSelCommonDialog",
props: {
@@ -52,6 +52,10 @@
tableInfomation: []
}
}
+ },
+ sign:{
+ type:String,
+ default:''
}
},
components: {},
@@ -105,7 +109,9 @@
},
// 浜у搧鍚嶇О
async getProductList() {
- await getProductListFromGrpc({
+
+ let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc;
+ await fn({
page: 1,
pageSize: 100
}).then((res) => {
--
Gitblit v1.8.0