From 65bc5629504c5e138d8540cdf9b0eb3796842d4a Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 18 十一月 2023 17:14:44 +0800
Subject: [PATCH] fix:采购管理-产品列表与供应商列表关联
---
src/common/untils/request.js | 18 ++++++++++++------
src/views/purchaseManage/purchase/components/AddPurchase.vue | 18 +++++++++++++++++-
src/components/makepager/CommonFormTableView.vue | 5 +++--
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index 9270bbc..a69a0ae 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -11,12 +11,18 @@
/* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
Axios.interceptors.request.use(
(config) => {
- // 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
- // let token = util.cookies.get("token");
- // if (token != undefined) {
- // config.headers.Authorization = "Bearer " + token;
- // }
-
+ // // 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
+ // // let token = util.cookies.get("token");
+ // // if (token != undefined) {
+ // // config.headers.Authorization = "Bearer " + token;
+ // // }
+ let token = document.cookie.replace(
+ /(?:(?:^|.*;\s*)token\s*=\s*([^;]*).*$)|^.*$/,
+ "$1",
+ );
+ if (token) {
+ config.headers.Authorization = "Bearer " + token;
+ }
return config
},
(error) => {
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 3f0eb9f..bb029e1 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -188,6 +188,7 @@
type: Object,
default: () => {
return {
+ tableProductList:[],
disabled:false,
tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
tableColumn: [
@@ -237,7 +238,7 @@
watch: {
productTableList() {
this.tableList = this.productTableList
- }
+ },
},
methods: {
// 浜у搧鍚嶇О
@@ -359,7 +360,7 @@
},
// 閫夋嫨浜у搧鍚嶇О鐩稿叧鏂规硶
querySearchAsync(queryString, cb) {
- var restaurants = this.productList
+ var restaurants = this.productTableList.tableProductList
var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
cb(results)
},
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index 97e8b19..7764bdb 100644
--- a/src/views/purchaseManage/purchase/components/AddPurchase.vue
+++ b/src/views/purchaseManage/purchase/components/AddPurchase.vue
@@ -278,6 +278,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView";
import BomDialog from "@/components/makepager/BomDialog";
+import { getProductList } from "@/api/productManage/product"
import {
addPurchase,
@@ -571,6 +572,7 @@
},
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
+ this.productTableList.tableProductList=[]
var restaurants = [];
if (value === "supplier") {
restaurants = this.supplierList;
@@ -587,11 +589,22 @@
);
};
},
- handleSelectClient(value, item) {
+ async handleSelectClient(value, item) {
+ this.productTableList.supplierId=item.ID
if (value === "client") {
this.supplierId = item.id;
this.editConfig.infomation.supplierId=item.ID
}
+ await getProductList({
+ supplierId:item.ID,
+ page:1,
+ pageSize:100
+ }).then((res)=>{
+ if(res.data.code===200){
+ this.productTableList.tableProductList = res.data.data.list
+ console.log(this.productTableList.tableProductList,"pop")
+ }
+ })
},
selClientClick() {
this.editSelectSupplierConfig.editVisible = true;
@@ -604,6 +617,7 @@
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
+ this.emptyProductClick()
if (value == "client") {
this.$set(this.editConfig.infomation, "supplierName", "");
this.supplierId = null;
@@ -634,6 +648,8 @@
// });
}
this.productTableList = {
+ tableProductList:[],
+ supplierId:undefined,
tableData: this.tableData,
disabled:this.editConfig.isDisabled,
tableColumn: [
--
Gitblit v1.8.0