From 19f5949491976905f3cd3fd53407ff4898080a46 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 三月 2024 17:07:58 +0800
Subject: [PATCH] bug修复
---
src/views/supplierManage/supplier/index.vue | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/src/views/supplierManage/supplier/index.vue b/src/views/supplierManage/supplier/index.vue
index e1e85eb..5a2ed24 100644
--- a/src/views/supplierManage/supplier/index.vue
+++ b/src/views/supplierManage/supplier/index.vue
@@ -22,8 +22,9 @@
ref="tableSupplier"
:table-list="tableList"
@selCommonClick="selCommonClick"
- @tableRowClick="tableRowClick"
@selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ :selectClassRow="selectRow"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="100">
@@ -62,7 +63,7 @@
>
<template slot="leftButton">
<div class="sub-title"><span class="sub-title-decorator"></span>鍙彁渚涚殑浜у搧</div>
- <el-button type="primary" size="mini">鍒涘缓閲囪喘鍗�</el-button>
+ <el-button type="primary" size="mini" @click="creatPurchase">鍒涘缓閲囪喘鍗�</el-button>
</template>
<template slot="rightButton">
<el-button type="primary" size="mini" @click="addNewProductClick">娣诲姞鏂颁骇鍝�</el-button>
@@ -110,22 +111,26 @@
<RaleteSupplierList v-if="raleteSupplierConfig.visible" :common-config="raleteSupplierConfig" />
<!-- 娣诲姞鏂颁骇鍝� -->
<AddNewProduct v-if="newProductConfig.visible" :add-common-config="newProductConfig" />
+ <!-- 鏂板缓/缂栬緫 -->
+ <AddPurchase v-if="editPurchaseConfig.visible" :edit-common-config="editPurchaseConfig" />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getSupplierList, changeSupplierStatus } from "@/api/supplierManage/supplier"
+import { getPurchaseList } from "@/api/purchaseManage/purchase"
import DetailSupplier from "@/views/supplierManage/supplier/DetailSupplier"
import AddSupplier from "@/views/supplierManage/supplier/AddSupplier"
import RaleteSupplierList from "@/views/supplierManage/supplier/RaleteSupplierList"
import AddNewProduct from "@/views/supplierManage/supplier/AddNewProduct"
import { getProductList, deleteProduct } from "@/api/productManage/product"
+import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"
export default {
name: "SupplierManage",
props: {},
- components: { DetailSupplier, AddSupplier, RaleteSupplierList, AddNewProduct },
+ components: { DetailSupplier, AddSupplier, RaleteSupplierList, AddNewProduct, AddPurchase },
mixins: [pageMixin],
computed: {},
data() {
@@ -138,7 +143,8 @@
searchProductOptions: [], // 浜у搧鏌ヨ
commonDetail: {
visible: false,
- infomation: {}
+ infomation: {},
+ productListInfo: []
},
editConfig: {
visible: false,
@@ -180,7 +186,16 @@
{ label: "閲囪喘浠锋牸", prop: "purchasePrice", min: 130 },
{ label: "渚涜揣鏃堕暱(澶�)", prop: "deliveryTime", min: 130 },
{ label: "鐗╂祦鏃堕暱(澶�)", prop: "shippingDuration", min: 130 }
- ]
+ ],
+ editPurchaseConfig: {
+ // 鍒涘缓閲囪喘
+ visible: false,
+ title: "鍒涘缓",
+ infomation: {
+ supplierName: ""
+ }
+ },
+ selectRow: {}
}
},
created() {
@@ -269,6 +284,7 @@
const list = res.data.list.map((item) => {
return {
...item,
+ id: item.id,
status_name: item.status === 0 ? "鏈惎鐢�" : "鍚敤"
}
})
@@ -276,13 +292,14 @@
this.tableList.tableInfomation = list || []
this.pagerOptions.totalCount = res.data.total
if (list && list.length > 0) {
- this.supplierId = this.tableList.tableInfomation[0].ID
+ this.supplierId = this.tableList.tableInfomation[0].id
+ this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
} else {
this.supplierId = 0
}
- this.$nextTick(() => {
- this.$refs.tableSupplier.$refs.table.setCurrentRow(this.tableList.tableInfomation[0])
- })
+ // this.$nextTick(() => {
+ // this.$refs.tableSupplier.$refs.table.setCurrentRow(this.tableList.tableInfomation[0])
+ // })
// 閲嶆柊鑾峰彇渚涘簲鍟嗗垪琛ㄥ悗搴旇閲嶇疆浜у搧鍒楄〃椤电爜
this.productPagerOptions.currPage = 1
@@ -306,14 +323,13 @@
page: this.productPagerOptions.currPage,
pageSize: this.productPagerOptions.pageSize
}).then((res) => {
- console.log(res.data)
- const list = res.data.data.list.map((item) => {
+ let list = res.data.list.map((item) => {
return {
...item
}
})
this.productTableList.tableInfomation = list || []
- this.productPagerOptions.totalCount = res.data.data.total
+ this.productPagerOptions.totalCount = res.data.total
})
},
// 鎼滅储渚涘簲鍟�
@@ -331,13 +347,16 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { fileId: 0 }
+ this.editConfig.infomation = {
+ fileId: 0,
+ responsiblePersonName: document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ }
},
// 鍚敤渚涘簲鍟�
async enableClick(row, value) {
let status = value === "鍚敤" ? 1 : 0
await changeSupplierStatus({
- id: row.ID,
+ id:Number(row.id),
status: status
}).then((res) => {
if (res.code === 200) {
@@ -366,7 +385,6 @@
},
// 淇敼浜у搧
editClick(row) {
- console.log(row)
this.newProductConfig.visible = true
this.newProductConfig.title = "淇敼"
this.newProductConfig.infomation = { ...row }
@@ -379,7 +397,7 @@
type: "warning"
})
.then(() => {
- deleteProduct({ id: row.ID }).then((response) => {
+ deleteProduct({ id: row.id }).then((response) => {
if (response.code === 200) {
this.$message.success("鍒犻櫎鎴愬姛")
this.getProductList()
@@ -399,14 +417,16 @@
this.selValueList = list
},
tableRowClick(row) {
- console.log(row)
this.productPagerOptions.currPage = 1
- this.supplierId = row.ID
+ this.selectRow = row
+ this.supplierId = row.id
this.getProductList()
},
// 璇︽儏
- selCommonClick(row) {
- console.log(row)
+ async selCommonClick(row) {
+ await getPurchaseList({ pageSize: 10, page: 1, supplierId: Number(row.id) }).then((res) => {
+ this.commonDetail.productListInfo = res.data.list
+ })
this.commonDetail.visible = true
this.commonDetail.infomation = { ...row }
},
@@ -419,6 +439,16 @@
currentProductHandler(val) {
this.productPagerOptions.currPage = val
this.getProductList()
+ },
+ // 鍒涘缓閲囪喘鍗�
+ creatPurchase() {
+ this.editPurchaseConfig.visible = true
+ this.editPurchaseConfig.title = "鏂板缓"
+ this.editPurchaseConfig.infomation = {
+ supplierId: this.selectRow.id,
+ purchaseTypeId:"2",
+ supplierName: this.selectRow.name
+ }
}
}
}
--
Gitblit v1.8.0