From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/service/serviceContract/DetailServiceContract.vue | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index f7b3d0d..4ad6ce6 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -9,7 +9,7 @@
>
<template slot="title">
<div class="header">
- <span class="header-label">鏈嶅姟鍚堝悓缂栧彿</span>
+ <span class="header-label">鏈嶅姟鍚堝悓</span>
<span class="header-title">{{ detailConfig.infomation.number }}</span>
</div>
</template>
@@ -17,11 +17,11 @@
<div class="tab-view">
<el-tabs v-model="activeName" @tab-click="tabsClick">
<el-tab-pane label="璇︽儏" name="first"></el-tab-pane>
- <el-tab-pane label="鏀舵璁″垝" name="collection">
+ <!-- <el-tab-pane label="鏀舵璁″垝" name="collection"> -->
<!-- <template slot="label">
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
<el-tab-pane label="鏀舵鍗�" name="receipt"></el-tab-pane>
<el-tab-pane label="瀹㈡埛鏈嶅姟鍗�" name="clientService"> </el-tab-pane>
<el-tab-pane label="閿�鍞彂绁�" name="invoice"></el-tab-pane>
@@ -43,7 +43,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -65,7 +65,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -83,9 +83,10 @@
<div class="termsConditions">
<div class="content-title">{{ "鏉℃涓庢潯绾�" + "锛�" }}</div>
<div class="content-termsConditions">
- <ul>
+ {{ "\n" + detailConfig.infomation.terms }}
+ <!-- <ul>
<li v-for="(item, index) in Status.serviceContract" :key="index">{{ item }}</li>
- </ul>
+ </ul> -->
</div>
</div>
</div>
@@ -109,7 +110,7 @@
</div>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info">
+ <!-- <div class="basic-info">
<div class="basic-info-label" @click="expandClick('annex')">
<i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
@@ -125,7 +126,7 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info">
<div class="basic-info-label" @click="expandClick('product')">
@@ -144,16 +145,16 @@
</div>
</div>
<div v-if="activeName === 'collection'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <CollectionPlan :isDetail="true" :add-config="addConfig" :source-type="2" />
</div>
<div v-if="activeName === 'receipt'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <Receipt :isDetail="true" :add-config="addConfig" :source-type="2" />
</div>
<div v-if="activeName === 'clientService'" class="second">
- <ClientServiceOrder :isDetail="true" />
+ <ClientServiceOrder :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'invoice'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <SaleInvoice :isDetail="true" :add-config="addConfig" :source-type="2" />
</div>
</div>
</el-drawer>
@@ -164,6 +165,9 @@
import ClientServiceOrder from "@/views/service/clientServiceOrder"
import Status from "@/common/const/salesFixedStatus"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import CollectionPlan from "@/views/other/payment/collectionPlan"
+import Receipt from "@/views/other/payment/receipt"
+import SaleInvoice from "@/views/other/payment/saleInvoice"
export default {
name: "DetailSpecification",
props: {
@@ -177,7 +181,7 @@
}
}
},
- components: { ClientServiceOrder, CommonFormTableView },
+ components: { ClientServiceOrder, CommonFormTableView, CollectionPlan, Receipt, SaleInvoice },
computed: {},
data() {
return {
@@ -196,14 +200,27 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ keywordType: "鏈嶅姟鍚堝悓",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id,
+ amountTotal: this.detailConfig.infomation.amountTotal,
+ salesDetailsId:this.serviceContractDetail.infomation.salesDetailsId,
+ serviceContractId:this.serviceContractDetail.infomation.id
+ }
this.setTableForm()
},
mounted() {},
@@ -218,9 +235,9 @@
},
{
leftStr: "璐熻矗浜�",
- leftValue: item.memberId,
+ leftValue: item.member.username,
rightStr: "鑱旂郴浜哄鍚�",
- rightValue: item.contactId
+ rightValue: item.contact.name
},
{
leftStr: "閿�鍞満浼�",
@@ -254,7 +271,7 @@
},
{
leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
+ leftValue: item.createTime,
rightStr: "鏁伴噺鍚堣",
rightValue: ""
}
@@ -299,7 +316,7 @@
if (value === "basic") {
this.isBasicExpand = !this.isBasicExpand
} else if (value === "dynamic") {
- this.isDynamicExpand = !this.isLabelExpand
+ this.isDynamicExpand = !this.isDynamicExpand
} else if (value === "delivery") {
this.isDeliveryExpand = !this.isDeliveryExpand
} else if (value === "termsConditions") {
@@ -314,33 +331,13 @@
},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
- }
- ],
+ tableData: this.detailConfig.infomation.products,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" }
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
}
@@ -494,6 +491,7 @@
align-items: center;
font-size: 14px;
font-family: PingFangSC;
+ min-height: 40px;
// padding: 5px 0;
.content-title {
width: 320px;
@@ -501,13 +499,14 @@
color: #555;
}
.content-termsConditions {
- margin-left: 25px;
+ margin: 0px 25px 15px;
font-size: 13px;
color: #333;
- li {
- margin: 5px 0;
- border-bottom: 0px solid #f9f9fb;
- }
+ white-space: pre-wrap;
+ // li {
+ // margin: 5px 0;
+ // border-bottom: 0px solid #f9f9fb;
+ // }
}
}
}
--
Gitblit v1.8.0