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

@@ -39,6 +39,7 @@ import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -248,6 +249,17 @@ public class LsUserController {
             // 开始解析这个文件
             List<List<String>> spreadsheetData = parseSpreadsheet(file.getInputStream(), fileExtension);
             System.out.println(spreadsheetData);
+            // 循环比较 spreadsheetData 中的 长度 是否与 各个元素相等
+            for (int i = 0;i<spreadsheetData.size();i++){
+                SysLsUserEntity sysLsUserEntity = new SysLsUserEntity();
+                if (spreadsheetData.get(i).size()!= spreadsheetData.get(0).size()){
+                    sysLsUserEntity.setXm(String.valueOf(i+1));
+                    sysLsUserEntity.setXmfzr("请将第"+(i+1)+"条数据补充完整");
+                    lists.add(sysLsUserEntity);
+                    spreadsheetData.remove(i);
+                }
+                continue;
+            }
             spreadsheetData.remove(0);
             List<SysLsUserEntity> list = new ArrayList<>();
             for (List<String> row : spreadsheetData) {
@@ -262,12 +274,11 @@ public class LsUserController {
                 employee.setZy(row.get(6));
                 employee.setQpsj(dateUtil.convertDate(row.get(7)));
                 employee.setDqsj(dateUtil.convertDate(row.get(8)));
+                System.out.println(row.get(9));
                 employee.setGznr(row.get(9));
                 // 将对象添加到列表中
                 list.add(employee);
             }
-            System.out.println(list);
-
             for(int i = 0; i<list.size();i++){
                 SysLsUserEntity sysLsUserEntity = new SysLsUserEntity();
                 // 校验合同起始时间和到期时间是否在三个月 内
@@ -302,18 +313,20 @@ public class LsUserController {
                Integer mum = lsUserService.saveOperLog(list.get(i));
                if (mum > 0){
                    h++;
-                   continue;
+                   // 循环比较 spreadsheetData 中的 长度 是否与 各个元素相等
                }
             }
         }catch (Exception a){
             a.printStackTrace();
+            h++;
         }
-
         // 获取文件名后缀
         if (h == 0){
             return BaseResult.failure(43,"成员录入失败,人员已存在！");
         }
         return BaseResult.success("成员录入成功",lists);
+
+
     }
     private List<List<String>> parseSpreadsheet(InputStream inputStream, String fileExtension) throws IOException {
         Workbook workbook = null;

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

@@ -12,6 +12,7 @@ import com.liang.common.exception.CustomException;
 import com.liang.entity.*;
 import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +21,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -116,6 +118,44 @@ public class StaBudgetapprovalController extends BaseController {
         return "stabudgetapproval/list_apply";
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.POST)
+    public BaseResult exportExcel(@PathVariable String fromdata)throws Exception{
+        SysUserInfo userInfo = getSysUserInfo();
+        List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
+        ObjectMapper objectMapper = new ObjectMapper();
+        StaBudgetapproval formData = objectMapper.readValue(fromdata, StaBudgetapproval.class);
+        String post = "";
+        if (postName.size() > 0) {
+            for (int i = 0; i < postName.size(); i++) {
+                if ("科研专责".equals(postName.get(i))) {
+                    post = "过";
+                }
+            }
+        }
+
+        Map<String, Object> paraMap = new HashMap<>();
+        paraMap.put("sqmc", formData.getSqmc());
+        paraMap.put("sqr", formData.getSqr());
+        paraMap.put("fylb", formData.getFylb());
+        paraMap.put("erpbh", formData.getErpbh());
+        paraMap.put("spzt", formData.getSpzt());
+        paraMap.put("bh", formData.getBh());
+        paraMap.put("xmlx", formData.getXmlx());
+        paraMap.put("ssbmmc",formData.getSsbmmc());
+        paraMap.put("dkyfzr",formData.getDkyfzr());
+        paraMap.put("nf",formData.getNf());
+
+        if (!userInfo.getAccount().equals("admin")) {
+            if (!"过".equals(post)) {
+                paraMap.put("userId", userInfo.getUserId().toString());
+            }
+        }
+        List<StaBudgetapproval> list = staBudgetapprovalService.getFysqList(paraMap);
+
+        return BaseResult.success("导出完成！",list);
+    }
+
     /**
      * 费用申请列
      *
@@ -1421,9 +1461,12 @@ public class StaBudgetapprovalController extends BaseController {
      */
     @ResponseBody
     @PostMapping("/unassociated/{fromdata}")
-    public BaseResult unassociated(@PathVariable String fromdata) {
+    public BaseResult unassociated(@PathVariable String fromdata,
+                                   @RequestParam("page") Integer pageNum,
+                                   @RequestParam("limit") Integer pageSize) {
 
         try {
+            PageHelper.startPage(pageNum,pageSize);
             ObjectMapper objectMapper = new ObjectMapper();
             FormData formData = objectMapper.readValue(fromdata, FormData.class);
             Map<String, String> map = new HashMap<>();

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
-import com.liang.entity.StaIntellectualProperty;
 import com.liang.entity.StaMeetingFee;
 import com.liang.service.StaMeetingFeeService;
 import org.springframework.data.domain.Page;

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

@@ -1,5 +1,6 @@
 package com.liang.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
@@ -180,7 +181,12 @@ public class StaPrintingFeeController extends BaseController {
     //印刷费用全部及条件查询
     @ResponseBody
     @RequestMapping(value = "/searchData", method = RequestMethod.POST)
-    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "MC") String mc, @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq, @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
+    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "MC") String mc,
+                                 @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
+                                 @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq,
+                                 @RequestParam("page") Integer pageNum,
+                                 @RequestParam("limit") Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
         List<HashMap<String, Object>> staFeasibilityreport = staPrintingFeeService.searchPrintingCost(mc, qsrq, jzrq);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();

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

@@ -186,8 +186,8 @@ public class StaSourceFeeController extends BaseController {
                                  @RequestParam(required = false, defaultValue = "", value = "CBS") String cbs,
                                  @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
                                  @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
-        List<HashMap<String, Object>> staFeasibilityreport = staSourceFeeService.searchSourceCost(mc, tsmc, cbs, qsrq, jzrq);
         PageHelper.startPage(pageNum, pageSize);
+        List<HashMap<String, Object>> staFeasibilityreport = staSourceFeeService.searchSourceCost(mc, tsmc, cbs, qsrq, jzrq);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();

src/main/resources/mapper/LsUserDao.xml

@@ -53,7 +53,6 @@
                 ,XB
                 ,SFZH
                 ,PHONE
-
                 ,BYXX
                 ,ZY
                 ,XL
@@ -75,7 +74,6 @@
                 ,#{xb}
                 ,#{sfzh}
                 ,#{phone}
-
                 ,#{byxy}
                 ,#{zy}
                 ,#{xl}

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

@@ -16,34 +16,33 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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-form-item" style="display: flex; align-items: center; gap: 10px;">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 40px">姓名</label>
+                            <label class="layui-form-label" style="width: 40px;">姓名</label>
                             <div class="layui-input-inline">
                                 <input type="text" name="xm" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <div class="layui-inline">
-                                <label class="layui-form-label " style="width: 40px;">学历</label>
+                                <label class="layui-form-label" style="width: 40px;">学历</label>
                                 <div class="layui-input-inline" style="width: 130px;">
                                     <select name="xl" id="xl" lay-search>
                                         <option value="">请选择</option>
-                                        <option th:each="item:${xlList}" th:text="${item.name}"
-                                                th:value="${item.name}"></option>
+                                        <option th:each="item:${xlList}" th:text="${item.name}" th:value="${item.name}"></option>
                                     </select>
                                 </div>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 80px">身份证号</label>
+                            <label class="layui-form-label" style="width: 80px;">身份证号</label>
                             <div class="layui-input-inline">
                                 <input type="text" name="sfzh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <div class="layui-inline">
-                                <label class="layui-form-label " style="width: 40px;">状态</label>
+                                <label class="layui-form-label" style="width: 40px;">状态</label>
                                 <div class="layui-input-inline" style="width: 130px;">
                                     <select name="zt" id="zt">
                                         <option value="">[请选择]</option>
@@ -53,16 +52,17 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-inline" style="margin-left: 0px">
+                        <div class="layui-inline" style="margin-left: 0px;">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
-                                <i class="layui-icon"></i> 搜 索
+                                <i class="layui-icon">&#xe615;</i> 搜索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn">
-                                <i class="layui-icon layui-icon-refresh"></i> 重 置
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重置
                             </button>
                         </div>
                     </div>
+
+
                 </form>
             </div>
         </fieldset>

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

@@ -152,9 +152,9 @@
                 <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>-->
+                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
+                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出
+                </button>
             </div>
         </script>
 
@@ -221,34 +221,14 @@
                     {field: 'bh', width: '8%', title: '编号'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
-                    // {field: 'xmmc', width: '20%', 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: 'fylbmc', width: '8%', title: '费用类别'},
                     {field: 'sqje', width: '10%', title: '申请金额(元)'},
-                    // {field: 'sfbz', width: '7%', title: '是否报账', align: 'center', templet: function (d) {
-                    //         if (1 == d.sfbz) {
-                    //             return '<span class="layui-badge layui-bg-blue">是</span>';
-                    //         } else {
-                    //             return '<span class="layui-badge layui-bg-orange">否</span>';
-                    //         }
-                    //     }
-                    // },
-                    // {field: 'bzje', width: '10%', title: '报账金额(元)'},
                     {field: 'sqrxm', width: '8%', title: '申请人', align: 'center'},
                     {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'},
                     {field: 'xmlxmc', width: '11%', title: '项目类型'},
                     {field: 'nf', width: '5%', title: '年份', align: 'center'},
                     {field: 'dkyfzrxm', width: '8%', title: '电科院负责人'},
                     {field: 'ssbmmc', width: '8%', title: '所属部门'}
-                    // {field: 'fj', width: '6%', title: '附件'},
-                    // {title: '操作', toolbar: '#currentTableBar', width: '15%', align: 'center', fixed: 'right'}
                 ]
             ],
             autoSort: false,
@@ -696,6 +676,22 @@
                         });
                     });
                 }
