2 Commits dcc4c0dc02 ... aae4167c4c

Author SHA1 Message Date
  ly aae4167c4c 费用申请页面缺少声明 2 weeks ago
  ly fa0d717a4e 登录页面 V 位置调整 2 weeks ago

File diff suppressed because it is too large
+ 1 - 1
src/main/resources/static/lib/layui-v2.6.3/css/layui.css


+ 0 - 0
src/main/resources/templates/file/fileUtil.html


+ 6 - 0
src/main/resources/templates/home/index.html

@@ -18,6 +18,12 @@
18 18
     <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
19 19
     <style id="layuimini-bg-color">
20 20
     </style>
21
+    <style>
22
+        .layuimini-menu-left
23
+        .layui-nav-item a span{
24
+            top: 53%;
25
+        }
26
+    </style>
21 27
 </head>
22 28
 <body class="layui-layout-body layuimini-all">
23 29
 <div class="layui-layout layui-layout-admin">

+ 44 - 6
src/main/resources/templates/home/welcome-1.html

@@ -80,7 +80,7 @@
80 80
 
81 81
         .welcome-module {
82 82
             width: 100%;
83
-            height: 180px;
83
+            height:20%;
84 84
         }
85 85
 
86 86
         .panel {
@@ -180,12 +180,15 @@
180 180
                 <div class="layui-row layui-col-space15">
181 181
                     <div class="layui-col-md12" style="padding-bottom: 10px">
182 182
                         <div class="layui-card">
183
-                            <div class="layui-card-header"><i class="fa fa-credit-card icon icon-blue"></i>项目管理</div>
184
-                            <div class="layui-card-body" style="height: 160px">
183
+                            <div class="layui-card-header">
184
+                                <i class="fa fa-credit-card icon icon-blue">
185
+                                </i>项目管理
186
+                            </div>
187
+                            <div class="layui-card-body">
185 188
                                 <div class="welcome-module">
186 189
                                     <div class="layui-row layui-col-space10 layuimini-qiuck">
187 190
                                         <div class="layui-col-xs3 layuimini-qiuck-module">
188
-                                            <a href="javascript:;" layuimini-content-href="/reportinfo/init_myProject"
191
+                                            <a onclick=""
189 192
                                                data-title="项目可研报告" data-icon="fa fa-window-maximize">
190 193
                                                 <i class="fa fa-window-maximize"></i>
191 194
                                                 <cite>项目可研报告</cite>
@@ -195,17 +198,52 @@
195 198
                                             <a href="javascript:;" layuimini-content-href="/prjProject/init_myProject"
196 199
                                                data-title="项目任务书" data-icon="fa fa-gears">
197 200
                                                 <i class="fa fa-gears"></i>
198
-                                                <cite>项目任务书</cite>
201
+                                                <cite>任务书</cite>
199 202
                                             </a>
200 203
                                         </div>
201 204
                                         <div class="layui-col-xs3 layuimini-qiuck-module">
202 205
                                             <a href="javascript:;"
203
-                                               layuimini-content-href="/staBudgetapproval/init_apply" data-title="费用申请"
206
+                                               layuimini-content-href="/staBudgetapproval/init_apply" data-title="年度预算"
204 207
                                                data-icon="fa fa-jpy">
205 208
                                                 <i class="fa fa-jpy"></i>
209
+                                                <cite>年度预算</cite>
210
+                                            </a>
211
+                                        </div>
212
+                                        <div class="layui-col-xs3 layuimini-qiuck-module">
213
+                                            <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
214
+                                               data-title="费用申请" data-icon="fa fa-check-square-o">
215
+                                                <i class="fa fa-check-square-o"></i>
206 216
                                                 <cite>费用申请</cite>
207 217
                                             </a>
208 218
                                         </div>
219
+                                        <div class="layui-col-xs3 layuimini-qiuck-module">
220
+                                            <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
221
+                                               data-title="备用金" data-icon="fa fa-check-square-o">
222
+                                                <i class="fa fa-check-square-o"></i>
223
+                                                <cite>备用金</cite>
224
+                                            </a>
225
+                                        </div>
226
+                                        <div class="layui-col-xs3 layuimini-qiuck-module">
227
+                                            <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
228
+                                               data-title="报账" data-icon="fa fa-check-square-o">
229
+                                                <i class="fa fa-check-square-o"></i>
230
+                                                <cite>报账</cite>
231
+                                            </a>
232
+                                        </div>
233
+                                        <div class="layui-col-xs3 layuimini-qiuck-module">
234
+                                            <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
235
+                                               data-title="付款申请" data-icon="fa fa-check-square-o">
236
+                                                <i class="fa fa-check-square-o"></i>
237
+                                                <cite>付款申请</cite>
238
+                                            </a>
239
+                                        </div>
240
+                                        <div class="layui-col-xs3 layuimini-qiuck-module">
241
+                                            <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
242
+                                               data-title="合同" data-icon="fa fa-check-square-o">
243
+                                                <i class="fa fa-check-square-o"></i>
244
+                                                <cite>合同</cite>
245
+                                            </a>
246
+                                        </div>
209 247
 <!--                                        <div class="layui-col-xs3 layuimini-qiuck-module">
210 248
                                             <a href="javascript:;" layuimini-content-href="/prjApproverecord/inits"
211 249
                                                data-title="待审批" data-icon="fa fa-check-square-o">

+ 10 - 1
src/main/resources/templates/payapply/list.html

@@ -171,6 +171,14 @@
171 171
         }
