From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/add_subtract_entrust.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/company/src/components/business/add_subtract_entrust.vue b/company/src/components/business/add_subtract_entrust.vue
index be9471f..f9ee79f 100644
--- a/company/src/components/business/add_subtract_entrust.vue
+++ b/company/src/components/business/add_subtract_entrust.vue
@@ -23,8 +23,8 @@
<span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
- <span>{{item.price}}鍏�</span>
+ <el-form-item label="璐圭敤" v-if="item && item.solutionType==0">
+ <span>{{item.price}} 鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
<span v-if="item.timeUnit === 2">/鏈�</span>
@@ -85,9 +85,9 @@
</el-table-column>
</el-table>
<div class="info" v-if="item">
- <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
- <span v-if="item.specialInfo">{{item.specialInfo}}</span>
- <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+ <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+ <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
+ <span v-if="item.ortherInfo" v-html="item.ortherInfo"> </span>
</div>
</GlobalWindow>
</template>
--
Gitblit v1.9.3