+            }else if (obj.event==='exportExcel'){  // 使用 layui 获取表单数据
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + "staBudgetapproval/exportExcel/" + formDataString,
+                    contentType: "application/json",
+                    success: function (res) {
+                        table.exportFile('currentTableId', res.data, 'xlsx');
+                    },
+                    error: function (error) {
+
+
+                    }
+                });
+                console.log('进来了');
             }
         });
 

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

@@ -23,67 +23,65 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.name}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">专家姓名</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="ZJXM" name="ZJXM" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">职称</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="ZC" name="ZC" class="layui-input" autocomplete="off"/>
+                        <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">
+                            </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">
                             </div>
                         </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">专家姓名</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="ZJXM" name="ZJXM" class="layui-input" autocomplete="off"/>
                             </div>
                         </div>
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
 
                         <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                            <label class="layui-form-label" style="width: 80px">职称</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="ZC" name="ZC" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -23,36 +23,56 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </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">
+                            </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">
+                            </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">
+                            </div>
+                        </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>
+
                 </form>
             </div>
         </fieldset>

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

@@ -23,69 +23,76 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">产权类别</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="CQLB" name="CQLB" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">名称</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="MC" name="MC" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">委托机构</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="WTJG" name="WTJG" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
+                    </div>
 
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px; margin-left: 20px">产权类别</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="CQLB" name="CQLB" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="MC" name="MC" class="layui-input" autocomplete="off"/>
                             </div>
                         </div>
 
                         <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                            <label class="layui-form-label" style="width: 80px">委托机构</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="WTJG" name="WTJG" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>
