Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

梁世豪 8 mēneši atpakaļ
vecāks
revīzija
73424798f7

+ 14 - 14
src/main/resources/templates/payapply/update.html

@@ -18,53 +18,53 @@
18 18
     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
19 19
         <input type="hidden" id="id" name="id" class="layui-input" th:value="${payapproval.id}">
20 20
         <div class="layui-form-item layui-inline" style="width: 100%">
21
-            <label class="layui-form-label" style="width: 60px">费用申请</label>
22
-            <div class="layui-input-inline" style="width: 810px">
21
+            <label class="layui-form-label" style="width: 10%">费用申请</label>
22
+            <div class="layui-input-inline" style="width: 80%">
23 23
                 <input type="hidden" id="fysq" name="fysq" class="layui-input" th:value="${payapproval.fysq}" readonly>
24 24
                 <input type="text" id="fysqmc" name="fysqmc" class="layui-input" th:value="${payapproval.fysqmc}"
25 25
                        readonly>
26 26
             </div>
27 27
         </div>
28 28
         <div class="layui-form-item layui-inline" style="width: 100%">
29
-            <label class="layui-form-label" style="width: 60px">任务书</label>
30
-            <div class="layui-input-inline" style="width: 810px">
29
+            <label class="layui-form-label" style="width: 10%">任务书</label>
30
+            <div class="layui-input-inline" style="width: 80%">
31 31
                 <input type="text" id="rwsmc" name="rwsmc" class="layui-input" th:value="${payapproval.rwsmc}" readonly>
32 32
             </div>
33 33
         </div>
34 34
         <div class="layui-form-item layui-inline" style="width: 100%">
35
-            <label class="layui-form-label required" style="width: 60px">合同</label>
35
+            <label class="layui-form-label required" style="width: 10%">合同</label>
36 36
             <input type="hidden" id="htmc" name="htmc" class="layui-input" th:value="${payapproval.htmc}" readonly>
37
-            <div class="layui-input-inline" style="width: 380px">
37
+            <div class="layui-input-inline" style="width: 30%">
38 38
                 <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空">
39 39
                     <option value="">-- 请选择 --</option>
40 40
                     <option th:each="item:${htList}" th:text="${item.htmc}" th:value="${item.id}"></option>
41 41
                 </select>
42 42
             </div>
43
-            <label class="layui-form-label required" style="width: 120px">合同金额(万元)</label>
44
-            <div class="layui-input-inline" style="width: 270px">
43
+            <label class="layui-form-label required" style="width: 15%">合同金额(万元)</label>
44
+            <div class="layui-input-inline" style="width: 30%">
45 45
                 <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required"
46 46
                        lay-reqtext="合同金额不能为空" autocomplete="off" th:value="${payapproval.htje}" readonly>
47 47
             </div>
48 48
         </div>
49 49
         <div class="layui-form-item layui-inline" style="width: 100%">
50
-            <label class="layui-form-label required" style="width: 60px">付款计划</label>
50
+            <label class="layui-form-label required" style="width: 10%">付款计划</label>
51 51
             <input type="hidden" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}+' / '+${payapproval.zfje}"
52 52
                    readonly>
53
-            <div class="layui-input-inline" style="width: 380px">
53
+            <div class="layui-input-inline" style="width: 30%">
54 54
                 <select name="fkjh" id="fkjh" lay-filter="fkjh" lay-verify="required" lay-reqtext="付款计划不能为空">
55 55
                     <option value="">-- 请选择 --</option>
56 56
                     <option th:each="item:${payplanList}" th:text="${item.jhmc} + ' / ' + ${item.zfje}"
57 57
                             th:value="${item.id}"></option>
58 58
                 </select>
59 59
             </div>
60
-            <label class="layui-form-label required" style="width: 130px; margin-left: -10px">本次付款金额(万元)</label>
61
-            <div class="layui-input-inline" style="width: 270px">
60
+            <label class="layui-form-label required" style="width: 15%">本次付款金额(万元)</label>
61
+            <div class="layui-input-inline" style="width: 30%">
62 62
                 <input type="number" id="bcfkje" name="bcfkje" class="layui-input" lay-verify="required"
63 63
                        lay-reqtext="本次付款金额不能为空" autocomplete="off" th:value="${payapproval.bcfkje}">
64 64
             </div>
65 65
         </div>
66 66
         <div class="layui-form-item layui-inline" style="width: 100%">
67
-            <label class="layui-form-label" style="width: 60px">合同文件</label>
67
+            <label class="layui-form-label" style="width: 10%">合同文件</label>
68 68
             <div class="layuimini-container" style="margin-left: 90px; margin-right: 20px; padding-bottom: 10px">
69 69
                 <input type="hidden" id="htwj" name="htwj" class="layui-input" th:value="${payapproval.htwj}">
