Browse Source

我的项目 科研性报告 bug 修复

ly 2 weeks ago
parent
commit
89b00024f7

+ 20 - 17
src/main/resources/templates/reportinfo/add.html

@@ -16,6 +16,9 @@
16 16
         .layui-body {
17 17
             overflow-y: scroll;
18 18
         }
19
+        .layui-form-label{
20
+            width: 10%;
21
+        }
19 22
     </style>
20 23
 </head>
21 24
 <body>
@@ -42,7 +45,7 @@
42 45
             <form class="layui-form" action="" lay-filter="formDemo">
43 46
                 <div class="layui-form layuimini-form">
44 47
                     <div class="layui-form-item">
45
-                        <label class="layui-form-label required" style="width: 90px">名称</label>
48
+                        <label class="layui-form-label required">名称</label>
46 49
                         <div class="layui-input-inline" style="width: 85%">
47 50
                             <input type="hidden" id="id" name="id">
48 51
                             <input type="text" id="mc" name="mc" lay-verify="required" lay-reqtext="项目名称不能为空"
@@ -50,7 +53,7 @@
50 53
                         </div>
51 54
                     </div>
52 55
                     <div class="layui-form-item">
53
-                        <label class="layui-form-label required" style="width: 90px">申请单位</label>
56
+                        <label class="layui-form-label required" >申请单位</label>
54 57
                         <div class="layui-input-inline" style="width: 85%">
55 58
                             <input type="hidden" name="sqdw" id="sqdw" class="layui-input">
56 59
                             <input type="text" id="sqdwName" name="sqdwName" lay-verify="required"
@@ -58,7 +61,7 @@
58 61
                         </div>
59 62
                     </div>
60 63
                     <div class="layui-form-item layui-inline" style="width: 100%">
61
-                        <label class="layui-form-label required" style="width: 90px">项目起止时间</label>
64
+                        <label class="layui-form-label required">项目起止时间</label>
62 65
                         <div class="layui-input-inline" style="width: 85%">
63 66
                             <div class="layui-input-inline">
64 67
                                 <input type="text" name="qs" id="qs" lay-verify="required" lay-reqtext="开始日期不能为空"
@@ -74,7 +77,7 @@
74 77
                     </div>
75 78
 
76 79
                     <div class="layui-form-item">
77
-                        <label class="layui-form-label required" style="width: 90px">项目类型</label>
80
+                        <label class="layui-form-label required" >项目类型</label>
78 81
                         <div class="layui-input-inline" style="width: 85%">
79 82
                             <select name="xmlx" id="xmlx" lay-filter="status" lay-verify="required"
80 83
                                     lay-reqtext="请选择项目类型">
@@ -86,18 +89,18 @@
86 89
                     </div>
87 90
 
88 91
                     <div class="layui-form-item ">
89
-                        <label class="layui-form-label" style="width: 90px">项目负责人</label>
90
-                        <div class="layui-input-inline" style="width: 84.8%;height: 30px;">
91
-                            <div class="layui-btn-group" style="padding-bottom: 0px;margin-bottom: -8px">
92
+                        <label class="layui-form-label">项目负责人</label>
93
+                        <div class="layui-input-inline" style="width: 84.8%;">
94
+                            <div class="layui-btn-group" style="padding-bottom: 0px;margin-bottom: 0px">
92 95
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm upload"
93 96
                                         lay-data="{fileType:'personFile'}"><i class="layui-icon"></i>导入
94 97
                                 </button>
95 98
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
96 99
                                         lay-filter="btnAdd1"><i class="layui-icon"></i>增加
97 100
                                 </button>
98
-                                <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
101
+                              <!--  <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
99 102
                                         lay-filter="btnEdit1"><i class="layui-icon">&#xe642;</i>编辑
100
-                                </button>
103
+                                </button>-->
101 104
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
102 105
                                         lay-filter="btnDelete1"><i class="layui-icon"></i>删除
103 106
                                 </button>
@@ -487,7 +490,7 @@
487 490
                     <div class="layui-form-item ">
488 491
                         <div class="layui-input-inline" style="width: 100%">
489 492
                             <div id="toolbarPlan" class="layui-btn-group"
490
-                                 style="padding-bottom: 0px;margin-bottom: -8px">
493
+                                 style="padding-bottom: 0px;margin-bottom: 0px">
491 494
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
492 495
                                         lay-filter="btnPlanAdd" data-type="addRow"><i class="layui-icon"></i>增加一行
493 496
                                 </button>
