浏览代码

间接费修改

ly 10 月之前
父节点
当前提交
5e280efb18

+ 11 - 8
src/main/resources/mapper/StaIndirectCostsDao.xml

@@ -188,25 +188,28 @@ SL = values(SL)
188 188
         sys_dept_info.dept_name AS BM,
189 189
         prj_Project.BM AS XMBH,
190 190
         sta_BudgetApproval.XMMC,
191
+        sta_BudgetApproval.BH,
192
+        sta_BudgetApproval.NF,
193
+        sta_BudgetApproval.ERPBH,
191 194
         base_ProjectType.XMLXMC,
192
-        sta_BudgetApproval.SQJE,
193
-        sta_IndirectCosts.FYYT,
195
+        sta_IndirectCosts.SQJE,
196
+        sta_IndirectCosts.SL,
197
+        sta_IndirectCosts.BZJE,
198
+        sta_IndirectCosts.BHSJE,
194 199
         sta_IndirectCosts.FYYT,
195 200
         CASE sta_BudgetApproval.SFBYJ
196 201
         WHEN 0 THEN '否'
197 202
         WHEN 1 THEN '是'
198 203
         ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
199 204
         END AS SFBYJ,
200
-        sta_IndirectCosts.BZJEHS,
201
-        sta_IndirectCosts.BZJEBHS,
202 205
         sta_IndirectCosts.BZ,
203 206
         CAST(sta_BudgetApproval.SQSJ AS date) AS SQSJ
204 207
         FROM
205 208
         sta_IndirectCosts
206
-        INNER JOIN sta_BudgetApproval ON sta_IndirectCosts.ZB = sta_BudgetApproval.ID
207
-        INNER JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
208
-        INNER JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
209
-        INNER JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
209
+        LEFT JOIN sta_BudgetApproval ON sta_IndirectCosts.ZB = sta_BudgetApproval.ID
210
+        LEFT JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
211
+        LEFT JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
212
+        LEFT JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
210 213
         where  1= 1
211 214
         <if test="xmmc != null and xmmc != ''">
212 215
             AND sta_BudgetApproval.XMMC LIKE '%'+#{xmmc}+'%'

+ 7 - 7
src/main/resources/templates/staindirectcosts/view.html

@@ -19,37 +19,37 @@
19 19
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
20 20
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">序号</label>
21 21
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
22
-                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空">
22
+                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空" disabled>
23 23
                 </div>
24 24
             </div>
25 25
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
26 26
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">费用用途</label>
27 27
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
28
-                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input">
28
+                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input" disabled>
29 29
                 </div>
30 30
             </div>
31 31
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
32 32
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">申请金额</label>
33 33
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
34
-                    <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input">
34
+                    <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input" disabled>
35 35
                 </div>
36 36
             </div>
37 37
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
38 38
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">税率</label>
39 39
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
40
-                    <input type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
40
+                    <input  disabled type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
41 41
                 </div>
42 42
             </div>
43 43
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
44 44
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(含税)</label>
45 45
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
46
-                    <input type="text" id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
46
+                    <input type="text" disabled  id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
47 47
                 </div>
48 48
             </div>
49 49
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
50 50
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(不含税)</label>
51 51
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
52
-                    <input type="text" id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
52
+                    <input type="text" disabled id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
53 53
                 </div>
54 54
             </div>
55 55
 
@@ -58,7 +58,7 @@
58 58
         <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
59 59
             <label class="layui-form-label" style="width: 70px; margin-right: 10px;">备注</label>
60 60
             <div class="layui-input-inline" style="width: calc(100% - 80px);">
61
-                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input"></textarea>
61
+                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input" disabled></textarea>
62 62
             </div>
63 63
         </div>
64 64
         <!-- 右侧悬浮按钮 -->

+ 48 - 18
src/main/resources/templates/statistical/indirectCosts.html

@@ -27,25 +27,29 @@
27 27
                         <div class="layui-inline" style="margin-right: 10px;">
28 28
                             <label class="layui-form-label" style="width: 80px;">项目名称</label>
29 29
                             <div class="layui-input-inline" style="width: 224px;">
30
-                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
30
+                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
31 31
                             </div>
32 32
                         </div>
33 33
                         <div class="layui-inline" style="margin-right: 10px;">
34 34
                             <label class="layui-form-label" style="width: 80px;">erp编号</label>
35 35
                             <div class="layui-input-inline" style="width: 140px;">
36
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
36
+                                <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
37 37
                             </div>
38 38
                         </div>
39 39
                         <div class="layui-inline" style="margin-right: 10px;">
40 40
                             <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41 41
                             <div class="layui-input-inline" style="width: 140px;">
42
-                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
42
+                                <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
43 43
                             </div>
44 44
                         </div>