70 70
                 <div class="layui-btn-group" style="margin-bottom: -8px">
@@ -84,7 +84,7 @@
84 84
             </div>
85 85
         </div>
86 86
         <div class="layui-form-item layui-inline" style="width: 100%">
87
-            <label class="layui-form-label" style="width: 60px">验收资料</label>
87
+            <label class="layui-form-label" style="width: 10%">验收资料</label>
88 88
             <div class="layuimini-container" style="margin-left: 90px; margin-right: 20px; padding-bottom: 10px">
89 89
                 <input type="hidden" id="yszl" name="yszl" class="layui-input" th:value="${payapproval.yszl}">
90 90
                 <div class="layui-btn-group" style="margin-bottom: -8px">

+ 14 - 14
src/main/resources/templates/payapply/view.html

@@ -17,42 +17,42 @@
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
19 19
         <div class="layui-form-item layui-inline" style="width: 100%">
20
-            <label class="layui-form-label" style="width: 60px">费用申请</label>
21
-            <div class="layui-input-inline" style="width: 810px">
20
+            <label class="layui-form-label" style="width: 10%">费用申请</label>
21
+            <div class="layui-input-inline" style="width: 80%">
22 22
                 <input type="text" id="fysqmc" name="fysqmc" class="layui-input" th:value="${payapproval.fysqmc}"
23 23
                        readonly>
24 24
             </div>
25 25
         </div>
26 26
         <div class="layui-form-item layui-inline" style="width: 100%">
27
-            <label class="layui-form-label" style="width: 60px">任务书</label>
28
-            <div class="layui-input-inline" style="width: 810px">
27
+            <label class="layui-form-label" style="width: 10%">任务书</label>
28
+            <div class="layui-input-inline" style="width: 80%">
29 29
                 <input type="text" id="rwsmc" name="rwsmc" class="layui-input" th:value="${payapproval.rwsmc}" readonly>
30 30
             </div>
31 31
         </div>
32 32
         <div class="layui-form-item layui-inline" style="width: 100%">
33
-            <label class="layui-form-label" style="width: 60px">合同</label>
34
-            <div class="layui-input-inline" style="width: 380px">
33
+            <label class="layui-form-label" style="width: 10%">合同</label>
34
+            <div class="layui-input-inline" style="width: 30%">
35 35
                 <input type="text" id="htmc" name="htmc" class="layui-input" th:value="${payapproval.htmc}" readonly>
36 36
             </div>
37
-            <label class="layui-form-label" style="width: 120px">合同金额(万元)</label>
38
-            <div class="layui-input-inline" style="width: 270px">
37
+            <label class="layui-form-label" style="width: 15%">合同金额(万元)</label>
38
+            <div class="layui-input-inline" style="width: 30%">
39 39
                 <input type="number" id="htje" name="htje" class="layui-input" th:value="${payapproval.htje}" readonly>
40 40
             </div>
41 41
         </div>
42 42
         <div class="layui-form-item layui-inline" style="width: 100%">
43
-            <label class="layui-form-label" style="width: 60px">付款计划</label>
44
-            <div class="layui-input-inline" style="width: 380px">
43
+            <label class="layui-form-label" style="width: 10%">付款计划</label>
44
+            <div class="layui-input-inline" style="width: 30%">
45 45
                 <input type="text" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}+' / '+${payapproval.zfje}"
46 46
                        readonly>
47 47
             </div>
48
-            <label class="layui-form-label" style="width: 130px; margin-left: -10px">本次付款金额(万元)</label>
49
-            <div class="layui-input-inline" style="width: 270px">
48
+            <label class="layui-form-label" style="width: 15%; ">本次付款金额(万元)</label>
49
+            <div class="layui-input-inline" style="width: 30%">
50 50
                 <input type="number" id="bcfkje" name="bcfkje" class="layui-input" th:value="${payapproval.bcfkje}"
51 51
                        readonly>
52 52
             </div>
53 53
         </div>
54 54
         <div class="layui-form-item layui-inline" style="width: 100%">
55
-            <label class="layui-form-label" style="width: 60px">合同文件</label>
55
+            <label class="layui-form-label" style="width: 10%">合同文件</label>
56 56
             <div class="layuimini-container" style="margin-left: 90px; margin-right: 20px; padding-bottom: -30px">
57 57
                 <input type="hidden" id="htwj" name="htwj" class="layui-input" th:value="${payapproval.htwj}">
58 58
                 <table class="layui-hide" id="currentTableId1" name="currentTableId1"
@@ -60,7 +60,7 @@
60 60
             </div>
61 61
         </div>
62 62
         <div class="layui-form-item layui-inline" style="width: 100%">
63
-            <label class="layui-form-label" style="width: 60px">验收资料</label>
63
+            <label class="layui-form-label" style="width: 10%">验收资料</label>
64 64
             <div class="layuimini-container" style="margin-left: 90px; margin-right: 20px; margin-bottom: -30px">
