Browse Source

全部任务书页面添加查看修改申请,取消除首页外所有审批页面的批量审批功能

梁世豪 6 months ago
parent
commit
63a16cf37b

+ 33 - 0
src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -394,6 +394,39 @@ public class PrjApproverecordController extends BaseController {
394 394
 
395 395
         return BaseResult.success(result);
396 396
     }
397
+    /**
398
+     * 任务书修改申请列表
399
+     * */
400
+    @ResponseBody
401
+    @RequestMapping(value = "/rwsxgsqList", method = RequestMethod.POST)
402
+    public BaseResult rwsxgsqList(@RequestParam("page") Integer pageNum,
403
+                           @RequestParam("limit") Integer pageSize
404
+                            ) {
405
+        PageHelper.startPage(pageNum, pageSize);
406
+
407
+        Map<String, String> paraMap = new HashMap<>();
408
+        SysUserInfo userInfo = getSysUserInfo();
409
+        if (!userInfo.getAccount().equals("admin")) {
410
+            paraMap.put("userId", userInfo.getUserId().toString());
411
+        }
412
+            paraMap.put("tablename","prj_ProjectRecord");
413
+// 获取待审批的修改申请
414
+        List<PrjApproverecord> xglist = prjApproverecordService.getApproveList(paraMap);
415
+
416
+        for (int i = 0; i < xglist.size(); i++) {
417
+            xglist.get(i).setSpzt(xglist.get(i).getZt());
418
+        }
419
+
420
+        PageInfo<PrjApproverecord> pageinfo = new PageInfo<>(xglist);
421
+        //取出查询结果
422
+        List<PrjApproverecord> rows = pageinfo.getList();
423
+        int total = (int) pageinfo.getTotal();
424
+        Map<String, Object> result = new HashMap<>();
425
+        result.put(RESULT_ROWS, rows);
426
+        result.put(RESULT_TOTAL, total);
427
+
428
+        return BaseResult.success(result);
429
+    }
397 430
 