172 172
     });
173 173
 </script>
174
+<script type="text/html" id="cz">
175
+    <div class="layui-btn-container">
176
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="">
177
+            <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>回退
178
+        </button>
179
+    </div>
180
+
181
+</script>
174 182
 <script>
175 183
     // 获取所有需要去除空格的输入框
176 184
     const inputs = [
@@ -232,7 +240,8 @@
232 240
                     {field: 'fkjhmc', width: '12%', title: '付款计划'},
233 241
                     {field: 'cjrxm', width: '7%', title: '创建人'},
234 242
                     {field: 'cjrq', width: '8%', title: '创建时间', align: 'center'},
235
-                    {field: 'htje', title: '合同金额(万元)' ,width: '8%',align: 'right'}
243
+                    {field: 'htje', title: '合同金额(万元)' ,width: '8%',align: 'right'},
244
+                    {title: '操作',width: '5%',toolbar:'#cz',align: 'center',fixed: 'right'}
236 245
                 ]
237 246
             ],
238 247
             autoSort: false,

+ 11 - 1
src/main/resources/templates/prjcontract/list.html

@@ -112,6 +112,15 @@
112 112
 
113 113
     </div>
114 114
 </div>
115
+
116
+<script type="text/html" id="cz">
117
+    <div class="layui-btn-container">
118
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="">
119
+            <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>回退
120
+        </button>
121
+    </div>
122
+
123
+</script>
115 124
 <script>
116 125
     // 获取所有需要去除空格的输入框
117 126
     const inputs = [
@@ -161,7 +170,8 @@
161 170
                     {field: 'zq', width: '6%',title: '周期(月)',align: 'left'},
162 171
                     {field: 'kssj',width: '10%',title: '执行周期(开始)',align: 'center'},
163 172
                     {field: 'jssj',width: '10%',title: '执行周期(结束)',align: 'center'},
164
-                    {field: 'cjsj', width: '10%', title: '创建时间', align: 'center'}
173
+                    {field: 'cjsj', width: '10%', title: '创建时间', align: 'center'},
174
+                    {title: '操作',width: '5%',toolbar:'#cz',align: 'center',fixed: 'right'}
165 175
                 ]
166 176
             ],
167 177
             autoSort: false,

+ 11 - 4
src/main/resources/templates/reimburse/list.html

@@ -29,14 +29,12 @@
29 29
                                 <input type="text" name="erpbh" id="erpbh" autocomplete="off" class="layui-input">
30 30
                             </div>
31 31
                         </div>
32
-
33 32
                         <div class="layui-inline">
34 33
                             <label class="layui-form-label" style="width: 100px;">科研编号</label>
35 34
                             <div class="layui-input-inline" style="width: 140px;">
36 35
                                 <input type="text" name="bh" id="bh" autocomplete="off" class="layui-input">
37 36
                             </div>
38 37
                         </div>
39
-
40 38
                         <div class="layui-inline">
41 39
                             <label class="layui-form-label" style="width: 70px;">年份</label>