@@ -781,17 +784,17 @@
781 784
             cols: [
782 785
                 [
783 786
                     {type: "checkbox", width: '60', fixed: 'left'},
784
-                    {field: 'xh', width: '100', title: '序号', align: 'center'},
787
+                    {type: 'numbers', width: '100', title: '序号', align: 'center'},
785 788
                     {field: 'xm', width: '120', title: '姓名'},
786 789
                     {field: 'dwmc', width: '300', title: '单位'},
787 790
                     {field: 'gddh', width: '150', title: '联系电话'}
788 791
                 ]
789 792
             ],
790 793
             autoSort: true,
791
-            initSort: {
794
+            /*initSort: {
792 795
                 field: 'xh', //排序字段
793 796
                 type: 'asc' //排序方式:desc 降序,asc 升序
794
-            }
797
+            }*/
795 798
         });
796 799
 
797 800
         // 添加项目负责人
@@ -2269,10 +2272,10 @@
2269 2272
             cols: [
2270 2273
                 [
2271 2274
                     {type: "checkbox", align: 'center'},
2272
-                    {type: 'numbers', align: 'center'},
2273
-                    {field: 'wjm', title: '文件名', width: '30%'},
2274
-                    {field: 'scrq', title: '上传日期', width: '20%'},
2275
-                    {field: 'sm', title: '说明', width: '25%', edit: 'text'}
2275
+                    {type: 'numbers', align: 'center',title: '序号'},
2276
+                    {field: 'wjm', title: '文件名', width: '40%'},
2277
+                    {field: 'scrq', title: '上传日期', width: '30%'},
2278
+                 /*   {field: 'sm', title: '说明', width: '25%', edit: 'text'}*/
2276 2279
                 ]
2277 2280
             ],
2278 2281
             autoSort: false,

+ 6 - 6
src/main/resources/templates/reportinfo/addfzr.html

@@ -16,12 +16,12 @@
16 16
 <body>
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form">
19
-        <div class="layui-form-item layui-inline">
19
+    <!--    <div class="layui-form-item layui-inline">
20 20
             <label class="layui-form-label" style="width: 70px">序号</label>
21 21
             <div class="layui-input-inline" style="width: 650px">
22 22
                 <input type="text" id="xh" name="xh" class="layui-input">
23 23
             </div>
24
-        </div>
24
+        </div>-->
25 25
 
26 26
         <div class="layui-form-item layui-inline">
27 27
             <label class="layui-form-label required" style="width: 70px">姓名</label>
@@ -82,15 +82,15 @@
82 82
                 url: AjaxUtil.ctx + 'basePerson/rylist',
83 83
                 cols: [
84 84
                     [
85
-                        {type: 'radio'},
85
+                        {type: 'radio',title: '😊'},
86 86
                         {
87 87
                             field: '', title: '序号', type: 'numbers', align: 'center', templet: function (d) {
88 88
                                 return d.LAY_TABLE_INDEX + 1;
89 89
                             }
90 90
                         },
91
-                        {field: 'xm', title: '姓名'},
92
-                        {field: 'gddh', title: '联系电话'},
93
-                        {field: 'dwmc', title: '单位'}
91
+                        {field: 'xm', title: '姓名',width:'15%'},
92
+                        {field: 'gddh', title: '联系电话',width: '30%'},
93
+                        {field: 'dwmc', title: '单位',width: '35%'}
94 94
                     ]
95 95
                 ]
96 96
             },

+ 4 - 3
src/main/resources/templates/reportinfo/list_myproject.html

@@ -61,7 +61,7 @@
61 61
                             </div>
62 62
                         </div>
63 63
                         <div class="layui-inline">
64
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">申请日期</label>
64
+                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">起始日期</label>
65 65
                             <div class="layui-input-inline" style="width: 100px;">
66 66
                                 <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
67 67
                                        class="layui-input" readonly>
@@ -182,7 +182,7 @@
182 182
             cols: [
183 183
                 [
184 184
                     {type: "checkbox", fixed: 'left'},
185
-                    {type: 'numbers', align: 'center'},
185
+                    {type: 'numbers', align: 'center',title: '序号'},
186 186
                     {field: 'mc', width: '25%', title: '名称'},
187 187
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
188 188
                     {field: 'qs', width: '7%', title: '起始', align: 'center'},
@@ -241,7 +241,8 @@
241 241
                 'SSBM': '',
242 242
                 'SQRQStart': '',
243 243
                 'SQRQEnd': '',
244
-                'YSP': ''
244
+                'YSP': '',
245
+                'SSBMNAME':''
245 246
             });
246 247
             // 执行搜索重载