+
                 </form>
             </div>
         </fieldset>

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

@@ -23,66 +23,72 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">材料名称</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="CLMC" name="CLMC" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">物料编码</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="WLBM" name="WLBM" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">备注</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="BZ" name="BZ" class="layui-input" autocomplete="off"/>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 60px;">年度</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
                             </div>
                         </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">材料名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="CLMC" name="CLMC" class="layui-input" autocomplete="off"/>
                             </div>
                         </div>
 
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">物料编码</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="WLBM" name="WLBM" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
 
                         <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                            <label class="layui-form-label" style="width: 60px">备注</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="BZ" name="BZ" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>会议费用</title>
+    <title>间接费</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -23,57 +23,58 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="erpbh" name="erpbh" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">会议地点</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="HYDD" name="HYDD" class="layui-input" autocomplete="off"/>
+                        <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">
                             </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">
+                            </div>
+                        </div>
+                    </div>
 
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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>
                             </div>
                         </div>
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
                         <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                            <label class="layui-form-label" style="width: 80px">会议地点</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="HYDD" name="HYDD" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -23,48 +23,56 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </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">
+                            </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">
+                            </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">
+                            </div>
+                        </div>
+                    </div>
 
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>
+
                 </form>
             </div>
         </fieldset>

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

@@ -23,33 +23,52 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </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">
+                            </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">
+                            </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">
+                            </div>
+                        </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -23,31 +23,52 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </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">
+                            </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">
+                            </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">
+                            </div>
+                        </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QS" id="QS" placeholder="开始日期" class="layui-input" readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="WC" id="WC" placeholder="结束日期" class="layui-input" readonly>
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -23,67 +23,67 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
+
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.name}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">图书名称</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="TSMC" name="TSMC" class="layui-input" autocomplete="off"/>
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">出版社</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="CBS" name="CBS" class="layui-input" autocomplete="off"/>
+                        <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">
                             </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">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-left: 20px">
