费用申请显示异常问题修复

src/main/resources/templates/stabudgetapproval/update_approve.html

@@ -59,10 +59,10 @@
                                        th:value="${budgetapproval.nf}" readonly>
                             </div>
                         </div>
-                        <div class="layui-form-item layui-inline" style="width: 453px; margin-left: 10px; position: absolute; z-index: 2">
+<!--                        <div class="layui-form-item layui-inline" style="width: 453px; margin-left: 10px; position: absolute; z-index: 2">
                             <table class="layui-hide" id="currentTableId_tj" name="currentTableId_tj"
                                    lay-filter="currentTableFilter_tj" style="padding-top: 0px;margin-top: 0px"></table>
-                        </div>
+                        </div>-->
                         <div class="layui-form-item layui-inline" style="float: left; clear: left;">
                             <label class="layui-form-label" style="width: 75px">项目周期</label>
                             <div class="layui-input-inline" style="width: 380px">
@@ -70,7 +70,13 @@
                                        th:value="${xmzq}" readonly>
                             </div>
                         </div>
-
+                        <div class="layui-form-item layui-inline"
+                             style="width: 45%; position: absolute; z-index: 2; left: 55%; transform: translateX(-5%);top: 28%">
+                            <table class="layui-hide" id="currentTableId_tj" name="currentTableId_tj"
+                                   lay-filter="currentTableFilter_tj" style="padding-top: 0px;margin-top: 0px"></table>
+                            <table class="layui-hide" id="currentTableId_tj2" name="currentTableId_tj2"
+                                   lay-filter="currentTableFilter_tj2" style="padding-top: 0px;margin-top: 0px"></table>
+                        </div>
                         <div class="layui-form-item layui-inline" style="float: left; clear: left;">
                             <label class="layui-form-label" style="width: 75px">费用类别</label>
                             <div class="layui-input-inline" style="width: 380px">
@@ -526,9 +532,66 @@
             tableSelect = layui.tableSelect,
             table = layui.table,
             element = layui.element;
