修改部分页面逻辑

src/main/java/com/liang/common/fileupload/controller/FileUploadController.java

@@ -216,6 +216,7 @@ public class FileUploadController extends BaseController {
     public void exportWord(HttpServletResponse response) throws Exception {
         // 加载模板文件
         InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template.docx");
+
         XWPFDocument document = new XWPFDocument(OPCPackage.open(inputStream));
 
         // 填充占位符

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

@@ -77,10 +77,23 @@ public class LsUserController {
 
     @RequestMapping(value = "/forAdd", method = RequestMethod.GET)
     public String forAdd(Model model) {
+
         List<Map<String, String>> xlList = baseEducationService.getEducationList();
+
         model.addAttribute("xlList", xlList);
+
         return "lsuserinfo/add";
     }
+
+    @RequestMapping(value = "/edit/{id}",method = RequestMethod.GET)
+    public String forEdit(@PathVariable Integer id){
+
+
+        return "lsuserinfo/add";
+
+    }
+
+
     /**
      * 保存数据
      * @param sysLsUserEntity

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

@@ -17,12 +17,6 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">公司/单位</label>
-                            <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" name="dwmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 40px">姓名</label>
                             <div class="layui-input-inline">
@@ -52,9 +46,9 @@
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
                 </button>
-                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
+<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
                     <i class="layui-icon layui-icon-set" style="font-size: 10px;"></i>查看
-                </button>
+                </button>-->
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                 </button>
@@ -101,16 +95,18 @@
             cols: [
                 [
                     {type: "checkbox", width: '3%', fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'id', width: '8%', title: '临时人员ID', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'name', width: '7%',title: '姓名', align: 'left'},
                     {field: 'xb', width: '5%', title: '性别', align: 'left'},
+                    {field: 'dept', width: '8%', title: '部门', align: 'center'},
                     {field: 'sfzh', width: '10%', title: '身份证号', align: 'left'},
                     {field: 'phone', width: '10%', title: '手机号', align: 'left'},
                     {field: 'ygzed', width: '5%', title: '月工资', align: 'left'},
                     {field: 'byxy', width: '10%', title: '毕业院校', align: 'left'},
                     {field: 'zy', width: '10%', title: '专业', align: 'left'},
                     {field: 'xl', width: '10%', title: '学历', align: 'left'},
+                    {field: 'st',width: '10%',title: '聘用周期(年)',align: 'center'},
+                    {field: 'terminal',width: '15%',title: '合同到期时间',align: 'center'},
                     {field: 'gznr', width: '20%', title: '工作内容', align: 'left'}
                 ]
             ],
@@ -195,13 +191,12 @@
                         shade: 0.2,
                         maxmin: true,
                         area: ['1000px', layerheight + 'px'],
-                        content: AjaxUtil.ctx + 'lsUser/up/' + data[0].id,
+                        content: AjaxUtil.ctx + 'lsUser/edit/'+data[0].id,
                         end: function (index) {
                             // 重载表格
                             if(updateflag == 1)
                                 currTable.reload();
                             updateflag = 0;
-                            layer.close(index);
                         }
                     });
                 }

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

@@ -1274,6 +1274,7 @@
 //年度预算总和
 
                     document.getElementById('rwsys').value = result.data.sum;
+
                     document.getElementById('rwsys2').value = result.data.sum;
                 }
             });
@@ -1729,6 +1730,8 @@
                     }
                 }
 
+
+
                 //更新父节点的值
                 for (var j = 0; j < dataBudget.length; j++) {
                     if (fj == dataBudget[j].bm)
@@ -1776,6 +1779,8 @@
                             dataBudget[j].dw10 = dw10.toFixed(2);
 
                         var ysje = dw1 + dw2 + dw3 + dw4 + dw5 + dw6 + dw7 + dw8 + dw9 + dw10;
+
+
                         if(ysje == 0) {
                             dataBudget[j].ysje = "";
                         }
@@ -1818,11 +1823,14 @@
         }
         // 监听确认按钮（项目预算）
         $("button[lay-filter='saveBtn5']").click(function()  {
+
             if(xmId == -1) {
                 Message.error("请先创建项目任务书，然后再填写项目预算",2000);
             } else{
                 var data = insTb5.options.data;
+                console.log(data[3].value);
                 var budgets = new Array();
+
                 for(var i = 0; i < data.length; i++) {
                     getBudget(budgets, data[i]);
                 }

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

@@ -230,15 +230,6 @@
                     {field: 'xmlxmc', width: '10%', title: '项目类型'},
                     {field: 'fylbmc', width: '7%', title: '费用类别'},
                     {field: 'sqje', width: '7%', title: '申请金额(元)'},
-                    // {
-                    //     field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
-                    //         if (1 == d.sfbyj) {
-                    //             return '<span class="layui-badge layui-bg-blue">是</span>';
-                    //         } else {
-                    //             return '<span class="layui-badge layui-bg-orange">否</span>';
-                    //         }
-                    //     }
-                    // },
                     {field: 'sqrxm', width: '5%', title: '申请人'},
                     {field: 'dkyfzrxm', width: '8%', title: '电科院负责人'},
                     {field: 'ssbmmc', width: '8%', title: '所属部门'},
@@ -677,7 +668,7 @@
     });
 
         //双击
-        table.on('rowDouble(currentTableFilter)', function (obj) {
+           , function (obj) {
             var data = obj.data;
             layer.open({
                 title: '浏览费用申请',
@@ -693,6 +684,8 @@
             });
         });
     });
+    // 监听表格选框事件
+    table.on
 
     function setUpdateFlag() {
         updateflag = 1;

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

@@ -68,29 +68,39 @@
 
 <script type="text/javascript" th:inline="javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
+
+
     layui.use(['form', 'tableSelect'], function () {
         var form = layui.form;
-
         var dcysInput = document.getElementById('dcys');
         var dycsInput = document.getElementById('dycs');
         var hjInput = document.getElementById('hj');
-
         dcysInput.addEventListener('input', updateHj);
         dycsInput.addEventListener('input', updateHj);
         var dcysValue;
         var dycsValue;
+
         function updateHj() {
-            dcysValue = parseFloat(dcysInput.value) || 0;
-            dycsValue = parseFloat(dycsInput.value) || 0;
+            var dcysValue = parseFloat(document.getElementById('dcys').value) || 0;
+            var dycsValue = parseFloat(document.getElementById('dycs').value) || 0;
+            var dcfyValue = parseFloat($("#dcfy").val()) || 0; // 获取当前选中的单页费用
+            if(dcysValue > 0 && dycsValue > 0 && dcfyValue > 0) {
+                $("#hj").val(dcysValue * dycsValue * dcfyValue); // 计算并更新合计值
+            }
         }
 
-        form.on('select(dcfy)',function (data){
-            if(dcysValue!=undefined&&dycsValue!=undefined){
-                $("#hj").val(dcysValue * dycsValue * data.value);
-  /*              hjInput.value = dcysValue * dycsValue * data.value;*/
-            }
-        })
 
