bug修改

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -97,7 +97,7 @@ public class PrjApproverecordController extends BaseController {
     public BaseResult list(@RequestParam("page") Integer pageNum,
                            @RequestParam("limit") Integer pageSize,
                            @RequestParam(required = false, defaultValue = "", value = "xm") String xm,
-                           @RequestParam(required = false, defaultValue = "", value = "zt") String zt,
+                           @RequestParam(required = false, defaultValue = "", value = "spzt") String zt,
                            @RequestParam(required = false, defaultValue = "", value = "wc") String wc,
                            @RequestParam(required = false, defaultValue = "", value = "tablename") String tablename,
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -591,7 +591,7 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/forApplyView/{id}", method = RequestMethod.GET)
-    public String forApplyView(Model model, @PathVariable Integer id) {
+    public String   forApplyView(Model model, @PathVariable Integer id) {
         StaBudgetapproval budgetapproval = staBudgetapprovalService.getFysqById(id);
         model.addAttribute("budgetapproval", budgetapproval);
         //费用信息

src/main/java/com/liang/controller/StaReimbursementController.java

@@ -612,6 +612,7 @@ public class StaReimbursementController extends BaseController {
                 postInfo = new SysPostInfo();
             }
             model.addAttribute("postInfo", postInfo);
+            model.addAttribute("xmid",xmid);
 
             return "reimburse/back_approve";
         } else {

src/main/java/com/liang/entity/PrjApproverecord.java

@@ -180,6 +180,15 @@ public class PrjApproverecord implements Serializable {
     private double kysje;
     private double rysje;
 
+    private String fymc;
+
+    public String getFymc() {
+        return fymc;
+    }
+
+    public void setFymc(String fymc) {
+        this.fymc = fymc;
+    }
 
     public Integer getId() {
         return id;

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -31,6 +31,7 @@
         <result property="cyy" column="CYY" jdbcType="VARCHAR"/>
         <result property="dbr" column="DBR" jdbcType="VARCHAR"/>
         <result property="xzcyy" column="XZCYY" jdbcType="INTEGER"/>
+        <result property="fymc" column="FYMC" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -421,29 +422,80 @@
 
     <!--获取待审批列表-->
     <select id="getApproveList" resultMap="PrjApproverecordMap" parameterType="map">
-        SELECT * from  (
-        select a.*, u.name as TJRXM, kb.YSJE as KYSJE, pb.YSJE as RYSJE, nb.XMZYS, b.SQJE, r.BZJE, f.BCFKJE
-        ,case when TABLENAME = 'sta_FeasibilityReport' then '可研报告' when TABLENAME = 'prj_Project' then '任务书'
-        when TABLENAME = 'prj_AnnualBudget' then '年度预算' when TABLENAME = 'sta_BudgetApproval' then '费用申请'
-        when TABLENAME = 'sta_Reimbursement' then '报账' when TABLENAME = 'sta_PayApproval' then '付款申请' end as XMLXMC
-        ,case when TABLENAME = 'sta_FeasibilityReport' then k.SPZT when TABLENAME = 'prj_Project' then p.SPZT
-        when TABLENAME = 'prj_AnnualBudget' then n.SPZT when TABLENAME = 'sta_BudgetApproval' then b.SPZT
-        when TABLENAME = 'sta_Reimbursement' then r.SPZT when TABLENAME = 'sta_PayApproval' then f.SPZT end as SPZT,
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        a.*,
+        u.name AS TJRXM,
+        kb.YSJE AS KYSJE,
+        pb.YSJE AS RYSJE,
+        nb.FYMC,
+        nb.XMZYS,
+        b.SQJE,
+        r.BZJE,
+        f.BCFKJE,
+
+        CASE
+
+        WHEN TABLENAME = 'sta_FeasibilityReport' THEN
+        '可研报告'
+        WHEN TABLENAME = 'prj_Project' THEN
+        '任务书'
+        WHEN TABLENAME = 'prj_AnnualBudget' THEN
+        '年度预算'
+        WHEN TABLENAME = 'sta_BudgetApproval' THEN
+        '费用申请'
+        WHEN TABLENAME = 'sta_Reimbursement' THEN
+        '报账'
+        WHEN TABLENAME = 'sta_PayApproval' THEN
+        '付款申请'
+        END AS XMLXMC,
+        CASE
+
+        WHEN TABLENAME = 'sta_FeasibilityReport' THEN
+        k.SPZT
+        WHEN TABLENAME = 'prj_Project' THEN
+        p.SPZT
+        WHEN TABLENAME = 'prj_AnnualBudget' THEN
+        n.SPZT
+        WHEN TABLENAME = 'sta_BudgetApproval' THEN
+        b.SPZT
+        WHEN TABLENAME = 'sta_Reimbursement' THEN
+        r.SPZT
+        WHEN TABLENAME = 'sta_PayApproval' THEN
+        f.SPZT
+        END AS SPZT,
         f.htje,
-        ROW_NUMBER()over(partition by a.xmid ,a.TABLENAME order by a.tjsj desc , a.wc ASC) as rn
-        from prj_ApproveRecord a
-        inner join sys_user_info u on a.TJR = u.user_id
-        left join sta_FeasibilityReport k on a.XMID = k.ID and a.ZT = k.SPZT
-        left join sta_Budget kb on kb.XM = k.ID and kb.FJ = ''
-        left join prj_Project p on a.XMID = p.ID and a.ZT = p.SPZT
-        left join prj_Budget pb on pb.XM = p.ID and pb.FJ = ''
-        left join prj_AnnualBudget n on a.XMID = n.ID and a.ZT = n.SPZT
-        left join prj_AnnualBudgetDetail nb on n.ID = nb.NYS and (nb.FJ is NULL or nb.FJ = '')
-        left join sta_BudgetApproval b on a.XMID = b.ID and a.ZT = b.SPZT
-        left join sta_Reimbursement r on a.XMID = r.ID and a.ZT = r.SPZT
-        left join sta_PayApproval f on a.XMID = f.ID and a.ZT = f.SPZT
+        ROW_NUMBER ( ) OVER ( partition BY a.xmid , a.TABLENAME ORDER BY a.tjsj DESC, a.wc ASC ) AS rn
+        FROM
+        prj_ApproveRecord a
+        INNER JOIN sys_user_info u ON a.TJR = u.user_id
+        LEFT JOIN sta_FeasibilityReport k ON a.XMID = k.ID
+        AND a.ZT = k.SPZT
+        LEFT JOIN sta_Budget kb ON kb.XM = k.ID
+        AND kb.FJ = ''
+        LEFT JOIN prj_Project p ON a.XMID = p.ID
+        AND a.ZT = p.SPZT
+        LEFT JOIN prj_Budget pb ON pb.XM = p.ID
+        AND pb.FJ = ''
+        LEFT JOIN prj_AnnualBudget n ON a.XMID = n.ID
+        AND a.ZT = n.SPZT
+        LEFT JOIN prj_AnnualBudgetDetail nb ON n.ID = nb.NYS
+        AND ( nb.FJ IS NULL OR nb.FJ = '' )
+        LEFT JOIN sta_BudgetApproval b ON a.XMID = b.ID
+        AND a.ZT = b.SPZT
+        LEFT JOIN sta_Reimbursement r ON a.XMID = r.ID
+        AND a.ZT = r.SPZT
+        LEFT JOIN sta_PayApproval f ON a.XMID = f.ID
+        AND a.ZT = f.SPZT
         ) a
-        where a.rn =1 and a.wc = 0 and a.zt != '未提交' and a.zt != '未提交(返回)'
+        WHERE
+        a.rn = 1
+        AND a.wc = 0
+        AND a.zt != '未提交'
+        AND a.zt != '未提交(返回)'
 
         <if test="userId != null and userId != ''">
             and a.SHR = #{userId}

src/main/resources/templates/prjapproverecord/list.html

@@ -33,9 +33,6 @@
                                     <option value="prj_AnnualBudget">年度预算</option>
                                     <option value="sta_Reimbursement">报账列表</option>
                                     <option value="sta_PayApproval">付款申请</option>
-                                    <!--                                    <option value="4">科学技术进步奖</option>-->
-                                    <!--                                    <option value="5">标准创新贡献奖</option>-->
-                                    <!--                                    <option value="6">专利奖</option>-->
                                 </select>
                             </div>
                         </div>
@@ -156,7 +153,8 @@
                 "xm": '',
                 "erpbh": '',
                 "xmlx": '',
-                "spzt": ''
+                "spzt": '',
+                "tablename":''
             });
             // 执行搜索重载
             currTable.reload({
@@ -326,7 +324,7 @@
 
         //双击
         table.on('rowDouble(currentTableFilter)', function (obj) {
-            var data = obj.data;
+/*            var data = obj.data;
             xmApproval = {
                 "xmid": data.xmid,
                 "xm": data.xm
@@ -364,7 +362,51 @@
                 end: function (index) {
                     layer.close(index);
                 }
-            });
+            });*/
+
+
+            var projects = table.cache["currentTableId"];
+            if (projects.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要审批的记录！", 1500);
+            } else if (data.length > 1) {
+                for (var index in data) {
+                    bathSP(data[index])
+                    if (index == (data.length - 1)) {
+                        var tc = layer.alert('操作成功', function (index) {
+                            // 执行搜索重载
+                            currTable.reload({
+                                page: {
+                                    curr: 1
+                                },
+                                where: form.val("search-form")
+                            });
+                            layer.close(tc);
+                        });
+                    }
+                }
+
+            } else {
+                var content = oneSP(data)
+                layer.open({
+                    title: '审批意见',
+                    type: 2,
+                    shade: 0.3,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['1025px', layerheight + 'px'],
+                    content: content,
+                    end: function () {
+                        if (updateflag == 1)
+                            currTable.reload();
+                        updateflag = 0;
+                    }
+                });
+            }
         });
     });
 

src/main/resources/templates/reimburse/finish_approve.html

@@ -115,6 +115,7 @@
             </button>
         </div>
     </div>
+    <input type="hidden" th:value="${xmid}" style="display: none">
 </form>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
@@ -207,16 +208,18 @@
         });
 
         // 监听查看可研报告按钮
-        $("button[lay-filter='viewRwsBtn']").click(function () {
+        $("button[lay-filter='viewFybzBtn']").click(function () {
+            var xmid = document.getElementById('xmid').value;
+            console.log(xmid)
             parent.layer.open({
-                title: '查看项目任务书',
+                title: '查看报账',
                 type: 2,
                 shade: 0.3,
-                maxmin: true,
+                // maxmin: true,
                 shadeClose: true,
-                area: ['1080px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'staReimbursement/view/' + xmApproval.xmid,
-                end: function (index) {
+                area: ['1250px', '750px'],
+                content: AjaxUtil.ctx + "staReimbursement/forView/" +xmid,
+                end: function () {
                     layer.close(index);
                 }
             });

src/main/resources/templates/reimburse/list.html

@@ -242,7 +242,7 @@
                         title: '编辑报账',
                         type: 2,
                         shade: 0.3,
-                        // maxmin: true,
+                        maxmin: true,
                         shadeClose: true,
                         area: ['1250px', '750px'],
                         content: AjaxUtil.ctx + "staReimbursement/forUpdate/" +data[0].id,
@@ -271,7 +271,7 @@
                         title: '查看报账',
                         type: 2,
                         shade: 0.3,
-                        // maxmin: true,
+                        maxmin: true,
                         shadeClose: true,
                         area: ['1250px', '750px'],
                         content: AjaxUtil.ctx + "staReimbursement/forView/" +data[0].id,

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

@@ -70,10 +70,6 @@
             <div class="layui-col-md6">
                 <div class="layui-form-label" style="width: 70px">报销凭证</div>
             </div>
-            <div class="layui-btn-container">
-                <button type="button" class="layui-btn layui-btn-primary" lay-on="test-tips-photos" id="ckwj">查看文件
-                </button>
-            </div>
         </div>
         <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -20px">
             <input type="hidden" id="bxpz" name="bxpz" class="layui-input" th:value="${reimbursement.bxpz}">
@@ -83,6 +79,9 @@
 
         <!-- 右侧悬浮按钮 -->
         <div class="right-bottom-btn">
+            <button type="button" class="layui-btn" lay-on="test-tips-photos" id="ckwj">
+                <i class="layui-icon layui-icon-up">批量查看报销凭证</i>
+            </button>
             <button type="button" class="layui-btn" lay-filter="viewFysqBtn">
                 <i class="layui-icon layui-icon-ok"></i>查看费用申请
             </button>
@@ -239,8 +238,11 @@
                 success: function (res) {
                     console.log(res)
                     layer.tab({
+                        title:'查看报销凭证',
                         area: ['1150px', '750px'],
                         tab: res.data,
+                        maxmin: true,
+                        shadeClose: true,
                         success: function (index, layero) {//打开tab后的执行的内容
                             //你的代码
                             $(".layui-layer-title").attr("style", "width: 1150px; height: 85px; overflow-y: scroll;  white-space: nowrap; border: 1px solid #ccc;");

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -214,6 +214,9 @@
 
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn">
+                            <!--<button type="button" class="layui-btn" lay-filter="spOption">
+                                <i class="layui-icon layui-icon-edit"></i>审核
+                            </button>-->
                             <button type="button" class="layui-btn" lay-filter="viewRwsBtn">
                                 <i class="layui-icon layui-icon-ok"></i>查看任务书
                             </button>
@@ -270,6 +273,7 @@
 
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn">
+
                             <button type="button" class="layui-btn" lay-filter="viewRwsBtn">
                                 <i class="layui-icon layui-icon-file"></i>查看任务书
                             </button>
@@ -286,6 +290,9 @@
             <!--其它信息结束-->
         </div>
     </div>
+    <div style="display: none">
+        <input type="hidden" th:value="${budgetapproval}" id="budgetapproval">
+    </div>
 </form>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
@@ -1273,6 +1280,46 @@
             });
         });
 
+        // 监听审核操作
+        $("button[lay-filter='spOption']").click(function () {
+            var budgetApproval = document.getElementById('budgetapproval').value;
+            var sqje = document.getElementById('sqje').value;
+
+            const regex = /(\w+)=(?:([^,"]*?)|("[^"]*?"))(?:,|$)/g;
+            let match;
+            const parsedData = {};
+            while ((match = regex.exec(budgetApproval)) !== null) {
+                const key = match[1];
+                const value = match[2] !== undefined ? match[2] : match[3];
+                parsedData[key] = value;
+            }
+
+/*            var iframeIndex = parent.layer.getFrameIndex(window.name);
+            parent.layer.close(iframeIndex); // 关闭当前弹框*/
+
+            var content = AjaxUtil.ctx + 'staBudgetapproval/forApproveAdd';
+            if (parsedData.spzt !== "未提交") {
+                content = AjaxUtil.ctx + 'staBudgetapproval/forApproveUpdate/' + parsedData.id + '/' + sqje + '?spzt=' + parsedData.spzt;
+            }
+
+            console.log("打开新弹框的内容：" + content); // 调试信息，确保 content 的值正确
+
+            layer.open({
+                title: '审批意见',
+                type: 2,
+                shade: 0.3,
+                maxmin: true,
+                shadeClose: true,
+                area: ['1025px', layerheight + 'px'],
+                content: content,
+                end: function (index) {
+                    if (updateflag == 1) {
+                        currTable.reload();
+                    }
+                    updateflag = 0;
+                }
+            });
+        });
         // 监听查看年度预算按钮
         $("button[lay-filter='viewNdysBtn']").click(function () {
             var index = parent.layer.open({

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -166,38 +166,7 @@
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
                 </button>
-                <!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="reimburse">-->
-                <!--                    <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>报账-->
-                <!--                </button>-->
-                <!--                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">-->
-                <!--                    <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废-->
-                <!--                </button>-->
-                <!--                                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
-                <!--                                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出-->
-                <!--                                </button>-->
-                <!--                else if (obj.event === 'exportExcel') {  // 监听查看操作-->
-                <!--                var projects = table.cache["currentTableId"];-->
-                <!--                if (projects.length == 0)-->
-                <!--                return;-->
-
-                <!--                var checkStatus = table.checkStatus('currentTableId')-->
-                <!--                , data = checkStatus.data;-->
-                <!--                if (data == null || data.length === 0) {-->
-                <!--                Message.warning("请选择要导出的费用申请！", 1500);-->
-                <!--                } else if (data.length > 1) {-->
-                <!--                Message.warning("请选择一条记录进行导出！", 1500)-->
-                <!--                } else {-->
-                <!--                layer.confirm('是否确定导出费用申请——'+data[0].zwmc+'？', {-->
-                <!--                btn: ['导出', '取消']-->
-                <!--                }, function(index, layero){-->
-                <!--                window.location.href=AjaxUtil.ctx + "staBudgetapproval/exportWord/" + data[0].id;-->
-                <!--                layer.close(index);-->
-
-                <!--                }, function(index){-->
-
-                <!--                });-->
-                <!--                }-->
-                <!--                }-->
+
             </div>
         </script>
 
@@ -625,7 +594,6 @@
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
-
                 var checkStatus = table.checkStatus('currentTableId')
                     , data = checkStatus.data;
                 if (data == null || data.length === 0) {