-      // 开始
             // 查看数据 （开始）
             $(document).ready(function() {
+                setTimeout(function () {
+                    // 用于存放表格数据
+                    var dataTj = [
+                        {
+                            "km": "此科目年度预算",
+                            "ysje":  [[${kmFyInfo.ysje}]],
+                            "ysqje": [[${kmFyInfo.sqje}]],
+                            "ybzje": [[${kmFyInfo.bzje}]]
+                        },
+                        {
+                            "km": "项目年度经费",
+                            "ysje": [[${xmFyInfo.ysje}]],
+                            "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
+                            "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
+                        },
+                        {
+                            "km":"项目备用金",
+                            "ysje":  [[${kmFyInfo.bzje2}]],
+                            "ysqje": [[${kmFyInfo.byj}]],
+                            "ybzje": [[${kmFyInfo.byjbzze}]]
+                        }
+                    ];
+                    var dataTj2 = [
+                        {
+                            "km": "项目年度经费",
+                            "ysje": [[${xmFyInfo.ysje}]],
+                            "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.xmndjfysq}]],
+                            "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]],
+                        }
+                    ]
+                    console.log(dataTj);
+                    //统计信息
+                    var currTable_tj = table.render({
+                        elem: '#currentTableId_tj',
+                        data: dataTj,
+                        cols: [
+                            [
+                                {field: 'km', title: '科目名称', width: '30%'},
+                                {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
+                                {field: 'ysqje', title: '已申请(元)', width: '24%',align:'right'},
+                                {field: 'ybzje', title: '已报账(元)',width: '25%', align:'right'},
+                            ]
+                        ]
+                    });
+                    var currTable_tj = table.render({
+                        elem: '#currentTableId_tj2',
+                        data: dataTj2,
+                        cols: [
+                            [
+                                {field: 'km', title: '科目名称', width: '30%',align:'left'},
+                                {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
+                                {field: 'ysqje', title: '可申请(元)', width: '24%', align:'right'},
+                                {field: 'ybzje', title: '可报账(元)',width: '24%', align:'right'}
+                            ]
+                        ]
+                    });
+                    layer.msg('渲染完成',{icon:1});
+                },500);
                 let sqsm = [[${budgetapproval.sqsm}]]
                 console.log(sqsm)
                 let sqsm1 = stripHtmlTags(sqsm);
@@ -611,7 +674,7 @@
             } else {
                 document.getElementById('fyxxDiv').style.display = 'none';
             }
-            var dataTj = [
+           /* var dataTj = [
                 {
                     "km": "此科目年度预算",
                     "ysje": [[${kmFyInfo.ysje}]],
@@ -643,7 +706,7 @@
                         {field: 'ybzje', title: '已报账(元)',width: '30%'}
                     ]
                 ]
-            });
+            });*/
             var dataExpense = new Array();
             $.ajax({
                 url: AjaxUtil.ctx + 'staTravelexpenses/list/' + fyId,

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -61,11 +61,7 @@
                                        th:value="${budgetapproval.nf}" readonly>
                             </div>
                         </div>
-                        <div class="layui-form-item layui-inline"
-                             style="width: 453px; margin-left: 10px; position: absolute; z-index: 2">
-                            <table class="layui-hide" id="currentTableId_tj" name="currentTableId_tj"
-                                   lay-filter="currentTableFilter_tj" style="padding-top: 0px;margin-top: 0px"></table>
-                        </div>
+
                         <div class="layui-form-item layui-inline" style="float: left; clear: left;">
                             <label class="layui-form-label" style="width: 75px">项目周期</label>
                             <div class="layui-input-inline" style="width: 380px">
@@ -73,6 +69,18 @@
                                         th:value="${xmzq}" readonly>
                             </div>
                         </div>
+<!--                        <div class="layui-form-item layui-inline"
+                             style="width: 453px; margin-left: 10px; position: absolute; z-index: 2">
+                            <table class="layui-hide" id="currentTableId_tj" name="currentTableId_tj"
+                                   lay-filter="currentTableFilter_tj" style="padding-top: 0px;margin-top: 0px"></table>
+                        </div>-->
+                        <div class="layui-form-item layui-inline"
+                             style="width: 45%; position: absolute; z-index: 2; left: 55%; transform: translateX(-5%);top: 28%">
+                            <table class="layui-hide" id="currentTableId_tj" name="currentTableId_tj"
+                                   lay-filter="currentTableFilter_tj" style="padding-top: 0px;margin-top: 0px"></table>
+                            <table class="layui-hide" id="currentTableId_tj2" name="currentTableId_tj2"
+                                   lay-filter="currentTableFilter_tj2" style="padding-top: 0px;margin-top: 0px"></table>
+                        </div>
 
                         <div class="layui-form-item layui-inline" style="float: left; clear: left;">
                             <label class="layui-form-label" style="width: 75px">费用类别</label>
@@ -360,7 +368,7 @@
 </script>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
@@ -395,6 +403,67 @@
             adjustHeight(document.getElementById('sqsm'));
         });
 
+        $(document).ready(function () {
+           setTimeout(function () {
+               // 用于存放表格数据
+               var dataTj = [
+                   {
+                       "km": "此科目年度预算",
+                       "ysje":  [[${kmFyInfo.ysje}]],
+                       "ysqje": [[${kmFyInfo.sqje}]],
+                       "ybzje": [[${kmFyInfo.bzje}]]
+                   },
+                   {
+                       "km": "项目年度经费",
+                       "ysje": [[${xmFyInfo.ysje}]],
+                       "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
+                       "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
+                   },
+                   {
+                       "km":"项目备用金",
+                       "ysje":  [[${kmFyInfo.bzje2}]],
+                       "ysqje": [[${kmFyInfo.byj}]],
+                       "ybzje": [[${kmFyInfo.byjbzze}]]
+                   }
+               ];
+               var dataTj2 = [
+                   {
+                       "km": "项目年度经费",
+                       "ysje": [[${xmFyInfo.ysje}]],
+                       "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.xmndjfysq}]],
+                       "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]],
+                   }
+               ]
+               console.log(dataTj);
+               //统计信息
+               var currTable_tj = table.render({
+                   elem: '#currentTableId_tj',
+                   data: dataTj,
+                   cols: [
+                       [
+                           {field: 'km', title: '科目名称', width: '30%'},
+                           {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
+                           {field: 'ysqje', title: '已申请(元)', width: '24%',align:'right'},
+                           {field: 'ybzje', title: '已报账(元)',width: '25%', align:'right'},
+                       ]
+                   ]
+               });
+               var currTable_tj = table.render({
+                   elem: '#currentTableId_tj2',
+                   data: dataTj2,
+                   cols: [
+                       [
+                           {field: 'km', title: '科目名称', width: '30%',align:'left'},
+                           {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
+                           {field: 'ysqje', title: '可申请(元)', width: '24%', align:'right'},
+                           {field: 'ybzje', title: '可报账(元)',width: '24%', align:'right'}
+                       ]
+                   ]
+               });
+               layer.msg('渲染完成',{icon:1});
+           },500);
+        });
+
         var fyId = $("#id").val();
         var xmId = $("#xmid").val();
         var nf = $("#nf").val();
@@ -470,42 +539,6 @@
             document.getElementById('fyxxDiv').style.display = 'none';
         }
 
-        // 用于存放表格数据
-        var dataTj = [
-            {
-                "km": "此科目年度预算",
-                "ysje":  [[${kmFyInfo.ysje}]],
-                "ysqje": [[${kmFyInfo.sqje}]],
-                "ybzje": [[${kmFyInfo.bzje}]]
-            },
-            {
-                "km": "项目年度经费",
-                "ysje": [[${xmFyInfo.ysje}]],
-                // "ysqje": [[${xmFyInfo.sqje}]],
-                "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
-                "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
-            },
-            {
-                "km":"项目备用金",
-                "ysje":  [[${kmFyInfo.bzje2}]],
-                "ysqje": [[${kmFyInfo.byj}]],
-                "ybzje": [[${kmFyInfo.byjbzze}]]
-            }
-        ];
-        //统计信息
-        var currTable_tj = table.render({
-            elem: '#currentTableId_tj',
-            data: dataTj,
-            cols: [
-                [
-                    {field: 'km', title: '', width: '30%'},
-                    {field: 'ysje', title: '预算(万元)', width: '23%'},
-                    {field: 'ysqje', title: '已申请(元)', width: '30%'},
-                    {field: 'ybzje', title: '已报账(元)',width: '30%'}
-                ]
-            ]
-        });
-
         // 用于存放表格数据
         var dataExpense = new Array();
         $.ajax({