From 29b5ffe318b8ab32865ebebedd865ea2aa3f6c7e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 06 九月 2023 17:45:31 +0800
Subject: [PATCH] 供应商列表相关bug修复及样式调整
---
src/views/purchaseManage/purchase/DetailSupplier.vue | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/src/views/purchaseManage/purchase/DetailSupplier.vue b/src/views/purchaseManage/purchase/DetailSupplier.vue
index f57178d..b13839c 100644
--- a/src/views/purchaseManage/purchase/DetailSupplier.vue
+++ b/src/views/purchaseManage/purchase/DetailSupplier.vue
@@ -12,10 +12,10 @@
<span class="header-title">{{ detailConfig.infomation.name }}</span>
</div>
<div class="btn" style="float: right; margin-right: 30px">
- <el-button type="primary" size="mini" style="margin-right: 5px"
+ <el-button type="primary" size="mini" disabled style="margin-right: 5px"
>鎵撳嵃</el-button
>
- <el-button type="primary" size="mini" @click="emailClick"
+ <el-button type="primary" disabled size="mini" @click="emailClick"
>Email閫氱煡涓嬪崟</el-button
>
@@ -74,7 +74,7 @@
</ul>
<div class="business_scope">
<div class="content-title">{{ "澶囨敞淇℃伅锛�" }}</div>
- <div class="content-data">{{ record ? record : "--" }}</div>
+ <div class="content-data">{{ remark ? remark : "--" }}</div>
</div>
</div>
</div>
@@ -126,21 +126,21 @@
<div class="table-bottom">
<div class="table-bottom-item">
<div class="table-bottom-l">
- 鏁村崟鎶樻墸锛氱洿鎺ラ檷浠�
+ 鏁村崟鎶樻墸锛歿{ detailConfig.infomation.wholeDiscountType==1?'鐧惧垎姣旈檷浠�':'鐩存帴闄嶄环' }}
</div>
- <div class="table-bottom-r">0.00</div>
+ <div class="table-bottom-r">{{detailConfig.infomation.wholeDiscount }}</div>
</div>
<div class="table-bottom-item">
<div class="table-bottom-l">
- 璋冩暣锛氬鍔�
+ 璋冩暣锛歿{ detailConfig.infomation.priceAdjustmentType==1?'澧炲姞':'鍑忓皯' }}
</div>
- <div class="table-bottom-r">0.00</div>
+ <div class="table-bottom-r">{{ detailConfig.infomation.priceAdjustment }}</div>
</div>
<div class="table-bottom-item">
<div class="table-bottom-l">
鍚堣
</div>
- <div class="table-bottom-r">26000.00</div>
+ <div class="table-bottom-r">{{detailConfig.infomation.realTotalPrice }}</div>
</div>
</div>
</div>
@@ -153,6 +153,7 @@
<script>
import { deletePurchase } from "@/api/purchaseManage/purchase";
+import { getDataByType } from "@/api/data";
export default {
name: "DetailSupplier",
props: {
@@ -177,17 +178,18 @@
basicInfoList: [],
isDynamicExpand: true, // 璐︽埛淇℃伅
dynamicInfoList: [],
- record: "", // 鏈�鏂拌繘灞�
+ remark: "", // 鏈�鏂拌繘灞�
noContactDays: 0,
newContactDays: "",
isExpandThree: true, //浜у搧淇℃伅
tableList: {},
showSummary:{
show: true,
- sumProp: ["number", "total"],
- mergeNumber: 4,
+ sumProp: ["amount", "total"],
+ mergeNumber: 5,
totalName:'灏忚'
},
+ purchaseStatusList:getDataByType('purchaseStatus'),
};
},
created() {
@@ -197,6 +199,17 @@
mounted() {},
computed: {},
methods: {
+ getpurchaseStatus(val) {
+ if (val) {
+ for (let i in this.purchaseStatusList) {
+ if (this.purchaseStatusList[i].id == val) {
+ return this.purchaseStatusList[i].name;
+ }
+ }
+ } else {
+ return "--";
+ }
+ },
// email 閫氱煡涓嬪崟
emailClick() {},
// 鍒犻櫎
@@ -223,7 +236,7 @@
if (item.FollowRecord && item.FollowRecord.length > 0) {
this.noContactDays = this.getDiffDay(Date.now(), this.newContactDays);
}
- this.record =item.record?item.record:''
+ this.remark =item.remark?item.remark:''
this.formInfoList = [
{
str: "渚涘簲鍟嗗悕绉�",
@@ -231,15 +244,15 @@
},
{
str: "鍚堣",
- value: "",
+ value:item.realTotalPrice,
},
{
str: "宸叉敹绁ㄩ噾棰�",
- value: "",
+ value: item.invoiceAmount,
},
{
str: "宸蹭粯閲戦",
- value: "",
+ value: item.paidAmount,
},
{
str: "绛剧害鏃ユ湡",
@@ -247,15 +260,15 @@
},
{
str: "閲囪喘璐熻矗浜�",
- value: "",
+ value: item.principal,
},
{
str: "鏈敹绁ㄩ噾棰�",
- value: "",
+ value: item.unInvoiceAmount,
},
{
str: "搴斾粯閲戦",
- value: "",
+ value: item.shouldPayAmount,
},
];
this.basicInfoList = [
@@ -267,9 +280,9 @@
},
{
leftStr: "閲囪喘鍗曠姸鎬�",
- leftValue: item.contact_name,
+ leftValue: this.getpurchaseStatus(item.status),
rightStr: "閲囪喘璐熻矗浜�",
- rightValue: item.contact_position,
+ rightValue: item.principal,
},
{
leftStr: "閲囪喘鑱旂郴浜�",
@@ -285,7 +298,7 @@
},
{
leftStr: "鍒拌揣浠撳簱",
- leftValue: item.sales_resources,
+ leftValue: item.warehouse,
rightStr: "",
rightValue: "",
},
@@ -293,19 +306,19 @@
this.dynamicInfoList = [
{
leftStr: "鍚堣",
- leftValue: this.noContactDays,
+ leftValue: item.realTotalPrice,
rightStr: "宸叉敹绁ㄩ噾棰�",
- rightValue: this.newContactDays,
+ rightValue: item.invoiceAmount,
},
{
leftStr: "宸蹭粯鎬婚",
- leftValue: "",
+ leftValue:item.paidAmount,
rightStr: "鏈敹绁ㄩ噾棰�",
- rightValue: "",
+ rightValue: item.unInvoiceAmount,
},
{
leftStr: "搴斾粯閲戦",
- leftValue: "",
+ leftValue: item.shouldPayAmount,
rightStr: "",
rightValue: "",
},
@@ -314,8 +327,8 @@
tableInfomation: item.productList?item.productList:[],
selectIndex: true,
tableColumn: [
- { label: "浜у搧鍚嶇О", prop: "name", min: 190, isCommonClick: true },
- { label: "浜у搧缂栫爜", prop: "number", min: 130, isCommonClick: true },
+ { label: "浜у搧鍚嶇О", prop: "name", min: 160, },
+ { label: "浜у搧缂栫爜", prop: "number", min: 130, },
{ label: "璁￠噺鍗曚綅", prop: "unit", min: 130 },
{ label: "瑙勬牸鍨嬪彿", prop: "specifications", min: 130 },
{ label: "鏁伴噺", prop: "amount", min: 130 },
--
Gitblit v1.8.0