247 248
             currTable.reload({

+ 7 - 7
src/main/resources/templates/reportinfo/update.html

@@ -99,9 +99,9 @@
99 99
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
100 100
                                         lay-filter="btnAdd1"><i class="layui-icon"></i>增加
101 101
                                 </button>
102
-                                <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
102
+<!--                                <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
103 103
                                         lay-filter="btnEdit1"><i class="layui-icon">&#xe642;</i>编辑
104
-                                </button>
104
+                                </button>-->
105 105
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
106 106
                                         lay-filter="btnDelete1"><i class="layui-icon"></i>删除
107 107
                                 </button>
@@ -539,7 +539,7 @@
539 539
                     <div class="layui-form-item ">
540 540
                         <div class="layui-input-inline" style="width: 100%">
541 541
                             <div id="toolbarPlan" class="layui-btn-group"
542
-                                 style="padding-bottom: 0px;margin-bottom: -8px">
542
+                                 style="padding-bottom: 0px;margin-bottom: 0px">
543 543
                                 <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
544 544
                                         lay-filter="btnPlanAdd" data-type="addRow"><i class="layui-icon"></i>增加一行
545 545
                                 </button>
@@ -856,7 +856,7 @@
856 856
             cols: [
857 857
                 [
858 858
                     {type: "checkbox", width: '60', fixed: 'left'},
859
-                    {field: 'xh', width: '100', title: '序号', align: 'center'},
859
+                    {type: 'numbers', width: '100', title: '序号', align: 'center'},
860 860
                     {field: 'xm', width: '120', title: '姓名'},
861 861
                     {field: 'dwmc', width: '300', title: '单位'},
862 862
                     {field: 'gddh', width: '150', title: '联系电话'}
@@ -2304,10 +2304,10 @@
2304 2304
             cols: [
2305 2305
                 [
2306 2306
                     {type: "checkbox", align: 'center'},
2307
-                    {type: 'numbers', align: 'center'},
2308
-                    {field: 'wjm', title: '文件名', width: '30%'},
2307
+                    {type: 'numbers', align: 'center',title: '序号'},
2308
+                    {field: 'wjm', title: '文件名', width: '40%'},
2309 2309
                     {field: 'scrq', title: '上传日期', width: '20%'},
2310
-                    {field: 'sm', title: '说明', edit: 'text', width: '25%'}
2310
+                    /*{field: 'sm', title: '说明', edit: 'text', width: '25%'}*/
2311 2311
                 ]
2312 2312
             ],
2313 2313
             autoSort: false,

+ 2 - 2
src/main/resources/templates/reportinfo/updatefzr.html

@@ -16,12 +16,12 @@
16 16
 <body>
17 17
 <form class="layui-form" action="" lay-filter="formDemo">
18 18
     <div class="layui-form layuimini-form">
19
-        <div class="layui-form-item layui-inline">
19
+<!--        <div class="layui-form-item layui-inline">
20 20
             <label class="layui-form-label required" style="width: 70px">序号</label>
21 21
             <div class="layui-input-inline" style="width: 650px">
22 22
                 <input type="text" id="xh" name="xh" class="layui-input">
23 23
             </div>
24
-        </div>
24
+        </div>-->
25 25
 
26 26
         <div class="layui-form-item layui-inline">
27 27
             <label class="layui-form-label" style="width: 70px">姓名</label>

+ 4 - 4
src/main/resources/templates/reportinfo/view.html

@@ -437,7 +437,7 @@
437 437
             cols: [
438 438
                 [
439 439
                     {type: "checkbox", width: '60', fixed: 'left'},
440
-                    {field: 'xh', width: '100', title: '序号', align: 'center'},
440
+                    {type: 'numbers', width: '100', title: '序号', align: 'center'},
441 441
                     {field: 'xm', width: '120', title: '姓名'},
442 442
                     {field: 'dwmc', width: '300', title: '单位'},
443 443
                     {field: 'gddh', width: '150', title: '联系电话'}
@@ -608,10 +608,10 @@
608 608
             data: tableData,
609 609
             cols: [
610 610
                 [
611
-                    {type: 'numbers', align: 'center'},
612
-                    {field: 'wjm', title: '文件名', width: '30%'},
611
+                    {type: 'numbers', align: 'center',title: '序号'},
612
+                    {field: 'wjm', title: '文件名', width: '40%'},
613 613
                     {field: 'scrq', title: '上传日期', width: '20%'},
614
-                    {field: 'sm', title: '说明', edit: 'text', width: '30%'}
614
+                    /*{field: 'sm', title: '说明', edit: 'text', width: '30%'}*/
615 615
                 ]
616 616
             ],
617 617
             autoSort: false,