398 431
     /**
399 432
      * 保存数据(提交审批:可研报告,任务书,年度预算,报账)

+ 6 - 0
src/main/java/com/liang/controller/PrjProjectController.java

@@ -2550,6 +2550,12 @@ public class PrjProjectController extends BaseController {
2550 2550
         return BaseResult.failure(-1,"项目转移失败!");
2551 2551
     }
2552 2552
 
2553
+    @RequestMapping(value = "/ViewXGSQ", method = RequestMethod.GET)
2554
+    public String ViewXGSQ(Model model) {
2555
+
2556
+        return "prjproject/view_xgsq";
2557
+    }
2558
+
2553 2559
 
2554 2560
 }
2555 2561
 

+ 1 - 16
src/main/resources/templates/annualbudget/view_xgsq.html

@@ -173,22 +173,7 @@
173 173
         if (data == null || data.length === 0) {
174 174
           Message.warning("请选择要审批的记录!", 1500);
175 175
         } else if (data.length > 1) {
176
-          for (var index in data) {
177
-            bathSP(data[index])
178
-            if (index == (data.length - 1)) {
179
-              var tc = layer.alert('操作成功', function (index) {
180
-                // 执行搜索重载
181
-                currTable.reload({
182
-                  page: {
183
-                    curr: 1
184
-                  },
185
-                  where: form.val("search-form")
186
-                });
187
-                layer.close(tc);
188
-              });
189
-            }
190
-          }
191
-
176
+          Message.warning("请选择一条记录进行审核!", 1500);
192 177
         } else {
193 178
           var content = oneSP(data)
194 179
           layer.open({

+ 1 - 16
src/main/resources/templates/prjcontract/view_xgsq.html

@@ -236,22 +236,7 @@
236 236
       if (data == null || data.length === 0) {
237 237
         Message.warning("请选择要审批的记录!", 1500);
238 238
       } else if (data.length > 1) {
239
-        for (var index in data) {
240
-          bathSP(data[index])
241
-          if (index == (data.length - 1)) {
242
-            var tc = layer.alert('操作成功', function (index) {
243
-              // 执行搜索重载
244
-              currTable.reload({
245
-                page: {
246
-                  curr: 1
247
-                },
248
-                where: form.val("search-form")
249
-              });
250
-              layer.close(tc);
251
-            });
252
-          }
253
-        }
254
-
239
+        Message.warning("请选择一条记录进行审核!", 1500);
255 240
       } else {
256 241
         var content = oneSP(data)
257 242
         layer.open({

+ 18 - 2
src/main/resources/templates/prjproject/list.html

@@ -135,8 +135,11 @@
135 135
                         id="tbPrjAnnuaalbudget">
136 136
                     同步年度预算
137 137
                 </button>
138
-                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="Xgsq">
139
-                    <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>修改申请
138
+<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="Xgsq">-->
139
+<!--                    <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>修改申请-->
140
+<!--                </button>-->
141
+                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="viewXgsq">
142
+                    <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看修改申请
140 143
                 </button>
141 144
                 <button class="layui-btn layui-btn-sm layui-btn-checked" lay-event="xmzy" id="zy" style="display: none">
142 145
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>项目转移
@@ -818,6 +821,19 @@
818 821
                     });
819 822
 
820 823
                 }
824
+            }else  if (obj.event ="viewXgsq"){
825
+                var index = layer.open({
826
+                    title: '修改申请',
827
+                    type: 2,
828
+                    shade: 0.3,
829
+                    maxmin: true,
830
+                    shadeClose: true,
831
+                    area: ['1300px', layerheight + 'px'],
832
+                    content:  AjaxUtil.ctx+ "prjProject/ViewXGSQ",
833
+                    end: function () {
834
+                        layer.close(index);
835
+                    }
836
+                });
821 837
             }
822 838
 
823 839
         });

+ 298 - 0
src/main/resources/templates/prjproject/view_xgsq.html

@@ -0,0 +1,298 @@
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">
14
+    <script type="text/html" id="toolbarDemo">
15
+      <div class="layui-btn-container">
16
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
17
+          <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
18
+        </button>
19
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
20
+          <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
21
+        </button>
22
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
23
+          <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
24
+        </button>
25
+        <!--                <button class="layui-btn layui-btn-sm" lay-event="exportList">-->
26
+        <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
27
+        <!--                </button>-->
28
+      </div>
29
+    </script>
30
+
31
+    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
32
+
33
+  </div>
34
+</div>
35
+<script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
36
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
37
+<script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
38
+<script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
39
+<script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
40
+<script th:inline="javascript" type="text/javascript">
41
+  AjaxUtil.ctx = /*[[@{/}]]*/'';
42
+  var updateflag = 0;
43
+  var xmApproval = {};
44
+  layui.use(['form', 'table'], function () {
45
+    var form = layui.form,
46
+            table = layui.table;
47
+
48
+    var currTable = table.render({
49
+      elem: '#currentTableId',
50
+      url: AjaxUtil.ctx + 'prjApproverecord/rwsxgsqList',
51
+      method: 'post',
52
+      toolbar: '#toolbarDemo',
53
+      defaultToolbar: ['filter', 'exports', 'print'],
54
+      cols: [
55
+        [
56
+          {type: "checkbox", fixed: 'left'},
57
+          {type: 'numbers', align: 'center'},
58
+          {field: 'spzt', width: '12%', title: '审批状态', sort: true},
59
+          {field: 'xmlxmc', width: '10%', title: '类型', sort: true},
60
+          {field: 'xm', width: '35%', title: '项目/申请', sort: true},
61
+          // {field: 'zt', width: '12%',title: '状态', sort: true},
62
+          {field: 'tjrxm', width: '8%', title: '提交人', align: 'center'},
63
+          {field: 'tjsj', width: '12%', title: '提交时间', align: 'center'}
64
+          // {title: '操作', toolbar: '#currentTableBar', align: 'center', fixed: 'right'}
65
+        ]
66
+      ],
67
+      sortName: 'xm',
68
+      autoSort: false,
69
+      limits: [10, 15, 20, 25, 50, 100],
70
+      limit: 10,
71
+      page: true,
72
+      skin: 'grid',
73
+      parseData: function (res) { //res 即为原始返回的数据
74
+        return {
75
+          "code": res.code, //解析接口状态
76
+          "msg": res.message, //解析提示文本
77
+          "count": res.data.total, //解析数据长度
78
+          "data": res.data.rows //解析数据列表
79
+        };
80
+      },
81
+      done: function (res, curr, count) { // done为数据渲染完的回调
82
+        // 测试打印出后端返回的权限列表
83
+        // let permissionSet = [[${permissionSet}]];
84
+        // console.log(JSON.stringify(permissionSet));
85
+      }
86
+    });
87
+
88
+    // 监听搜索操作
89
+    form.on('submit(data-search-btn)', function (data) {
90
+      // 执行搜索重载
91
+      currTable.reload({
92
+        page: {
93
+          curr: 1 // 页码从1开始
94
+        },
95
+        where: form.val("search-form")
96
+      });
97
+      return false;
98
+    });
99
+
100
+    // 监听重置操作
101
+    form.on('submit(data-reset-btn)', function (data) {
102
+      form.val("search-form", {
103
+        "xm": '',
104
+        "erpbh": '',
105
+        "xmlx": '',
106
+        "spzt": '',
107
+        "tablename":''
108
+      });
109
+      // 执行搜索重载
110
+      currTable.reload({
111
+        page: {
112
+          curr: 1
113
+        },
114
+        where: form.val("search-form")
115
+      });
116
+      return false;
117
+    });
118
+
119
+    // 监听排序事件
120
+    table.on('sort(currentTableFilter)', function (obj) { //注:sort 是工具条事件名,test 是 table 原始容器的属性 lay-filter="对应的值"
121
+      currTable.reload({
122
+        initSort: obj, //记录初始排序,如果不设的话,将无法标记表头的排序状态。
123
+        where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
124
+          sortName: toLine(obj.field), //排序字段
125
+          sortOrder: toLine(obj.type) //排序方式
126
+        }
127
+      });
128
+    });
129
+
130
+    // 监听行工具事件
131
+    table.on('toolbar(currentTableFilter)', function (obj) {
132
+      if (obj.event == 'view') {
133
+        var projects = table.cache["currentTableId"];
134
+        if (projects.length == 0)
135
+          return;
136
+
137
+        var checkStatus = table.checkStatus('currentTableId')
138
+                , data = checkStatus.data;
139
+        if (data == null || data.length === 0) {
140
+          Message.warning("请选择要查看的记录!", 1500);
141
+        } else if (data.length > 1) {
142
+          Message.warning("请选择一条记录进行查看!", 1500);
143
+        } else {
144
+          var height = 1090;
145
+          var title = '查看' + data[0].xmlxmc;
146
+          var content = AjaxUtil.ctx;
147
+          if (data[0].tablename == 'prj_ProjectRecord') {
148
+            content += 'prjBudgetRecord/forView/' + data[0].xmid;
149
+          }
150
+          layer.open({
151
+            title: title,
152
+            type: 2,
153
+            shade: 0.3,
154
+            maxmin: true,
155
+            shadeClose: true,
156
+            area: [height + 'px', layerheight + 'px'],
157
+            content: content,
158
+            end: function (index) {
159
+              layer.close(index);
160
+            }
161
+          });
162
+        }
163
+      } else if (obj.event === 'spOption') {
164
+        var projects = table.cache["currentTableId"];
165
+        if (projects.length == 0)
166
+          return;
167
+
168
+        var checkStatus = table.checkStatus('currentTableId')
169
+                , data = checkStatus.data;
170
+        if (data == null || data.length === 0) {
171
+          Message.warning("请选择要审批的记录!", 1500);
172
+        } else if (data.length > 1) {
173
+          Message.warning("请选择一条记录进行审核!", 1500);
174
+        } else {
175
+          var content = oneSP(data)
176
+          layer.open({
177
+            title: '审批意见',
178
+            type: 2,
179
+            shade: 0.3,
180
+            maxmin: true,
181
+            shadeClose: true,
182
+            area: ['1025px', layerheight + 'px'],
183
+            content: content,
184
+            end: function () {
185
+              if (updateflag == 1)
186
+                currTable.reload();
187
+              updateflag = 0;
188
+            }
189
+          });
190
+        }
191
+      } else if (obj.event === 'spList') {
192
+        var projects = table.cache["currentTableId"];
193
+        if (projects.length == 0)
194
+          return;
195
+
196
+        var checkStatus = table.checkStatus('currentTableId')
197
+                , data = checkStatus.data;
198
+        if (data == null || data.length === 0) {
199
+          Message.warning("请选择要查看的记录!", 1500);
200
+        } else if (data.length > 1) {
201
+          Message.warning("请选择一条记录进行查看!", 1500);
202
+        } else {
203
+          xmApproval = {
204
+            "xmid": data[0].xmid,
205
+            "xm": data[0].xm
206
+          };
207
+
208
+          var content = AjaxUtil.ctx;
209
+         if (data[0].tablename == 'prj_ProjectRecord')
210
+            content += 'prjBudgetRecord';
211
+          content += '/forApproveList?mc=' + data[0].xm;
212
+
213
+          var index = layer.open({
214
+            title: '审批列表',
215
+            type: 2,
216
+            shade: 0.3,
217
+            maxmin: true,
218
+            shadeClose: true,
219
+            area: ['1090px', '750px'],
220
+            content: content,
221
+            end: function () {
222
+              layer.close(index);
223
+            }
224
+          });
225
+        }
226
+      }
227
+    });
228
+
229
+    //双击
230
+    table.on('rowDouble(currentTableFilter)', function (obj) {
231
+      var projects = table.cache["currentTableId"];
232
+      if (projects.length == 0)
233
+        return;
234
+
235
+      var checkStatus = table.checkStatus('currentTableId')
236
+              , data = checkStatus.data;
237
+      if (data == null || data.length === 0) {
238
+        Message.warning("请选择要审批的记录!", 1500);
239
+      } else if (data.length > 1) {
240
+        for (var index in data) {
241
+          bathSP(data[index])
242
+          if (index == (data.length - 1)) {
243
+            var tc = layer.alert('操作成功', function (index) {
244
+              // 执行搜索重载
245
+              currTable.reload({
246
+                page: {
247
+                  curr: 1
248
+                },
249
+                where: form.val("search-form")
250
+              });
251
+              layer.close(tc);
252
+            });
253
+          }
254
+        }
255
+
256
+      } else {
257
+        var content = oneSP(data)
258
+        layer.open({
259
+          title: '审批意见',
260
+          type: 2,
261
+          shade: 0.3,
262
+          maxmin: true,
263
+          shadeClose: true,
264
+          area: ['1025px', layerheight + 'px'],
265
+          content: content,
266
+          end: function () {
267
+            if (updateflag == 1)
268
+              currTable.reload();
269
+            updateflag = 0;
270
+          }
271
+        });
272
+      }
273
+    });
274
+  });
275
+
276
+  function oneSP(data) {
277
+    var content = AjaxUtil.ctx;
278
+     if (data[0].tablename == 'prj_ProjectRecord') {
279
+      xmApproval = {
280
+        "xmid": data[0].xmid,
281
+        "xm": data[0].xm,
282
+        "ysje": data[0].rysje
283
+      };
284
+      content += 'prjBudgetRecord/forApproveUpdate/' + data[0].xmid + '/' + data[0].rysje + '?spzt=' + data[0].spzt;
285
+    }
286
+    return content;
287
+  }
288
+
289
+  function setUpdateFlag() {
290
+    updateflag = 1;
291
+  }
292
+
293
+  function getXmApproval() {
294
+    return xmApproval;
295
+  }
296
+</script>
297
+</body>
298
+</html>