From ef741dffd56bfced74003b8be140cf9291eeb180 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 4 Nov 2022 23:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomDecorationRecord/roomDecorationRecord.html         | 2 +-
 .../purchaseApplyDetailManage.html                         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/components/property/roomDecorationRecord/roomDecorationRecord.html b/public/components/property/roomDecorationRecord/roomDecorationRecord.html
index ee5eb22da..a8b1403c9 100755
--- a/public/components/property/roomDecorationRecord/roomDecorationRecord.html
+++ b/public/components/property/roomDecorationRecord/roomDecorationRecord.html
@@ -1,4 +1,4 @@
-<div id="roomDecorationRecordModel" class="modal fade" tabindex="-1" role="dialog"
+<div id="roomDecorationRecordModel" class="modal fade"  role="dialog"
      aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
diff --git a/public/pages/common/purchaseApplyDetailManage/purchaseApplyDetailManage.html b/public/pages/common/purchaseApplyDetailManage/purchaseApplyDetailManage.html
index e195646cf..3fcd2ba85 100644
--- a/public/pages/common/purchaseApplyDetailManage/purchaseApplyDetailManage.html
+++ b/public/pages/common/purchaseApplyDetailManage/purchaseApplyDetailManage.html
@@ -188,7 +188,7 @@
                             <th class="text-center"><span><vc:i18n name="申请数量" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="采购" namespace="purchaseApplyDetailManage"></vc:i18n></span>/出库数量</th>
                             <th class="text-center"><span><vc:i18n name="采购价格" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
-                            <th class="text-center"><span><vc:i18n name="采购总价" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
+                            <th class="text-center"><span><vc:i18n name="总价" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="申请备注" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="状态" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="创建时间" namespace="purchaseApplyDetailManage"></vc:i18n></span></th>
@@ -223,8 +223,9 @@
                                 ￥{{purchaseApplyDetail.price ? purchaseApplyDetail.price : '0.00'}}
                             </td>
                             <td class="text-center">
-                                {{purchaseApplyDetail.resOrderType == '10000' ? '￥' +
-                                purchaseApplyDetail.totalApplyPrice : '-'}}
+                                <!-- {{purchaseApplyDetail.resOrderType == '10000' ? '￥' +
+                                purchaseApplyDetail.totalApplyPrice : '-'}} -->
+                                {{purchaseApplyDetail.totalApplyPrice}}
                             </td>
                             <td class="text-center">{{purchaseApplyDetail.remark}}</td>
                             <td class="text-center">{{purchaseApplyDetail.stateName}}</td>