瀏覽代碼

年度预算页面查看任务书可以最大最小化

梁世豪 10 月之前
父節點
當前提交
afe00c38d1

+ 3 - 1
src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -203,7 +203,8 @@ public class PrjAnnualbudgetController extends BaseController {
203 203
                              @RequestParam(required = false, defaultValue = "", value = "rwsmc") String rwsmc,
204 204
                              @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
205 205
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
206
-                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
206
+                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
207
+                             @RequestParam(required = false, defaultValue = "", value = "add") String add) {
207 208
         SysUserInfo userInfo = getSysUserInfo();
208 209
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
209 210
         String post = "";
@@ -230,6 +231,7 @@ public class PrjAnnualbudgetController extends BaseController {
230 231
         paraMap.put("spzt", spzt);
231 232
         paraMap.put("rwsmc", rwsmc);
232 233
         paraMap.put("nf", nf);
234
+        paraMap.put("add",add);
233 235
 
234 236
         if (!userInfo.getAccount().equals("admin")) {
235 237
             if (!"过".equals(post)) {

+ 0 - 1
src/main/resources/templates/annualbudget/add_apply.html

@@ -441,7 +441,6 @@
441 441
                 </div>
442 442
             </div>
443 443
 
444
-</form>
445 444
 </div>
446 445
 <!--常规结束-->
447 446
 <!--其它信息开始-->

File diff suppressed because it is too large
+ 4213 - 0
src/main/resources/templates/stabudgetapproval/add.html


+ 217 - 0
src/main/resources/templates/stabudgetapproval/list_annualbudget.html

@@ -0,0 +1,217 @@
1
+<!DOCTYPE html>
2
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
3
+<head>
4
+  <meta charset="UTF-8">
5
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
+  <title>年度预算列表</title>
7
+  <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
8
+  <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
9
+  <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
10
+</head>
11
+<body>
12
+<div class="layuimini-container">
13
+  <div class="layuimini-main" style="margin-bottom: -30px">
14
+    <fieldset class="table-search-fieldset">
15
+      <legend>搜索信息(<b>收起-展开</b>)</legend>
16
+      <div id="search-div" style="margin: 5px 10px -10px 0px">
17
+        <form class="layui-form" action="" lay-filter="search-form">
18
+          <div class="layui-form-item">
19
+            <div class="layui-inline" style="margin-left: -10px">
20
+              <label class="layui-form-label" style="width: 60px">项目名称</label>
21
+              <div class="layui-input-inline" style="width: 200px">
22
+                <input type="text" id="mc" name="xmmc" autocomplete="off" class="layui-input">
23
+              </div>
24
+            </div>
25
+            <div class="layui-inline" style="margin-left: -10px">
26
+              <label class="layui-form-label" style="width: 60px">ERP编号</label>
27
+              <div class="layui-input-inline" style="width: 150px">
28
+                <input type="text" name="erpbh" autocomplete="off" class="layui-input">
29
+              </div>
30
+            </div>
31
+            <div class="layui-inline" style="margin-left: -10px">
32
+              <label class="layui-form-label" style="width: 60px">年份</label>
33
+              <div class="layui-input-inline" style="width: 150px">
34
+                <input type="text" name="nf" autocomplete="off" class="layui-input">
35
+              </div>
36
+            </div>
37
+            <div class="layui-inline" style="margin-left: -10px">
38
+              <label class="layui-form-label" style="width: 60px">项目类型</label>
39
+              <div class="layui-input-inline" style="width: 150px">
40
+                <select name="xmlx" id="xmlx" lay-filter="status">
41
+                  <option value="">全部</option>
42
+                  <option th:each="item:${xmlxList}" th:text="${item.name}"
43
+                          th:value="${item.code}"></option>
44
+                </select>
45
+              </div>
46
+            </div>
47
+            <div class="layui-inline">
48
+              <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
49
+                      class="layui-icon"></i> 搜 索
50
+              </button>
51
+              <button type="submit" class="layui-btn layui-btn-primary" lay-submit
52
+                      lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
53
+              </button>
54
+            </div>
55
+          </div>
56
+        </form>
57
+      </div>
58
+    </fieldset>
59
+    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
60
+
61
+    <!-- 右侧悬浮按钮 -->
62
+    <div class="layui-form layuimini-form">
63
+      <div class="right-bottom-btn">
64
+        <button class="layui-btn" lay-filter="selectBtn">
65
+          <i class="layui-icon layui-icon-ok"></i>选择
66
+        </button>
67
+        <button class="layui-btn" lay-filter="cancleBtn">
68
+          <i class="layui-icon layui-icon-close"></i>取消
69
+        </button>
70
+      </div>
71
+    </div>
72
+  </div>
73
+</div>
74
+<script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
75
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
76
+<script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
77
+<script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
78
+<script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
79
+<script th:inline="javascript" type="text/javascript">
80
+  AjaxUtil.ctx = /*[[@{/}]]*/'';
81
+  layui.use(['form', 'table'], function () {
82
+    var form = layui.form,
83
+            table = layui.table;
84
+    var project = null;
85
+    var currTable = table.render({
86
+      elem: '#currentTableId',
87
+      url: AjaxUtil.ctx + 'prjAnnualbudget/mylist',
88
+      method: 'post',
89
+      where:{
90
+        add: '1',
91
+      },
92
+      // toolbar: '#toolbarDemo',
93
+      // defaultToolbar: ['filter', 'exports', 'print'],
94
+      cols: [
95
+        [
96
+          {type: 'numbers'},
97
+          {field: 'xmmc', width: '30%', title: '项目名称'},
98
+          {field: 'mc', width: '30%', title: '年度预算名称'},
99
+          {field: 'erpbh', width: '13%', title: 'ERP编号'},
100
+          {field: 'xmlxmc', width: '18%', title: '项目类型'},
101
+          {field: 'nf', width: '10%', title: '年份'},
102
+          {field: 'xmfzrxm', width: '10%', title: '项目负责人'},
103
+        ]
104
+      ],
105
+      autoSort: false,
106
+      limits: [10, 15, 20, 25, 50, 100],
107
+      limit: 10,
108
+      page: true,
109
+      skin: 'grid',
110
+      parseData: function (res) { //res 即为原始返回的数据
111
+        return {
112
+          "code": res.code, //解析接口状态
113
+          "msg": res.message, //解析提示文本
114
+          "count": res.data.total, //解析数据长度
115
+          "data": res.data.rows //解析数据列表
116
+        };
117
+      },
118
+      done: function (res, curr, count) { // done为数据渲染完的回调
119
+        // 测试打印出后端返回的权限列表
120
+        // let permissionSet = [[${permissionSet}]];
121
+        // console.log(JSON.stringify(permissionSet));
122
+      }
123
+    });
124
+
125
+    // 监听搜索操作
126
+    form.on('submit(data-search-btn)', function (data) {
127
+      // 执行搜索重载
128
+      currTable.reload({
129
+        page: {
130
+          curr: 1 // 页码从1开始
131
+        },
132
+        where: form.val("search-form")
133
+      });
134
+      return false;
135
+    });
136
+
137
+    // 监听重置操作
138
+    form.on('submit(data-reset-btn)', function (data) {
139
+      form.val("search-form", {
140
+        "xmmc": '',
141
+        "erpbh": '',
142
+        "xmlx": '',
143
+        "nf":''
144
+      });
145
+      // 执行搜索重载
146
+      currTable.reload({
147
+        page: {
148
+          curr: 1
149
+        },
150
+        where: form.val("search-form")
151
+      });
152
+      return false;
153
+    });
154
+
155
+    //监听行选中
156
+    table.on('row(currentTableFilter)', function (obj) {
157
+      annualbudget = obj.data;
158
+      obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
159
+      localStorage.setItem("ysid", annualbudget.id);
160
+      localStorage.setItem("xmid", annualbudget.rws);
161
+      localStorage.setItem("nf", annualbudget.nf);
162
+      localStorage.setItem("xmmc", annualbudget.mc == null ? '' : annualbudget.mc);
163
+      localStorage.setItem("erpbh", annualbudget.erpbh == null ? '' : annualbudget.erpbh);
164
+      localStorage.setItem("xmlx", annualbudget.xmlx == null ? '' : annualbudget.xmlx);
165
+      localStorage.setItem("xmlxmc", annualbudget.xmlxmc == null ? '' : annualbudget.xmlxmc);
166
+      localStorage.setItem("xmfzr", annualbudget.xmfzr == null ? '' : annualbudget.xmfzr);
167
+      localStorage.setItem("xmfzrxm", annualbudget.dkyfzrxm == null ? '' : annualbudget.dkyfzrxm);
168
+      localStorage.setItem("ssbm", annualbudget.ssbm == null ? '' : annualbudget.ssbm);
169
+      localStorage.setItem("ssbmmc", annualbudget.ssbmmc == null ? '' : annualbudget.ssbmmc);
170
+      localStorage.setItem("annualbudget",annualbudget.dkyfzr == null ? '' :  annualbudget.dkyfzr);
171
+    });
172
+
173
+    //双击
174
+    table.on('rowDouble(currentTableFilter)', function (obj) {
175
+      project = obj.data;
176
+      obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
177
+
178
+      localStorage.setItem("ysid", annualbudget.id);
179
+      localStorage.setItem("xmid", annualbudget.rws);
180
+      localStorage.setItem("nf", annualbudget.nf);
181
+      localStorage.setItem("xmmc", annualbudget.mc == null ? '' : annualbudget.mc);
182
+      localStorage.setItem("erpbh", annualbudget.erpbh == null ? '' : annualbudget.erpbh);
183
+      localStorage.setItem("xmlx", annualbudget.xmlx == null ? '' : annualbudget.xmlx);
184
+      localStorage.setItem("xmlxmc", annualbudget.xmlxmc == null ? '' : annualbudget.xmlxmc);
185
+      localStorage.setItem("xmfzr", annualbudget.xmfzr == null ? '' : annualbudget.xmfzr);
186
+      localStorage.setItem("xmfzrxm", annualbudget.dkyfzrxm == null ? '' : annualbudget.dkyfzrxm);
187
+      localStorage.setItem("ssbm", annualbudget.ssbm == null ? '' : annualbudget.ssbm);
188
+      localStorage.setItem("ssbmmc", annualbudget.ssbmmc == null ? '' : annualbudget.ssbmmc);
189
+      localStorage.setItem("annualbudget",annualbudget.dkyfzr == null ? '' :  annualbudget.dkyfzr);
190
+      localStorage.setItem("updateflag", "1");
191
+
192
+
193
+      parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
194
+    });
195
+
196
+    // 监听选择按钮
197
+    $("button[lay-filter='selectBtn']").click(function () {
198
+      if (annualbudget == null) {
199
+        Message.warning("请选择年度预算", 1000);
200
+        return;
201
+      }
202
+      localStorage.setItem("updateflag", "1");
203
+
204
+      parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
205
+    });
206
+
207
+    // 监听取消按钮
208
+    $("button[lay-filter='cancleBtn']").click(function () {
209
+      localStorage.setItem("xmid", '');
210
+      localStorage.setItem("updateflag", "0");
211
+      var iframeIndex = parent.layer.getFrameIndex(window.name);
212
+      parent.layer.close(iframeIndex);
213
+    });
214
+  });
215
+</script>
216
+</body>
217
+</html>

+ 4 - 4
src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -120,9 +120,9 @@
120 120
 
121 121
         <script type="text/html" id="toolbarDemo">
122 122
             <div class="layui-btn-container">
123
-                <!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add">-->
124
-                <!--                    <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新建-->
125
-                <!--                </button>-->
123
+                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add">
124
+                    <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新建
125
+                </button>
126 126
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit">
127 127
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
128 128
                 </button>
@@ -313,7 +313,7 @@
313 313
                     shade: 0.3,
314 314
                     maxmin: true,
315 315
                     area: ['1020px', layerheight + 'px'],
316
-                    content: AjaxUtil.ctx + 'staBudgetapproval/forApplyAdd',
316
+                    content: AjaxUtil.ctx + 'staBudgetapproval/forAdd',
317 317
                     end: function (index) {
318 318
                         // 重载表格
319 319
                         if (updateflag == 1)

+ 1 - 1
src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -1263,7 +1263,7 @@
1263 1263
                 title: '查看项目任务书',
1264 1264
                 type: 2,
1265 1265
                 shade: 0.3,
1266
-                // maxmin: true,
1266
+                maxmin: true,
1267 1267
                 shadeClose: true,
1268 1268
                 area: ['1100px', layerheight + 'px'],
1269 1269
                 content: AjaxUtil.ctx + 'prjProject/forView/' + xmId,