From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/service/serviceContract/DetailServiceContract.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index 403dc17..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>
@@ -200,8 +200,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
@@ -216,7 +216,10 @@
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
+ contact_id: this.detailConfig.infomation.contact_id,
+ amountTotal: this.detailConfig.infomation.amountTotal,
+ salesDetailsId:this.serviceContractDetail.infomation.salesDetailsId,
+ serviceContractId:this.serviceContractDetail.infomation.id
}
this.setTableForm()
},
@@ -268,7 +271,7 @@
},
{
leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
+ leftValue: item.createTime,
rightStr: "鏁伴噺鍚堣",
rightValue: ""
}
--
Gitblit v1.8.0