报账页面修复

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

@@ -287,10 +287,17 @@ public class StaBudgetapprovalController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/doAddApply", method = RequestMethod.POST)
     public BaseResult doAddApply(StaBudgetapproval budgetapproval) {
+        PrjProject project = prjProjectDao.queryById(budgetapproval.getXmid());
         budgetapproval.setSqrxm(getSysUserInfo().getName());
         budgetapproval.setSqr(getSysUserId());
         budgetapproval.setSfth(0);
         budgetapproval.setSfbz(false);
+        budgetapproval.setSsbm(project.getSsbm());
+        budgetapproval.setSsbmmc(project.getSsbmmc());
+        budgetapproval.setErpbh(project.getErpbh());
+        budgetapproval.setXmlx(project.getXmlx());
+        budgetapproval.setXmlxmc(project.getXmlxmc());
+        budgetapproval.setDkyfzr(String.valueOf(project.getDkyfzr()));
         int num = staBudgetapprovalService.insert(budgetapproval);
         if (num > 0) {
             return BaseResult.success("费用申请成功!", budgetapproval);

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

@@ -209,5 +209,6 @@ public class StaBudgetapproval implements Serializable {
     private Double sl;
 
     private Double byjbzze;
+
 }
 

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

@@ -63,9 +63,9 @@
                 <input type="number" id="sf" name="sf" class="layui-input" readonly lay-verify="required" placeholder="不含税金额不能为空!">
             </div>
         </div>
-        <div class="layui-form-item layui-inline" style="width: 100%">
+        <div class="layui-form-item layui-inline" style="width: 100%"  id="hiddenDiv">
             <label class="layui-form-label required" style="width: 140px">合同</label>
-            <div class="layui-input-inline" style="width: 250px">
+            <div class="layui-input-inline" style="width:25%"  >
                 <input type="hidden" id="htmc" name="htmc" class="layui-input" lay-verify="required"
                        lay-reqtext="合同名称不能为空">
                 <input type="hidden" id="htes" name="htes" class="layui-input">
@@ -81,29 +81,33 @@
                 <p style="color: red;">注:报账金额可以超过当前申请金额，但不能超出当前年度出资额!!</p>
             </div>
         </div>
-     <!--   <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
-        </div>
-        <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -30px">
-            <div class="layuimini-container">
-                <div class="layui-btn-group" style="margin-bottom: -8px">
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subAdd"><i
-                            class="layui-icon"></i>新建
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subEdit"><i
-                            class="layui-icon"></i>编辑
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView"><i
-                            class="layui-icon">&#xe63c;</i>查看
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subDelete"><i
-                            class="layui-icon"></i>删除
-                    </button>
+
+        <div id="cl">
+            <div class="layui-form-item" >
+                <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
+            </div>
+            <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -30px">
+                <div class="layuimini-container">
+                    <div class="layui-btn-group" style="margin-bottom: 0.5%">
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subAdd"><i
+                                class="layui-icon"></i>新建
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subEdit"><i
+                                class="layui-icon"></i>编辑
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView"><i
+                                class="layui-icon">&#xe63c;</i>查看
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subDelete"><i
+                                class="layui-icon"></i>删除
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
+                           style="padding-top: 0px;margin-top: 0px"></table>
                 </div>
-                <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
-                       style="padding-top: 0px;margin-top: 0px"></table>
             </div>
-        </div>-->
+        </div>
+
         <div class="layui-form-item">
             <label class="layui-form-label" style="width: 70px">报销凭证</label>
         </div>
@@ -163,6 +167,28 @@
         var zbzje;
         var bzId = -1;
 
+        setTimeout(function() {
+            // 在这里可以进行您的加载操作
+            layer.msg('加载完成！', { icon: 1 });
+            var fylbmc = document.getElementById('fylbmc').value;
+            var clDiv = document.getElementById('cl'); // 获取 div
+            console.log(fylbmc);
+            if ( fylbmc == '（1）外委研究支出费' || fylbmc == '（3）外协测试试验与加工费'){
+                hiddenDiv.style.display = 'block';
+            }else {
+                hiddenDiv.style.display = 'none';
+            }
+            if (fylbmc == '（3）会议、差旅及国际合作交流费'){
+                clDiv.style.display = 'block';
+            }else {
+                console.log('进来了')
+                clDiv.style.display = 'none';
+            }
+            return  false;
+            // 隐藏加载信息
+
+        }, 100); // 2000
+
         $("#slval").blur(function () {
             // 输入框失去焦点
             if ($("#bzje").val() != '') {
@@ -174,6 +200,8 @@
                 $("#sf").val((bzje - bhsje).toFixed(2));
             }
         });
+
+
         //监听税率
         form.on('select(sl)', function (data) {
             if ($("#bzje").val() != '') {
@@ -186,6 +214,7 @@
             }
         });
 
+
         // 用于存放验收资料文件
         var dataBxpz = new Array();
 

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

@@ -199,13 +199,10 @@
                     {type: 'numbers', fixed: 'left',title: '序号'},
                     {field: 'spzt', width: '10%',title: '审批状态',fixed: 'left'},
                     {field: 'xmmc', width: '20%', title: '项目名称', fixed: 'left'},
-
                     {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
-
                     {field: 'bh', width: '10%',title: '科研编号'},
                     {field: 'nf',title: '年份',width: '10%'},
-                    {
-                        field: 'sfbyjs', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
+                    {field: 'sfbyjs', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
                             if (1 == d.sfbyjs) {
                                 return '<span class="layui-badge layui-bg-blue">是</span>';
                             } else {
@@ -221,8 +218,6 @@
                     {field: 'sqrxm', width: '7%', title: '申请人'},
                     {field: 'cjsj', width: '8%', title: '创建时间', align: 'center'},
                     {field: 'fysqmc', title: '费用申请',width: '25%'}
-
-
                 ]
             ],
             autoSort: false,

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

@@ -64,29 +64,33 @@
                 <input type="number" id="sf" name="sf" class="layui-input" th:value="${reimbursement.sf}" readonly lay-verify="required" placeholder="税费不能为空！">
             </div>
         </div>
-<!--        <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
-        </div>
-        <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -30px">
-            <div class="layuimini-container">
-                <div class="layui-btn-group" style="margin-bottom: -8px">
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subAdd"><i
-                            class="layui-icon"></i>新建
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subEdit"><i
-                            class="layui-icon"></i>编辑
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView"><i
-                            class="layui-icon">&#xe63c;</i>查看
-                    </button>
-                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subDelete"><i
-                            class="layui-icon"></i>删除
-                    </button>
+
+        <div id="cl">
+            <div class="layui-form-item">
+                <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
+            </div>
+            <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -30px">
+                <div class="layuimini-container">
+                    <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subAdd"><i
+                                class="layui-icon"></i>新建
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subEdit"><i
+                                class="layui-icon"></i>编辑
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView"><i
+                                class="layui-icon">&#xe63c;</i>查看
+                        </button>
+                        <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subDelete"><i
+                                class="layui-icon"></i>删除
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
+                           style="padding-top: 0px;margin-top: 0px"></table>
                 </div>
-                <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
-                       style="padding-top: 0px;margin-top: 0px"></table>
             </div>
-        </div>-->
+
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label" style="width: 70px">报销凭证</label>
         </div>
@@ -150,6 +154,29 @@
         // if ($("#slval").val() != null && $("slval").val() != "")
         //     set_select('sl', $("#slval").val());
         // 监听输入框失去焦点
+
+
+        setTimeout(function() {
+            // 在这里可以进行您的加载操作
+            layer.msg('加载完成！', { icon: 1 });
+            var fylbmc = document.getElementById('fylbmc').value;
+            var clDiv = document.getElementById('cl'); // 获取 div
+            console.log(fylbmc);
+/*            if ( fylbmc == '（1）外委研究支出费' || fylbmc == '（3）外协测试试验与加工费'){
+                hiddenDiv.style.display = 'block';
+            }else {
+                hiddenDiv.style.display = 'none';
+            }*/
+            if (fylbmc == '（3）会议、差旅及国际合作交流费'){
+                clDiv.style.display = 'block';
+            }else {
+                console.log('进来了')
+                clDiv.style.display = 'none';
+            }
+            return  false;
+            // 隐藏加载信息
+
+        }, 100);
         $("#slval").blur(function () {
             // 输入框失去焦点
             if ($("#bzje").val() != '') {

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

@@ -59,12 +59,15 @@
                 <input type="number" id="sf" name="sf" class="layui-input" th:value="${reimbursement.sf}" readonly>
             </div>
         </div>
-        <div class="layui-form-item" style="margin-bottom: -20px">
-            <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
-        </div>
-        <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -20px">
-            <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
-                   style="padding-top: 0px;margin-top: 0px"></table>
+        <div id="cl">
+            <div class="layui-form-item" style="margin-bottom: -20px">
+                <label class="layui-form-label" style="width: 110px">实际花费差旅费</label>
+            </div>
+            <div class="layui-form-item" style="margin-left: 20px; margin-right: 20px; margin-top: -20px">
+                <table class="layui-hide" id="currentTableId1" name="currentTableId1" lay-filter="currentTableFilter1"
+                       style="padding-top: 0px;margin-top: 0px"></table>
+            </div>
+
         </div>
         <div class="layui-row" style="margin-bottom: -20px">
             <div class="layui-col-md6">
@@ -118,6 +121,28 @@
                 dataExpense = result.data.rows;
             }
         });
+
+        setTimeout(function() {
+            // 在这里可以进行您的加载操作
+            layer.msg('加载完成！', { icon: 1 });
+            var fylbmc = document.getElementById('fylbmc').value;
+            var clDiv = document.getElementById('cl'); // 获取 div
+            console.log(fylbmc);
+            /*            if ( fylbmc == '（1）外委研究支出费' || fylbmc == '（3）外协测试试验与加工费'){
+                            hiddenDiv.style.display = 'block';
+                        }else {
+                            hiddenDiv.style.display = 'none';
+                        }*/
+            if (fylbmc == '（3）会议、差旅及国际合作交流费'){
+                clDiv.style.display = 'block';
+            }else {
+                console.log('进来了')
+                clDiv.style.display = 'none';
+            }
+            return  false;
+            // 隐藏加载信息
+
+        }, 100);
         //差旅费
         var currTable1 = table.render({
             elem: '#currentTableId1',

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

@@ -373,9 +373,9 @@
             // defaultToolbar: ['filter', 'print'],
             cols: [
                 [
-                    {type: 'radio', title: '😊',align:'center',fixed: 'left'},
-                    {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
-                    {field: 'xmmc', width: '20%', title: '项目名称'},
+                    {type: "checkbox", fixed: 'left',title: '😊'},
+                    {type: 'numbers', fixed: 'left',title: '序号'},
+                    {field: 'xmmc', width: '15%', title: '项目名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
                     {field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
                             if (1 == d.sfbyj) {
@@ -415,7 +415,7 @@
             },
             done: function (res, curr, count) { // done为数据渲染完的回调
 
-                if (res.data && Array.isArray(res.data)) {
+                /*if (res.data && Array.isArray(res.data)) {
                     for (let i = 0; i < res.data.length; i++) {
                         console.log(res.data[i]);
                         if (res.data[i].sfth==1){
@@ -424,8 +424,10 @@
                         }
                     }
                 } else {
-                }
-            }        });
+
+                }*/
+            }
+        });
 
         // 监听搜索操作
         form.on('submit(data-search-btn)', function (data) {