+        form.on('select(dcfy)', function(data) {
+            var dcysValue = document.getElementById('dcys').value;
+            var dycsValue = document.getElementById('dycs').value;
+            if (!dcysValue || !dycsValue) {
+                alert("请先填写单册页数和打印册数！");
+                this.value = ''; // 重置下拉框的选中项
+                form.render('select'); // 重新渲染select
+            } else {
+                updateHj(); // 更新合计值
+            }
+        });
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {
@@ -105,6 +115,9 @@
             var iframeIndex = parent.layer.getFrameIndex(window.name);
             parent.layer.close(iframeIndex);
         });
+
+
+
     });
 </script>
 </body>

target/classes/templates/lsuserinfo/list.html

@@ -17,12 +17,6 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">公司/单位</label>
-                            <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" name="dwmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 40px">姓名</label>
                             <div class="layui-input-inline">
@@ -52,9 +46,9 @@
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
                 </button>
-                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
+<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
                     <i class="layui-icon layui-icon-set" style="font-size: 10px;"></i>查看
-                </button>
+                </button>-->
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                 </button>
@@ -101,16 +95,18 @@
             cols: [
                 [
                     {type: "checkbox", width: '3%', fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'id', width: '8%', title: '临时人员ID', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'name', width: '7%',title: '姓名', align: 'left'},
                     {field: 'xb', width: '5%', title: '性别', align: 'left'},
+                    {field: 'dept', width: '8%', title: '部门', align: 'center'},
                     {field: 'sfzh', width: '10%', title: '身份证号', align: 'left'},
                     {field: 'phone', width: '10%', title: '手机号', align: 'left'},
                     {field: 'ygzed', width: '5%', title: '月工资', align: 'left'},
                     {field: 'byxy', width: '10%', title: '毕业院校', align: 'left'},
                     {field: 'zy', width: '10%', title: '专业', align: 'left'},
                     {field: 'xl', width: '10%', title: '学历', align: 'left'},
+                    {field: 'st',width: '10%',title: '聘用周期(年)',align: 'center'},
+                    {field: 'terminal',width: '15%',title: '合同到期时间',align: 'center'},
                     {field: 'gznr', width: '20%', title: '工作内容', align: 'left'}
                 ]
             ],