45 45
                         <div class="layui-inline" style="margin-right: 10px;">
46
-                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
-                            <div class="layui-input-inline" style="width: 140px;">
48
-                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
46
+                            <label class="layui-form-label" style="width: 80px">年份</label>
47
+                            <div class="layui-input-inline" style="width: 140px">
48
+                                <select name="NF" id="NF" lay-filter="status">
49
+                                    <option value="">全部</option>
50
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
51
+                                            th:value="${item.nf}"></option>
52
+                                </select>
49 53
                             </div>
50 54
                         </div>
51 55
                     </div>
@@ -58,7 +62,7 @@
58 62
                             </div>
59 63
                             <div class="layui-form-mid">-</div>
60 64
                             <div class="layui-input-inline" style="width: 100px;">
61
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
65
+                                <input type="text" name="JSRQ" id="JSRQ" placeholder="结束日期" class="layui-input" readonly>
62 66
                             </div>
63 67
                         </div>
64 68
                         <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
@@ -78,7 +82,9 @@
78 82
         </fieldset>
79 83
 
80 84
         <script type="text/html" id="toolbarDemo">
81
-
85
+            <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
86
+                <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
87
+            </button>
82 88
         </script>
83 89
 
84 90
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
@@ -120,7 +126,7 @@
120 126
             elem: '#QSRQ'
121 127
         });
122 128
         laydate.render({
123
-            elem: '#JZRQ'
129
+            elem: '#JSRQ'
124 130
         });
125 131
 
126 132
         var currTable = table.render({
@@ -134,15 +140,17 @@
134 140
                     {type: "checkbox", fixed: 'left'},
135 141
                     {type: 'numbers', align: 'center'},
136 142
                     {field: 'BM', width: '7%', title: '项目部门'},
137
-                    {field: 'XMBH', width: '15%', title: '项目编号', sort: true},
143
+                    {field: 'BH', width: '15%', title: '项目编号', sort: true},
144
+                    {field: 'ERPBH', width: '15%', title: 'ERP编号', sort: true},
145
+                    {field: 'NF', width: '7%', title: '年份', sort: true},
138 146
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
139 147
                     {field: 'XMLXMC', width: '10%', title: '项目类型'},
140 148
                     {field: 'FYSQ', width: '10%', title: '申请费用'},
141 149
                     {field: 'FYYT', width: '15%', title: '费用用途'},
142
-                    {field: 'BZJEHS', width: '10%', title: '报账金额(含税)'},
143
-                    {field: 'BZJEBHS', width: '10%', title: '报账金额(不含税)'},
150
+                    {field: 'BZJE', width: '10%', title: '报账金额(含税)'},
151
+                    {field: 'BHSJE', width: '10%', title: '报账金额(不含税)'},
144 152
                     {field: 'SFBYJ', width: '10%', title: '是否备用金'},
145
-                    {field: 'BZJEBHS', width: '15%', title: '备注'},
153
+                    {field: 'BZ', width: '15%', title: '备注'},
146 154
                     {field: 'SQSJ', width: '10%', title: '申请时间'},
147 155
                     {field: 'ID', width: '0', title: 'id', hide: true}
148 156
                 ]
@@ -188,7 +196,10 @@
188 196
             form.val("search-form", {
189 197
                 "XMMC": '',
190 198
                 "QSRQ": '',
191
-                'JZRQ': ''
199
+                'JSRQ': '',
200
+                'ERPBH':'',
201
+                'FYSQBH':'',
202
+                'NF':''
192 203
             });
193 204
             // 执行搜索重载
194 205
             currTable.reload({
@@ -210,10 +221,29 @@
210 221
                 }
211 222
             });
212 223
         });
213
-        var cancelIndex;
214
-        /**
215
-         * toolbar监听事件
216
-         */
224
+        table.on('toolbar(currentTableFilter)',function (obj){
225
+            var formData = form.val('search-form');
226
+            console.log(formData);
227
+            var formDataString = JSON.stringify(formData);
228
+            if(obj.event === 'export'){
229
+                var formData = form.val('search-form');
230
+                console.log(formData);
231
+                var formDataString = JSON.stringify(formData);
232
+                AjaxUtil.post({
233
+                    url:AjaxUtil.ctx +'staIndirectCosts/getAll/'+formDataString,
234
+                    contentType: "application/json",
235
+                    timeout: 15000, //大批量导出时会出现超时问题
236
+                    success: function(res){
237
+                        console.log(res);
238
+                        table.exportFile('currentTableId',res.data,'xlsx');
239
+                    },
240
+                    error:function (error) {
241
+                        Message.error(error,2000)
242
+
243
+                    }
244
+                });
245
+            }
246
+        });
217 247
     });
218 248
 
219 249