间接费修改

src/main/resources/mapper/StaIndirectCostsDao.xml

@@ -188,25 +188,28 @@ SL = values(SL)
         sys_dept_info.dept_name AS BM,
         prj_Project.BM AS XMBH,
         sta_BudgetApproval.XMMC,
+        sta_BudgetApproval.BH,
+        sta_BudgetApproval.NF,
+        sta_BudgetApproval.ERPBH,
         base_ProjectType.XMLXMC,
-        sta_BudgetApproval.SQJE,
-        sta_IndirectCosts.FYYT,
+        sta_IndirectCosts.SQJE,
+        sta_IndirectCosts.SL,
+        sta_IndirectCosts.BZJE,
+        sta_IndirectCosts.BHSJE,
         sta_IndirectCosts.FYYT,
         CASE sta_BudgetApproval.SFBYJ
         WHEN 0 THEN '否'
         WHEN 1 THEN '是'
         ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
         END AS SFBYJ,
-        sta_IndirectCosts.BZJEHS,
-        sta_IndirectCosts.BZJEBHS,
         sta_IndirectCosts.BZ,
         CAST(sta_BudgetApproval.SQSJ AS date) AS SQSJ
         FROM
         sta_IndirectCosts
-        INNER JOIN sta_BudgetApproval ON sta_IndirectCosts.ZB = sta_BudgetApproval.ID
-        INNER JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
-        INNER JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
-        INNER JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
+        LEFT JOIN sta_BudgetApproval ON sta_IndirectCosts.ZB = sta_BudgetApproval.ID
+        LEFT JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
+        LEFT JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
+        LEFT JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
         where  1= 1
         <if test="xmmc != null and xmmc != ''">
             AND sta_BudgetApproval.XMMC LIKE '%'+#{xmmc}+'%'

src/main/resources/templates/staindirectcosts/view.html

@@ -19,37 +19,37 @@
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">序号</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空">
+                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空" disabled>
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">费用用途</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input">
+                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input" disabled>
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">申请金额</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input">
+                    <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input" disabled>
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">税率</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                    <input  disabled type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(含税)</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
+                    <input type="text" disabled  id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
                 <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(不含税)</label>
                 <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                    <input type="text" id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                    <input type="text" disabled id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
                 </div>
             </div>
 
@@ -58,7 +58,7 @@
         <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
             <label class="layui-form-label" style="width: 70px; margin-right: 10px;">备注</label>
             <div class="layui-input-inline" style="width: calc(100% - 80px);">
-                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input"></textarea>
+                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input" disabled></textarea>
             </div>
         </div>
         <!-- 右侧悬浮按钮 -->

src/main/resources/templates/statistical/indirectCosts.html

@@ -27,25 +27,29 @@
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">项目名称</label>
                             <div class="layui-input-inline" style="width: 224px;">
-                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
+                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">erp编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">费用申请号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">年度</label>
-                            <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 80px">年份</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <select name="NF" id="NF" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
+                                            th:value="${item.nf}"></option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -58,7 +62,7 @@
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                                <input type="text" name="JSRQ" id="JSRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
@@ -78,7 +82,9 @@
         </fieldset>
 
         <script type="text/html" id="toolbarDemo">
-
+            <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
+                <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
+            </button>
         </script>
 
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
@@ -120,7 +126,7 @@
             elem: '#QSRQ'
         });
         laydate.render({
-            elem: '#JZRQ'
+            elem: '#JSRQ'
         });
 
         var currTable = table.render({
@@ -134,15 +140,17 @@
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center'},
                     {field: 'BM', width: '7%', title: '项目部门'},
-                    {field: 'XMBH', width: '15%', title: '项目编号', sort: true},
+                    {field: 'BH', width: '15%', title: '项目编号', sort: true},
+                    {field: 'ERPBH', width: '15%', title: 'ERP编号', sort: true},
+                    {field: 'NF', width: '7%', title: '年份', sort: true},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
                     {field: 'XMLXMC', width: '10%', title: '项目类型'},
                     {field: 'FYSQ', width: '10%', title: '申请费用'},
                     {field: 'FYYT', width: '15%', title: '费用用途'},
-                    {field: 'BZJEHS', width: '10%', title: '报账金额（含税）'},
-                    {field: 'BZJEBHS', width: '10%', title: '报账金额（不含税）'},
+                    {field: 'BZJE', width: '10%', title: '报账金额（含税）'},
+                    {field: 'BHSJE', width: '10%', title: '报账金额（不含税）'},
                     {field: 'SFBYJ', width: '10%', title: '是否备用金'},
-                    {field: 'BZJEBHS', width: '15%', title: '备注'},
+                    {field: 'BZ', width: '15%', title: '备注'},
                     {field: 'SQSJ', width: '10%', title: '申请时间'},
                     {field: 'ID', width: '0', title: 'id', hide: true}
                 ]
@@ -188,7 +196,10 @@
             form.val("search-form", {
                 "XMMC": '',
                 "QSRQ": '',
-                'JZRQ': ''
+                'JSRQ': '',
+                'ERPBH':'',
+                'FYSQBH':'',
+                'NF':''
             });
             // 执行搜索重载
             currTable.reload({
@@ -210,10 +221,29 @@
                 }
             });
         });
-        var cancelIndex;
-        /**
-         * toolbar监听事件
-         */
+        table.on('toolbar(currentTableFilter)',function (obj){
+            var formData = form.val('search-form');
+            console.log(formData);
+            var formDataString = JSON.stringify(formData);
+            if(obj.event === 'export'){
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url:AjaxUtil.ctx +'staIndirectCosts/getAll/'+formDataString,
+                    contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
+                    success: function(res){
+                        console.log(res);
+                        table.exportFile('currentTableId',res.data,'xlsx');
+                    },
+                    error:function (error) {
+                        Message.error(error,2000)
+
+                    }
+                });
+            }
+        });
     });