42 40
                             <div class="layui-input-inline" style="width: 140px;">
@@ -47,7 +45,6 @@
47 45
                                 </select>
48 46
                             </div>
49 47
                         </div>
50
-
51 48
                         <div class="layui-inline">
52 49
                             <label class="layui-form-label" style="width: 70px;">审批状态</label>
53 50
                             <div class="layui-input-inline" style="width: 140px;">
@@ -134,6 +131,15 @@
134 131
                 </button>
135 132
             </div>
136 133
         </script>
134
+
135
+        <script type="text/html" id="cz">
136
+            <div class="layui-btn-container">
137
+                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="">
138
+                    <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>回退
139
+                </button>
140
+            </div>
141
+
142
+        </script>
137 143
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
138 144
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
139 145
     </div>
@@ -217,7 +223,8 @@
217 223
                     {field: 'sf', width: '6%', title: '税费(元)'},
218 224
                     {field: 'sqrxm', width: '7%', title: '申请人'},
219 225
                     {field: 'cjsj', width: '8%', title: '创建时间', align: 'center'},
220
-                    {field: 'fysqmc', title: '费用申请',width: '25%'}
226
+                    {field: 'fysqmc', title: '费用申请',width: '25%'},
227
+                    {title: '操作',width: '7%',toolbar:'#cz',align: 'center',fixed: 'right'}
221 228
                 ]
222 229
             ],
223 230
             autoSort: false,

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

@@ -73,18 +73,18 @@
73 73
             </div>
74 74
         </div>
75 75
 
76
-      <!--  <div class="layui-form-item layui-inline" style="width: 100%">
76
+<!--        <div class="layui-form-item layui-inline" style="width: 100%">
77 77
             <label class="layui-form-label" style="width: 17%">电科院负责人</label>
78 78
             <div class="layui-input-inline" style="width: 70%">
79 79
                 <input type="text"  class="layui-input" th:value="${project.dkyfzrxm}" disabled>
80 80
             </div>
81
-        </div>
81
+        </div>-->
82 82
         <div class="layui-form-item layui-inline" style="width: 100%">
83 83
             <label class="layui-form-label" style="width: 17%">申请人</label>
84 84
             <div class="layui-input-inline" style="width: 70%">
85
-                <input type="text" class="layui-input"  th:value="${project.cjrxm}" disabled>
85
+                <input type="text" class="layui-input"  th:value="${sta.sqrxm}" disabled>
86 86
             </div>
87
-        </div>-->
87
+        </div>
88 88
     </div>
89 89
 
90 90
 </div>
@@ -119,13 +119,13 @@
119 119
             </div>
120 120
         </div>
121 121
 
122
-     <!--   <div class="layui-form-item layui-inline" style="width: 100%">
122
+<!--        <div class="layui-form-item layui-inline" style="width: 100%">
123 123
             <label class="layui-form-label" style="width: 17%">电科院负责人<span style="color: red;">*</span></label>
124 124
             <div class="layui-input-inline" style="width: 70%">
125 125
                 <input type="hidden" id="dkyfzr" name="dkyfzr" class="layui-input">
126 126
                 <input type="text" id = 'dkyfzrxm' name="dkyfzrxm" class="layui-input">
127 127
             </div>
128
-        </div>
128
+        </div>-->
129 129
         <div class="layui-form-item layui-inline" style="width: 100%">
130 130
             <label class="layui-form-label" style="width: 17%">申请人<span style="color: red;">*</span></label>
131 131
             <div class="layui-input-inline" style="width: 70%">
@@ -133,7 +133,7 @@
133 133
                 <input type="text" id = 'sqrxm' name="sqrxm" class="layui-input">
134 134
 
135 135
             </div>
136
-        </div>-->
136
+        </div>
137 137
     </div>
138 138
 
139 139
     <!-- 右侧悬浮按钮 -->

File diff suppressed because it is too large
+ 6 - 6
src/main/resources/templates/stabudgetapproval/view_apply.html


+ 1 - 0
src/main/resources/templates/stafeemanage/list_allapply.html

@@ -1,3 +1,4 @@
1
+<!DOCTYPE html>
1 2
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
2 3
 <head>
3 4
     <meta charset="UTF-8">