65 65
                 <input type="hidden" id="yszl" name="yszl" class="layui-input" th:value="${payapproval.yszl}">
66 66
                 <table class="layui-hide" id="currentTableId2" name="currentTableId2"

+ 7 - 7
src/main/resources/templates/stabudgetapproval/add.html

@@ -390,11 +390,11 @@
390 390
                         </div>
391 391
 
392 392
                     <div class="layui-form-item layui-inline" style="width: 100%">
393
-                        <label class="layui-form-label" style="width: 75px">申请说明</label>
393
+                        <label class="layui-form-label required" style="width: 75px">申请说明</label>
394 394
                         <div class="layuimini-container" style="width: 853px; margin-left: 105px">
395 395
                             <div class="layui-input-inline" style="width: 930px">
396 396
                                 <textarea id="sqsm" name="sqsm" class="layui-textarea auto-height" oninput="adjustHeight(this)"
397
-                                          style="width: 855px;height: 20%"  placeholder="请输入申请说明......"></textarea>
397
+                                          style="width: 855px;height: 20%"  placeholder="请输入申请说明......" lay-verify="required" lay-reqtext="申请说明不能为空!" ></textarea>
398 398
                             </div>
399 399
                         </div>
400 400
                     </div>
@@ -538,7 +538,7 @@
538 538
 </form>
539 539
 
540 540
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
541
-<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
541
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
542 542
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
543 543
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
544 544
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
@@ -652,10 +652,10 @@
652 652
                                     method: 'get',
653 653
                                     cols: [
654 654
                                         [
655
-                                            {type: "radio", fixed: 'left'},
655
+                                            {type: "radio", fixed: 'left',title: '😊'},
656 656
                                             {type: 'numbers', align: 'center',title: '序号'},
657 657
                                             {field: 'fymc', width: '50%', title: '费用名称'},
658
-                                            {field: 'ysje', title: '预算金额(万元)',align: 'center'}
658
+                                            {field: 'ysje', title: '预算金额(万元)',align: 'center',width: '25%'}
659 659
                                         ]
660 660
 
661 661
                                     ]
@@ -827,7 +827,7 @@
827 827
                     {field: 'km', title: '', width: '30%'},
828 828
                     {field: 'ysje', title: '预算(万元)', width: '23%'},
829 829
                     {field: 'ysqje', title: '已申请(元)', width: '23%'},
830
-                    {field: 'ybzje', title: '已报账(元)'}
830
+                    {field: 'ybzje', title: '已报账(元)',width: '23%'}
831 831
                 ]
832 832
             ]
833 833
         });
@@ -905,7 +905,7 @@
905 905
                         {field: 'km', title: '', width: '30%'},
906 906
                         {field: 'ysje', title: '预算(万元)', width: '23%'},
907 907
                         {field: 'ysqje', title: '已申请(元)', width: '23%'},
908
-                        {field: 'ybzje', title: '已报账(元)'}
908
+                        {field: 'ybzje', title: '已报账(元)',width: '23%'}
909 909
                     ]
910 910
                 ]
911 911
             });

+ 1 - 1
src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -292,7 +292,7 @@
292 292
             // defaultToolbar: ['filter', 'print'],