@@ -195,13 +191,12 @@
                         shade: 0.2,
                         maxmin: true,
                         area: ['1000px', layerheight + 'px'],
-                        content: AjaxUtil.ctx + 'lsUser/up/' + data[0].id,
+                        content: AjaxUtil.ctx + 'lsUser/edit/'+data[0].id,
                         end: function (index) {
                             // 重载表格
                             if(updateflag == 1)
                                 currTable.reload();
                             updateflag = 0;
-                            layer.close(index);
                         }
                     });
                 }

target/classes/templates/prjproject/add.html

@@ -1274,6 +1274,7 @@
 //年度预算总和
 
                     document.getElementById('rwsys').value = result.data.sum;
+
                     document.getElementById('rwsys2').value = result.data.sum;
                 }
             });
@@ -1729,6 +1730,8 @@
                     }
                 }
 
+
+
                 //更新父节点的值
                 for (var j = 0; j < dataBudget.length; j++) {
                     if (fj == dataBudget[j].bm)
@@ -1776,6 +1779,8 @@
                             dataBudget[j].dw10 = dw10.toFixed(2);
 
                         var ysje = dw1 + dw2 + dw3 + dw4 + dw5 + dw6 + dw7 + dw8 + dw9 + dw10;
+
+
                         if(ysje == 0) {
                             dataBudget[j].ysje = "";
                         }
@@ -1818,11 +1823,14 @@
         }
         // 监听确认按钮（项目预算）
         $("button[lay-filter='saveBtn5']").click(function()  {
+
             if(xmId == -1) {
                 Message.error("请先创建项目任务书，然后再填写项目预算",2000);
             } else{
                 var data = insTb5.options.data;
+                console.log(data[3].value);
                 var budgets = new Array();
+
                 for(var i = 0; i < data.length; i++) {
                     getBudget(budgets, data[i]);
                 }

target/classes/templates/prjproject/list.html

@@ -223,7 +223,7 @@
             });
         });
 
-        if(userId != 119){
+        if(userId != 40){
             document.getElementById("myButton").style.display = 'none';
         }
 
@@ -488,10 +488,6 @@
                 }
             }
             else if(obj.event == 'backSpacing'){
-                // 这段代码尝试从Layui表格组件的缓存中获取名为"currentTableId"的表格中的数据，
-                // 并将这些数据存储在变量project中。然后，它检查这个project数组的长度是否为0，
-                // 即是否没有数据（或没有选中的行）。
-                // 如果没有数据，代码执行return;语句，意味着如果没有选中任何项目（或表格为空），则不执行任何后续操作。
 
                 var project = table.cache["currentTableId"];
                 if (project.length == 0){
@@ -532,6 +528,7 @@
 
             }
             else if (obj.event === 'downloadWord') {  // 监听查看操作
+
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;

target/classes/templates/stafeemanage/list_approving.html

@@ -132,7 +132,7 @@
 <!--                </button>-->
             </div>
         </script>
-        <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
+       <!-- <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">-->
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
     </div>
 </div>

target/classes/templates/staprintingfee/add.html

@@ -79,8 +79,8 @@
         dycsInput.addEventListener('input', updateHj);
         var dcysValue;
         var dycsValue;
-        function updateHj() {
 
+        function updateHj() {
             var dcysValue = parseFloat(document.getElementById('dcys').value) || 0;
             var dycsValue = parseFloat(document.getElementById('dycs').value) || 0;
             var dcfyValue = parseFloat($("#dcfy").val()) || 0; // 获取当前选中的单页费用
@@ -89,7 +89,7 @@
             }
         }
 
-        
+
         form.on('select(dcfy)', function(data) {
             var dcysValue = document.getElementById('dcys').value;
             var dycsValue = document.getElementById('dycs').value;