From 5bcbd90662d19331a4dde9047d2aa52e8ab5666c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 30 八月 2023 10:55:32 +0800
Subject: [PATCH] bug修复（4825 4830）
---
src/views/purchaseManage/purchase/index.vue | 114 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 36 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index ea06106..2d3062f 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -21,6 +21,11 @@
@selCommonClick="selCommonClick"
>
<template slot="tableButton">
+ <el-table-column label="鐘舵��" width="120">
+ <template slot-scope="scope">
+ {{ getpurchaseStatus(scope.row.status) }}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="120" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px"
@@ -40,19 +45,21 @@
<!-- 鏂板缓/缂栬緫閿�鍞嚎绱� -->
<!-- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-rightContent-config="editSalesLeadConfig" /> -->
<!-- 璇︽儏 -->
- <DetailSupplier v-if="commonDetail.visible" :common-detail="commonDetail" @submitClick="submitClick" />
+ <DetailSupplier v-if="commonDetail.visible" :common-detail="commonDetail" />
<!-- 鏂板缓/缂栬緫 -->
<AddPurchase v-if="editConfig.visible" :edit-common-config="editConfig" />
</div>
</template>
<script>
+
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import {
- getSalesLeadsList, getDeleteSalesLeads
+ getPurchaseList,getPurchaseInfo,submitPurchase,
} from "@/api/purchaseManage/purchase";
import DetailSupplier from "@/views/purchaseManage/purchase/DetailSupplier"
import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"
+import { getDataByType } from "@/api/data";
export default {
name: "SupplierManage",
props: {},
@@ -67,13 +74,14 @@
visible: false,
infomation: {}
},
- search_map: {},
+ search:'',
editRow:{},
editConfig: {
visible: false,
title: "鍒涘缓",
infomation: {}
},
+ purchaseStatusList:getDataByType('purchaseStatus'),
}
},
created() {
@@ -81,42 +89,46 @@
this.getData()
},
methods: {
+ getpurchaseStatus(val) {
+ if (val) {
+ for (let i in this.purchaseStatusList) {
+ if (this.purchaseStatusList[i].id == val) {
+ return this.purchaseStatusList[i].name;
+ }
+ }
+ } else {
+ return "--";
+ }
+ },
setTable() {
this.tableList = {
tableInfomation: [],
selectIndex: true,
tableColumn: [
{ label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true },
- { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130,},
- { label: "鍗曟嵁绫诲瀷", prop: "contact_name", min: 130 },
- { label: "渚涘簲鍟嗗悕绉�", prop: "contact_phone", min: 130 },
- { label: "閲囪喘鏁伴噺", prop: "sales_resources", min: 130 },
- { label: "鏀惰揣浠撳簱", prop: "province", min: 130 },
- { label: "缁忓姙浜�", prop: "city", min: 130 },
- { label: "鍒跺崟浜�", prop: "member_name", min: 130 },
- { label: "鐘舵��", prop: "member_name", min: 130 },
+ { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true},
+ { label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
+ { label: "渚涘簲鍟嗗悕绉�", prop: "contact", min: 130 },
+ { label: "閲囪喘鏁伴噺", prop: "quantity", min: 130 },
+ { label: "鏀惰揣浠撳簱", prop: "warehouse", min: 130 },
+ { label: "缁忓姙浜�", prop: "handledBy", min: 130 },
+ { label: "鍒跺崟浜�", prop: "creator", min: 130 },
]
}
},
// 璇锋眰鏁版嵁
async getData() {
- await getSalesLeadsList({
- search_map: this.search_map,
+ await getPurchaseList({
+ keyword: this.search,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
.then((res) => {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- province: item.Province.name,
- city: item.City.name,
- sales_resources: item.sales_sources.name,
- member_name: item.member.username
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.count
+ if (res.data.code === 200) {
+ const list = res.data.data.list
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.data.total
+ }
})
.catch((err) => {
console.log(err)
@@ -125,13 +137,11 @@
// 鎼滅储
searchClick(val, content) {
console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
+ this.search = content
this.getData()
},
resetClick() {
- this.search_map = {}
+ this.search = ''
this.getData()
},
// 鏂板缓
@@ -140,19 +150,42 @@
// this.$refs.add.islook = true;
this.editConfig.visible = true
this.editConfig.title = "鍒涘缓"
- this.editConfig.infomation = { }
+ this.editConfig.infomation = {
+ productList:[],
+ purchaseTypeId:'',
+ supplierId:'',
+ supplierName:'',
+ orderSource:'鎵嬪姩鍒涘缓',
+ name:'',
+ contact:'',
+ phone:'',
+ signingDate:'',
+ deliveryDate:'',
+ remark:'',
+ }
},
// 缂栬緫
editClick(row){
+ getPurchaseInfo({id:row.ID}).then((res) => {
+ if (res.code == 200) {
+ this.editConfig.visible = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = {
+ productList:res.data.productList,
+ supplierName:res.data.purchase.supplier.name,
+ ...res.data.purchase,
+ }
+ }else{
+ this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�')
+ }
+ })
// this.editRow = row;
// this.$refs.add.islook = true;
- this.editConfig.visible = true
- this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+
},
// 纭鍙戣揣
- submitClick() {
+ submitClick(row) {
this.$confirm("鏄惁鎻愪氦?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -160,7 +193,7 @@
})
.then(() => {
console.log("dddd")
- getDeleteSalesLeads({ ids: this.selValueList }).then((response) => {
+ submitPurchase({ id: row.ID }).then((response) => {
if (response.code === 200) {
this.$message.success("鎻愪氦鎴愬姛")
this.getData()
@@ -175,8 +208,17 @@
// 璇︽儏
selCommonClick(row) {
console.log(row)
- this.commonDetail.visible = true
- this.commonDetail.infomation = { ...row }
+ getPurchaseInfo({id:row.ID}).then((res) => {
+ if (res.code == 200) {
+ this.commonDetail.visible = true
+ this.commonDetail.infomation = {
+ productList:res.data.productList,
+ ...res.data.purchase
+ }
+ }else{
+ this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�')
+ }
+ })
}
}
}
--
Gitblit v1.8.0