+                            <label class="layui-form-label" style="width: 60px">图书名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="TSMC" name="TSMC" class="layui-input" autocomplete="off"/>
                             </div>
                         </div>
 
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <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="CBS" name="CBS" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -23,78 +23,76 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.name}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">临时人员姓名</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
-                                       autocomplete="off"/>
-                                <!--                                <input type="text" id="parentName" name="parentName"/>-->
-                                <!--                                <input type="hidden" id="parentId" name="parentId"/>-->
-                                <!--                                <input type="hidden" id="ancestors" name="ancestors"/>-->
+                        <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">
                             </div>
                         </div>
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">聘用日期</label>
+                        <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">
+                            </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">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
-                                       class="layui-input" readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="SQRQEnd" id="SQRQEnd" placeholder="结束日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">临时人员姓名</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
+                                       autocomplete="off"/>
                             </div>
                         </div>
-
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                            <label class="layui-form-label" style="width: 80px">聘用日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
+                                       class="layui-input" readonly>
                             </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"
+                                <input type="text" name="SQRQEnd" id="SQRQEnd" placeholder="结束日期" class="layui-input"
                                        readonly>
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>
+
+
                 </form>
             </div>
         </fieldset>

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

@@ -23,51 +23,58 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <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: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <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">
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">出差地点</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="CCDD" name="CCDD" class="layui-input" autocomplete="off"/>
+                        <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">
+                            </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">
+                            </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">
                             </div>
                         </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </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="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
-                        <!--                                            th:value="${item.code}"></option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
                         <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                            <label class="layui-form-label" style="width: 80px">出差地点</label>
+                            <div class="layui-input-inline" style="width: 140px">
+                                <input type="text" id="CCDD" name="CCDD" class="layui-input" autocomplete="off"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>

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

@@ -43,7 +43,7 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label " style="width: 70px">学历</label>
             <div class="layui-input-inline" style="width: 270px">
-                <input type="text" id="xl" name="xl" lay-verify="required" lay-reqtext="人员姓名不能为空" autocomplete="off" class="layui-input" disabled>
+                <input type="text" id="xl" name="xl" lay-verify="required" lay-reqtext="学历不能为空" autocomplete="off" class="layui-input" disabled>
                <!-- <select name="xl" id="xl" >
                     <option value="">请选择</option>
                     <option th:each="item:${xlList}" th:text="${item.name}" th:value="${item.name}"></option>