293 293
             cols: [
294 294
                 [
295
-                    {type: "radio", fixed: 'left'},
295
+                    {type: "radio", fixed: 'left',title: '😊'},
296 296
                     {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
297 297
                     {field: 'spzt', width: '10%', title: '审批状态'},
298 298
                     {field: 'bh', width: '8%', title: '科研费号'},

+ 4 - 3
src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -378,9 +378,10 @@
378 378
         var table = layui.table,
379 379
             layer = layui.layer;
380 380
 
381
-
382
-        $('#sqsm').val([[${budgetapproval.sqsm}]]);
383
-        adjustHeight(document.getElementById('sqsm'));
381
+        $(document).ready(function() {
382
+            $('#sqsm').val([[${budgetapproval.sqsm}]]);
383
+            adjustHeight(document.getElementById('sqsm'));
384
+        });
384 385
 
385 386
         var fyId = $("#id").val();
386 387
         var xmId = $("#xmid").val();

+ 27 - 27
src/main/resources/templates/stafeemanage/list_allapply.html

@@ -7,6 +7,27 @@
7 7
     <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
8 8
     <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}"
9 9
           media="all">
10
+    <style>
11
+        .layui-form-item {
12
+            margin-bottom: 10px; /* 调整每个表单项之间的间距 */
13
+        }
14
+
15
+        .layui-inline {
16
+            display: inline-block;
17
+            margin-bottom: 10px; /* 调整每行表单项之间的间距 */
18
+        }
19
+
20
+        .layui-form-label {
21
+            width: 70px;
22
+            text-align: right; /* 标签右对齐 */
23
+            margin-right: 10px; /* 调整标签和输入框之间的距离 */
24
+        }
25
+
26
+        .layui-input-inline {
27
+            width: 140px;
28
+            margin-right: 10px; /* 调整输入框之间的距离 */
29
+        }
30
+    </style>
10 31
 </head>
11 32
 <body>
12 33
 <div class="layuimini-container">
@@ -162,21 +183,11 @@
162 183
                 </form>
163 184
             </div>
164 185
         </fieldset>
165
-
166 186
         <script type="text/html" id="toolbarDemo">
167 187
             <div class="layui-btn-container">
168
-<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit">
169
-                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
170
-                </button>-->
171 188
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
172 189
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
173
-                </button><!--
174
-                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
175
-                    <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
176
-                </button>-->
177
-                <!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">-->
178
-                <!--                    <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批-->
179
-                <!--                </button>-->
190
+                </button>
180 191
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
181 192
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
182 193
                 </button>
@@ -186,24 +197,15 @@
186 197
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
187 198
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
188 199
                 </button>
189
-                <!--<button class="layui-btn layui-bg-black iconfont layui-icon-export" lay-event="export">
190
-                    <i class="layui-icon" style="font-size: 10px;"></i>导出列表
191
-                </button>-->
192 200
                 <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: black">
193 201
                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
194 202
                 </button>
195
-
196
-                <!-- <button class="layui-btn layui-btn-sm" lay-event="exportExcel" style="background-color: black">
197
-                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
198
-                 </button>-->
199
-
200 203
             </div>
201 204
         </script>
202
-        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
205
+        <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
206
+        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter" ></table>
203 207
     </div>
204
-    <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
205 208
 </div>
206
-
207 209
 <script>
208 210
     // 获取所有需要去除空格的输入框
209 211
     const inputs = [
@@ -371,12 +373,11 @@
371 373
             // defaultToolbar: ['filter', 'print'],
372 374
             cols: [
373 375
                 [
374
-                    {type: "radio", fixed: 'left',title: '😊'},
376
+                    {type: 'radio', title: '😊',align:'center',fixed: 'left'},
375 377
                     {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
376
-                    {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
378
+                    {field: 'xmmc', width: '20%', title: '项目名称'},
377 379
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
378
-                    {
379
-                        field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
380
+                    {field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
380 381
                             if (1 == d.sfbyj) {
381 382
                                 return '<span class="layui-badge layui-bg-blue">是</span>';
382 383
                             } else {
@@ -396,7 +397,6 @@
396 397
                     {field: 'ssbmmc', width: '8%', title: '所属部门'},
397 398
                     {field: 'nf', width: '4%', title: '年份'},
398 399
                     {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'},
399
-
400 400
                     {field: 'sqmc', width: '25%', title: '申请名称'}
401 401
                 ]
402 402
             ],

+ 31 - 29
src/main/resources/templates/statravelexpense/add.html

@@ -17,31 +17,31 @@
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form">
19 19
         <div class="layui-form-item layui-inline" style="width: 100%">
20
-            <label class="layui-form-label" style="width: 70px">序号</label>
21
-            <div class="layui-input-inline" style="width: 270px">
20
+            <label class="layui-form-label" style="width: 10%">序号</label>
21
+            <div class="layui-input-inline" style="width: 30%">
22 22
                 <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input">
23 23
             </div>
24
-            <label class="layui-form-label required" style="width: 70px">出差人</label>
25
-            <div class="layui-input-inline" style="width: 270px">
24
+            <label class="layui-form-label required" style="width: 10%">出差人</label>
25
+            <div class="layui-input-inline" style="width: 30%">
26 26
                 <input type="hidden" id="ccr" name="ccr">
27 27
                 <input type="text" id="ccrxm" name="ccrxm" lay-verify="required" lay-reqtext="出差人不能为空"
28 28
                        class="layui-input" readonly>
29 29
             </div>
30 30
         </div>
31 31
         <div class="layui-form-item layui-inline" style="width: 100%">
32
-            <label class="layui-form-label required" style="width: 70px">出差地点</label>
33
-            <div class="layui-input-inline" style="width: 270px">
32
+            <label class="layui-form-label required" style="width: 10%">出差地点</label>
33
+            <div class="layui-input-inline" style="width: 30%">
34 34
                 <input type="text" id="ccdd" name="ccdd" lay-verify="required" lay-reqtext="出差地点不能为空" autocomplete="off"
35 35
                        class="layui-input">
36 36
             </div>
37
-            <label class="layui-form-label required" style="width: 70px">出差天数</label>
38
-            <div class="layui-input-inline" style="width: 270px">
37
+            <label class="layui-form-label required" style="width: 10%">出差天数</label>
38
+            <div class="layui-input-inline" style="width: 30%">
39 39
                 <input type="number" id="ccts" name="ccts" min="0" lay-verify="required" lay-reqtext="出差天数不能为空"
40 40
                        autocomplete="off" class="layui-input">
41 41
             </div>
42 42
         </div>
43 43
         <div class="layui-form-item layui-inline" style="width: 100%">
44
-            <label class="layui-form-label required" style="width: 70px">起止时间</label>
44
+            <label class="layui-form-label required" style="width: 10%">起止时间</label>
45 45
             <div class="layui-input-inline" style="width: 122px">
46 46
                 <input type="text" name="qsrq" id="qsrq" placeholder="起始日期" lay-verify="required" lay-reqtext="开始日期不能为空"
47 47
                        autocomplete="off" class="layui-input" readonly>
@@ -51,45 +51,47 @@
51 51
                 <input type="text" name="jsrq" id="jsrq" placeholder="结束日期(含)" lay-verify="required"
52 52
                        lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input" readonly>
53 53
             </div>
54
-            <label class="layui-form-label" style="width: 70px">交通费(元)</label>
55
-            <div class="layui-input-inline" style="width: 270px">
56
-                <input type="number" id="jtf" name="jtf" lay-filter="jtf" min="0" autocomplete="off"
57
-                       class="layui-input">
58
-            </div>
54
+
59 55
         </div>
60 56
         <div class="layui-form-item layui-inline" style="width: 100%">
61
-            <label class="layui-form-label" style="width: 70px">住宿费(元)</label>
62
-            <div class="layui-input-inline" style="width: 270px">
57
+            <label class="layui-form-label" style="width: 10%">住宿费(元)</label>
58
+            <div class="layui-input-inline" style="width: 30%">
63 59
                 <input type="number" id="zsf" name="zsf" lay-filter="zsf" min="0" autocomplete="off"
64 60
                        class="layui-input">
65 61
             </div>
66
-            <label class="layui-form-label" style="width: 70px">差补(元)</label>
67
-            <div class="layui-input-inline" style="width: 270px">
62
+            <label class="layui-form-label" style="width: 10%">差补(元)</label>
63
+            <div class="layui-input-inline" style="width: 30%">
68 64
                 <input type="number" id="cb" name="cb" lay-filter="cb" min="0" autocomplete="off" class="layui-input">
69 65
             </div>
70 66
         </div>
71 67
         <div class="layui-form-item layui-inline" style="width: 100%">
72
-            <label class="layui-form-label" style="width: 70px">总计(元)</label>
73
-            <div class="layui-input-inline" style="width: 270px">
68
+            <label class="layui-form-label" style="width: 10%">总计(元)</label>
69
+            <div class="layui-input-inline" style="width: 30%">
74 70
                 <input type="number" id="zj" name="zj" min="0" autocomplete="off" class="layui-input" readonly>
75 71
             </div>
76
-            <label class="layui-form-label" style="width: 70px">日平均(元)</label>
77
-            <div class="layui-input-inline" style="width: 270px">
72
+            <label class="layui-form-label" style="width: 10%">日平均(元)</label>
73
+            <div class="layui-input-inline" style="width: 30%">
78 74
                 <input type="number" id="rpj" name="rpj" min="0" autocomplete="off" class="layui-input" readonly>
79 75
             </div>
80 76
         </div>
81 77
         <div class="layui-form-item layui-inline" style="width: 100%">
82
-            <!--            <label class="layui-form-label" style="width: 70px">项目负责人</label>-->
83
-            <!--            <div class="layui-input-inline" style="width: 270px">-->
78
+            <!--            <label class="layui-form-label" style="width: 10%">项目负责人</label>-->
79
+            <!--            <div class="layui-input-inline" style="width: 30%">-->
84 80
             <!--                <input type="number" id="xmfzr" name="xmfzr" class="layui-input" autocomplete="off">-->
85 81
             <!--            </div>-->
86
-            <label class="layui-form-label" style="width: 70px">出差事由</label>
87
-            <div class="layui-input-inline" style="width: 270px">
82
+            <!--<label class="layui-form-label" style="width: 10%">出差事由</label>
83
+            <div class="layui-input-inline" style="width: 30%">
88 84
                 <input type="text" id="ccsy" name="ccsy" class="layui-input" autocomplete="off">
85
+            </div>-->
86
+            <label class="layui-form-label" style="width: 10%">交通费(元)</label>
87
+            <div class="layui-input-inline" style="width: 30%">
88
+                <input type="number" id="jtf" name="jtf" lay-filter="jtf" min="0" autocomplete="off"
89
+                       class="layui-input">
89 90
             </div>
90 91
         </div>
91 92
 
92 93
 
94
+
93 95
         <!-- 右侧悬浮按钮 -->
94 96
         <div class="right-bottom-btn">
95 97
             <button type="button" class="layui-btn" lay-submit lay-filter="saveBtn">
@@ -136,10 +138,10 @@
136 138
                 url: AjaxUtil.ctx + 'basePerson/rylist',
137 139
                 cols: [
138 140
                     [
139
-                        {type: "radio", fixed: 'left'},
140
-                        {type: 'numbers', align: 'center'},
141
+                        {type: "radio", fixed: 'left',title: '😊'},
142
+                        {type: 'numbers', align: 'center',title: '序号'},
141 143
                         {field: 'xm', width: '15%', title: '姓名'},
142
-                        {field: 'dwmc', title: '公司/单位'}
144
+                        {field: 'dwmc',width: '40%', title: '公司/单位'}
143 145
                     ]
144 146
                 ],
145 147
                 page: true

+ 27 - 26
src/main/resources/templates/statravelexpense/update.html

@@ -17,29 +17,29 @@
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form">
19 19
         <div class="layui-form-item layui-inline" style="width: 100%">
20
-            <label class="layui-form-label" style="width: 70px">序号</label>
21
-            <div class="layui-input-inline" style="width: 270px">
20
+            <label class="layui-form-label" style="width: 10%">序号</label>
21
+            <div class="layui-input-inline" style="width: 30%">
22 22
                 <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input">
23 23
             </div>
24
-            <label class="layui-form-label required" style="width: 70px">出差人</label>
25
-            <div class="layui-input-inline" style="width: 270px">
24
+            <label class="layui-form-label required" style="width: 10%">出差人</label>
25
+            <div class="layui-input-inline" style="width: 30%">
26 26
                 <input type="hidden" id="ccr" name="ccr">
27 27
                 <input type="text" id="ccrxm" name="ccrxm" class="layui-input" readonly>
28 28
             </div>
29 29
         </div>
30 30
         <div class="layui-form-item layui-inline" style="width: 100%">
31
-            <label class="layui-form-label required" style="width: 70px">出差地点</label>
32
-            <div class="layui-input-inline" style="width: 270px">
31
+            <label class="layui-form-label required" style="width: 10%">出差地点</label>
32
+            <div class="layui-input-inline" style="width: 30%">
33 33
                 <input type="text" id="ccdd" name="ccdd" class="layui-input">
34 34
             </div>
35
-            <label class="layui-form-label required" style="width: 70px">出差天数</label>
36
-            <div class="layui-input-inline" style="width: 270px">
35
+            <label class="layui-form-label required" style="width: 10%">出差天数</label>
36
+            <div class="layui-input-inline" style="width: 30%">
37 37
                 <input type="number" id="ccts" name="ccts" min="0" lay-verify="required" lay-reqtext="出差天数不能为空"
38 38
                        autocomplete="off" class="layui-input">
39 39
             </div>
40 40
         </div>
41 41
         <div class="layui-form-item layui-inline" style="width: 100%">
42
-            <label class="layui-form-label required" style="width: 70px">起止时间</label>
42
+            <label class="layui-form-label required" style="width: 10%">起止时间</label>
43 43
             <div class="layui-input-inline" style="width: 122px">
44 44
                 <input type="text" name="qsrq" id="qsrq" placeholder="起始日期" lay-verify="required" lay-reqtext="开始日期不能为空"
45 45
                        autocomplete="off" class="layui-input" readonly>
@@ -49,41 +49,42 @@
49 49
                 <input type="text" name="jsrq" id="jsrq" placeholder="结束日期(含)" lay-verify="required"
50 50
                        lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input" readonly>
51 51
             </div>
52
-            <label class="layui-form-label" style="width: 70px">交通费(元)</label>
53
-            <div class="layui-input-inline" style="width: 270px">
54
-                <input type="number" id="jtf" name="jtf" lay-filter="jtf" min="0" autocomplete="off"
55
-                       class="layui-input">
56
-            </div>
52
+
57 53
         </div>
58 54
         <div class="layui-form-item layui-inline" style="width: 100%">
59
-            <label class="layui-form-label" style="width: 70px">住宿费(元)</label>
60
-            <div class="layui-input-inline" style="width: 270px">
55
+            <label class="layui-form-label" style="width: 10%">住宿费(元)</label>
56
+            <div class="layui-input-inline" style="width: 30%">
61 57
                 <input type="number" id="zsf" name="zsf" lay-filter="zsf" min="0" autocomplete="off"
62 58
                        class="layui-input">
63 59
             </div>
64
-            <label class="layui-form-label" style="width: 70px">差补(元)</label>
65
-            <div class="layui-input-inline" style="width: 270px">
60
+            <label class="layui-form-label" style="width: 10%">差补(元)</label>
61
+            <div class="layui-input-inline" style="width: 30%">
66 62
                 <input type="number" id="cb" name="cb" lay-filter="cb" min="0" autocomplete="off" class="layui-input">
67 63
             </div>
68 64
         </div>
69 65
         <div class="layui-form-item layui-inline" style="width: 100%">
70
-            <label class="layui-form-label" style="width: 70px">总计(元)</label>
71
-            <div class="layui-input-inline" style="width: 270px">
66
+            <label class="layui-form-label" style="width: 10%">总计(元)</label>
67
+            <div class="layui-input-inline" style="width: 30%">
72 68
                 <input type="number" id="zj" name="zj" min="0" autocomplete="off" class="layui-input" readonly>
73 69
             </div>
74
-            <label class="layui-form-label" style="width: 70px">日平均(元)</label>
75
-            <div class="layui-input-inline" style="width: 270px">
70
+            <label class="layui-form-label" style="width: 10%">日平均(元)</label>
71
+            <div class="layui-input-inline" style="width: 30%">
76 72
                 <input type="number" id="rpj" name="rpj" min="0" autocomplete="off" class="layui-input" readonly>
77 73
             </div>
78 74
         </div>
79 75
         <div class="layui-form-item layui-inline" style="width: 100%">
80
-            <!--            <label class="layui-form-label" style="width: 70px">项目负责人</label>-->
81
-            <!--            <div class="layui-input-inline" style="width: 270px">-->
76
+            <!--            <label class="layui-form-label" style="width: 10%">项目负责人</label>-->
77
+            <!--            <div class="layui-input-inline" style="width: 30%">-->
82 78
             <!--                <input type="number" id="xmfzr" name="xmfzr" class="layui-input" autocomplete="off">-->
83 79
             <!--            </div>-->
84
-            <label class="layui-form-label" style="width: 70px">出差事由</label>
85
-            <div class="layui-input-inline" style="width: 270px">
80
+<!--            <label class="layui-form-label" style="width: 10%">出差事由</label>
81
+            <div class="layui-input-inline" style="width: 30%">
86 82
                 <input type="text" id="ccsy" name="ccsy" class="layui-input" autocomplete="off">
83
+            </div>-->
84
+            <label class="layui-form-label" style="width: 10%">交通费(元)</label>
85
+            <div class="layui-input-inline" style="width: 30%">
86
+                <input type="number" id="jtf" name="jtf" lay-filter="jtf" min="0" autocomplete="off"
87
+                       class="layui-input">
87 88
             </div>
88 89
         </div>
89 90
         <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->

+ 30 - 29
src/main/resources/templates/statravelexpense/view.html

@@ -17,28 +17,28 @@
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form">
19 19
         <div class="layui-form-item layui-inline" style="width: 100%">
20
-            <label class="layui-form-label" style="width: 70px">序号</label>
21
-            <div class="layui-input-inline" style="width: 270px">
20
+            <label class="layui-form-label" style="width: 10%">序号</label>
21
+            <div class="layui-input-inline" style="width: 30%">
22 22
                 <input type="text" id="xh" name="xh" class="layui-input" readonly>
23 23
             </div>
24
-            <label class="layui-form-label" style="width: 70px">出差人</label>
25
-            <div class="layui-input-inline" style="width: 270px">
24
+            <label class="layui-form-label" style="width: 10%">出差人</label>
25
+            <div class="layui-input-inline" style="width: 30%">
26 26
                 <input type="hidden" id="ccr" name="ccr">
27 27
                 <input type="text" id="ccrxm" name="ccrxm" class="layui-input" readonly>
28 28
             </div>
29 29
         </div>
30 30
         <div class="layui-form-item layui-inline" style="width: 100%">
31
-            <label class="layui-form-label" style="width: 70px">出差地点</label>
32
-            <div class="layui-input-inline" style="width: 270px">
31
+            <label class="layui-form-label" style="width: 10%">出差地点</label>
32
+            <div class="layui-input-inline" style="width: 30%">
33 33
                 <input type="text" id="ccdd" name="ccdd" class="layui-input" readonly>
34 34
             </div>
35
-            <label class="layui-form-label" style="width: 70px">出差天数</label>
36
-            <div class="layui-input-inline" style="width: 270px">
35
+            <label class="layui-form-label" style="width: 10%">出差天数</label>
36
+            <div class="layui-input-inline" style="width: 30%">
37 37
                 <input type="number" id="ccts" name="ccts" class="layui-input" readonly>
38 38
             </div>
39 39
         </div>
40 40
         <div class="layui-form-item layui-inline" style="width: 100%">
41
-            <label class="layui-form-label" style="width: 70px">起止时间</label>
41
+            <label class="layui-form-label" style="width: 10%">起止时间</label>
42 42
             <div class="layui-input-inline" style="width: 122px">
43 43
                 <input type="text" name="qsrq" id="qsrq" class="layui-input" readonly>
44 44
             </div>
@@ -46,48 +46,49 @@
46 46
             <div class="layui-input-inline" style="width: 122px">
47 47
                 <input type="text" name="jsrq" id="jsrq" class="layui-input" readonly>
48 48
             </div>
49
-            <label class="layui-form-label" style="width: 70px">交通费(元)</label>
50
-            <div class="layui-input-inline" style="width: 270px">
51
-                <input type="number" id="jtf" name="jtf" class="layui-input" readonly>
52
-            </div>
49
+
53 50
         </div>
54 51
         <div class="layui-form-item layui-inline" style="width: 100%">
55
-            <label class="layui-form-label" style="width: 70px">住宿费(元)</label>
56
-            <div class="layui-input-inline" style="width: 270px">
52
+            <label class="layui-form-label" style="width: 10%">住宿费(元)</label>
53
+            <div class="layui-input-inline" style="width: 30%">
57 54
                 <input type="number" id="zsf" name="zsf" class="layui-input" readonly>
58 55
             </div>
59
-            <label class="layui-form-label" style="width: 70px">差补(元)</label>
60
-            <div class="layui-input-inline" style="width: 270px">
56
+            <label class="layui-form-label" style="width: 10%">差补(元)</label>
57
+            <div class="layui-input-inline" style="width: 30%">
61 58
                 <input type="number" id="cb" name="cb" class="layui-input" readonly>
62 59
             </div>
63 60
         </div>
64 61
         <div class="layui-form-item layui-inline" style="width: 100%">
65
-            <label class="layui-form-label" style="width: 70px">总计(元)</label>
66
-            <div class="layui-input-inline" style="width: 270px">
62
+            <label class="layui-form-label" style="width: 10%">总计(元)</label>
63
+            <div class="layui-input-inline" style="width: 30%">
67 64
                 <input type="number" id="zj" name="zj" class="layui-input" readonly>
68 65
             </div>
69
-            <label class="layui-form-label" style="width: 70px">日平均(元)</label>
70
-            <div class="layui-input-inline" style="width: 270px">
66
+            <label class="layui-form-label" style="width: 10%">日平均(元)</label>
67
+            <div class="layui-input-inline" style="width: 30%">
71 68
                 <input type="number" id="rpj" name="rpj" class="layui-input" readonly>
72 69
             </div>
73 70
         </div>
74 71
         <div class="layui-form-item layui-inline" style="width: 100%">
75
-            <!--            <label class="layui-form-label" style="width: 70px">项目负责人</label>-->
76
-            <!--            <div class="layui-input-inline" style="width: 270px">-->
72
+            <!--            <label class="layui-form-label" style="width: 10%">项目负责人</label>-->
73
+            <!--            <div class="layui-input-inline" style="width: 30%">-->
77 74
             <!--                <input type="number" id="xmfzr" name="xmfzr" class="layui-input" autocomplete="off">-->
78 75
             <!--            </div>-->
79
-            <label class="layui-form-label" style="width: 70px">出差事由</label>
80
-            <div class="layui-input-inline" style="width: 270px">
76
+            <!--<label class="layui-form-label" style="width: 10%">出差事由</label>
77
+            <div class="layui-input-inline" style="width: 30%">
81 78
                 <input type="text" id="ccsy" name="ccsy" class="layui-input" autocomplete="off">
79
+            </div>-->
80
+            <label class="layui-form-label" style="width: 10%">交通费(元)</label>
81
+            <div class="layui-input-inline" style="width: 30%">
82
+                <input type="number" id="jtf" name="jtf" class="layui-input" readonly>
82 83
             </div>
83 84
         </div>
84 85
         <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
85
-        <!--            <label class="layui-form-label" style="width: 70px">报账金额(含税)</label>-->
86
-        <!--            <div class="layui-input-inline" style="width: 270px">-->
86
+        <!--            <label class="layui-form-label" style="width: 10%">报账金额(含税)</label>-->
87
+        <!--            <div class="layui-input-inline" style="width: 30%">-->
87 88
         <!--                <input type="number" id="bzfyhs" name="bzfyhs" class="layui-input" autocomplete="off">-->
88 89
         <!--            </div>-->
89
-        <!--            <label class="layui-form-label" style="width: 70px">报账金额(不含税)</label>-->
90
-        <!--            <div class="layui-input-inline" style="width: 270px">-->
90
+        <!--            <label class="layui-form-label" style="width: 10%">报账金额(不含税)</label>-->
91
+        <!--            <div class="layui-input-inline" style="width: 30%">-->
91 92
         <!--                <input type="number" id="bzfybhs" name="bzfybhs" class="layui-input" autocomplete="off">-->
92 93
         <!--            </div>-->
93 94
         <!--        </div>-->