Home Explore Help
Register Sign In
ly
/
KYGK
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

梁世豪 5 months ago
parent
59c51bb48a 51356468bd
commit
7c5722e888
3 changed files with 114 additions and 6 deletions
Split View Show Diff Stats
  1. 1 0
      src/main/resources/mapper/PrjAnnualbudgetDao.xml
  2. 107 0
      src/main/resources/templates/basedict/file.html
  3. 6 6
      src/main/resources/templates/stabudgetapproval/update_apply.html

+ 1 - 0
src/main/resources/mapper/PrjAnnualbudgetDao.xml
View File 

@@ -382,6 +382,7 @@
382 382 
         AND bd.FJ = ''
383 383 
         WHERE
384 384 
         1 = 1
385 
+          and pf.DWMC like '%国网陕西省%'
385 386 
         <if test="deptName!= null and deptName != ''">
386 387 
             and(
387 388 
             <if test="deptName !='电源技术中心'">

+ 107 - 0
src/main/resources/templates/basedict/file.html
View File 

@@ -0,0 +1,107 @@
1 
+<!DOCTYPE html>
2 
+<html lang="en">
3 
+<head>
4 
+    <meta charset="UTF-8">
5 
+    <title>文件管理</title>
6 
+    <meta name="renderer" content="webkit">
7 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8 
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
9 
+    <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
10 
+    <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
11 
+</head>
12 
+<body>
13 
+<div class="layuimini-container">
14 
+    <div class="layuimini-main">
15 
+
16 
+        <fieldset class="table-search-fieldset">
17 
+            <legend>搜索信息(<b>收起-展开</b>)</legend>
18 
+            <div id="search-div" style="margin: 10px 10px 10px 10px">
19 
+                <form class="layui-form" action="" lay-filter="search-form">
20 
+                    <div class="layui-form-item">
21 
+                        <div class="layui-inline">
22 
+                            <label class="layui-form-label">文件名称</label>
23 
+                            <div class="layui-input-inline">
24 
+                                <input type="text" name="fileName" autocomplete="off" class="layui-input"
25 
+                                       placeholder="请输入文件名称">
26 
+                            </div>
27 
+                        </div>
28 
+                        <div class="layui-inline">
29 
+                            <label class="layui-form-label">年份</label>
30 
+                            <div class="layui-input-inline">
31 
+                                <input type="text" name="dictName" autocomplete="off" class="layui-input"
32 
+                                       placeholder="请输入字典名称">
33 
+                            </div>
34 
+                        </div>
35 
+                        <div class="layui-inline">
36 
+                            <label class="layui-form-label">状态：</label>
37 
+                            <div class="layui-input-inline">
38 
+                                <select name="status" id="status" lay-filter="status">
39 
+                                    <option value="">所有</option>
40 
+                                    <option th:each="item:${baseDictList}" th:text="${item.name}"
41 
+                                            th:value="${item.code}"></option>
42 
+                                </select>
43 
+                            </div>
44 
+                        </div>
45 
+
46 
+                        <div class="layui-inline">
47 
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
48 
+                                    class="layui-icon"></i> 搜 索
49 
+                            </button>
50 
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
51 
+                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
52 
+                            </button>
53 
+                        </div>
54 
+                    </div>
55 
+                </form>
56 
+            </div>
57 
+        </fieldset>
58 
+
59 
+        <script type="text/html" id="toolbarDemo">
60 
+            <div class="layui-btn-container">
61 
+                <button class="layui-btn layui-btn-sm" lay-event="add">
62 
+                    <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新增
63 
+                </button>
64 
+            </div>
65 
+        </script>
66 
+
67 
+        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
68 
+
69 
+        <script type="text/html" id="currentTableBar">
70 
+            <a class="layui-btn layui-btn-xs" lay-event="edit">
71 
+                <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
72 
+            </a>
73 
+            {{#  if(d.status == '0'){ }}
74 
+            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="forbid">
75 
+                <i class="layui-icon layui-icon-close" style="font-size: 10px;"></i>停用
76 
+            </a>
77 
+            {{#  } else { }}
78 
+            <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="enable">
79 
+                <i class="layui-icon layui-icon-play" style="font-size: 10px;"></i>启用
80 
+            </a>
81 
+            {{#  } }}
82 
+            <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete">
83 
+                <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
84 
+            </a>
85 
+        </script>
86 
+
87 
+        <script type="text/html" id="statusTpl">
88 
+            {{#  if(d.status == '0'){ }}
89 
+            <span class="layui-badge layui-bg-blue">正常</span>
90 
+            {{#  } else { }}
91 
+            <span class="layui-badge layui-bg-orange">禁用</span>
92 
+            {{#  } }}
93 
+        </script>
94 
+
95 
+    </div>
96 
+</div>
97 
+
98 
+<script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
99 
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
100 
+<script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
101 
+<script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
102 
+<script type="text/javascript" th:inline="javascript">
103 
+
104 
+
105 
+</script>
106 
+</body>
107 
+</html>

+ 6 - 6
src/main/resources/templates/stabudgetapproval/update_apply.html
View File 

@@ -932,7 +932,7 @@
932 932 
             cols: [
933 933 
                 [
934 934 
                     {type: "checkbox", align: 'center'},
935 
-                    {field: 'xh', title: '序号', width: '8%'},
935 
+                    {type: 'numbers', title: '序号', width: '8%'},
936 936 
                     {field: 'ccrxm', title: '出差人', width: '10%'},
937 937 
                     {field: 'ccdd', title: '出差地点', width: '18%'},
938 938 
                     {field: 'qsrq', title: '起始日期', width: '13%'},
 
@@ -1175,8 +1175,8 @@
1175 1175 
                     {field: 'xmjsrq',title: '项目结束时间',width: '18%'},
1176 1176 
                     {field: 'qsrq', title: '聘用起始时间', width: '15%'},
1177 1177 
                     {field: 'jsrq', title: '聘用截止时间', width: '15%'},
1178 
-                    {field: 'fysq', title: '费用申请', width: '15%'},
1179 
-                    {field: 'bzfy', title: '报账费用', width: '15%'},
1178 
+/*                    {field: 'fysq', title: '费用申请', width: '15%'},
1179 
+                    {field: 'bzfy', title: '报账费用', width: '15%'},*/
1180 1180 
                     {field: 'byxx', title: '毕业学校', width: '15%'},
1181 1181 
                     {field: 'zy', title: '专业', width: '15%'},
1182 1182 
                     {field: 'xl', title: '学历', width: '15%'},
 
@@ -1818,9 +1818,9 @@
1818 1818 
                     {type: "checkbox", align: 'center'},
1819 1819 
                     {type: 'numbers', align: 'center'},
1820 1820 
                     {field: 'zjxm', title: '专家姓名', width: '15%'},
1821 
-                    {field: 'sfzh', title: '身份证号', width: '15%'},
1821 
+                    {field: 'sfzh', title: '身份证号', width: '15%'},/*
1822 1822 
                     {field: 'fysq', title: '费用申请', width: '20%'},
1823 
-                    {field: 'bzfy', title: '报账费用', width: '14%'},
1823 
+                    {field: 'bzfy', title: '报账费用', width: '14%'},*/
1824 1824 
                     {field: 'zc', title: '职称', width: '14%'}
1825 1825 
                 ]
1826 1826 
             ],
 
@@ -2009,7 +2009,7 @@
2009 2009 
                     {type: "checkbox", align: 'center'},
2010 2010 
                     {type: 'numbers', align: 'center'},
2011 2011 
                     {field: 'hydd', title: '会议地点', width: '20%'},
2012 
-                    {field: 'fysq', title: '费用申请', width: '20%'},
2012 
+/*                    {field: 'fysq', title: '费用申请', width: '20%'},*/
2013 2013 
                     {field: 'bzfyh', title: '报账费用（含税）', width: '20%'},
2014 2014 
                     {field: 'bzfybh', title: '报账费用（不含税）', width: '20%'}
2015 2015 
                 ]