修复文字描述

application/em/model/EmInvoice.php

@@ -100,6 +100,7 @@ class EmInvoice extends Base
             if($receipt) $useage['photo'] = $receipt;
         } else {
             $useage['photo'] = [];
+
         }
 
         //获取电表信息
@@ -196,6 +197,19 @@ class EmInvoice extends Base
                 $totle['settle_amount'] =  0;
             }
         }
+
+        if($inv->payment_balance == 0){
+            $inv->paid_amount = $inv->payment_amount;
+        } else {
+            $inv->paid_amount = $inv->payment_amount - $inv->payment_balance;
+        }
+
+        if($inv->settle_balance == 0){
+            $inv->sett_amount = $inv->settle_amount;
+        } else {
+            $inv->sett_amount = $inv->settle_amount - $inv->settle_balance;
+        }
+
         return $inv;
     }
 

application/em/view/invoice/detail.html

@@ -142,6 +142,16 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="layui-col-md5">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">
+                                        已缴金额:
+                                    </label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="paid_amount" name="paid_amount" autocomplete="off" class="layui-input" value="{$inv.payment_amount|round=3}" disabled="disabled">
+                                    </div>
+                                </div>
+                            </div>
 
                             <div class="layui-col-md5">
                                 <div class="layui-form-item">
@@ -162,7 +172,20 @@
                                         应结金额:
                                     </label>
                                     <div class="layui-input-inline">
-                                        <input type="text" id="settle_amount" name="settle_amount" autocomplete="off" class="layui-input" value="{$inv.useage.totle.settle_amount|round=3}" disabled="disabled">
+                                        <input type="text" id="settle_amount" name="settle_amount" autocomplete="off" class="layui-input" value="{$inv.settle_amount|round=3}" disabled="disabled">
+
+                                    </div>
+                                    
+                                </div>
+                            </div>
+
+                            <div class="layui-col-md5">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">
+                                        已结金额:
+                                    </label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="sett_amount" name="sett_amount" autocomplete="off" class="layui-input" value="{$inv.sett_amount|round=3}" disabled="disabled">
 
                                     </div>
 

application/em/view/invoice/index.html

@@ -132,7 +132,6 @@
 
     function merge_list()
     {
-
         var iDs = '';
         if($list.size != 0){
             $list.forEach(
@@ -144,9 +143,7 @@
             url = url.substr(0,(url.length -1))
             xadmin.open('合并账单',url)
         }
-
     }
-
 </script>
 {/block}
 

application/em/view/payment/detail.html

@@ -42,7 +42,7 @@
                                  <div class="layui-col-md5">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label layui-text-left">
-                                            实缴合计:
+                                            已缴合计:
                                         </label>
                                         <div class="layui-input-inline">
                                            <input type="text" name="paid_totle" id="paid_totle"
@@ -111,7 +111,7 @@
                                             <th>所属基站名</th>
                                             <th>电表识别号</th>
                                             <th>应缴金额</th>
-                                            <th>实缴金额</th>
+                                            <th>已缴金额</th>
                                         </thead>
                                         <tbody>
                                         {volist name="invs" id="item"}

application/em/view/settle/detail.html

@@ -42,7 +42,7 @@
                                  <div class="layui-col-md5">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label layui-text-left">
-                                            实结合计:
+                                            已结合计:
                                         </label>
                                         <div class="layui-input-inline">
                                            <input type="text" name="paid_totle" id="paid_totle"
@@ -112,7 +112,7 @@
                                             <th>所属基站名</th>
                                             <th>电表识别号</th>
                                             <th>应结金额</th>
-                                            <th>实结金额</th>
+                                            <th>已结金额</th>
                                         </thead>
                                         <tbody>
                                         {volist name="invs" id="item"}