ソースを参照

任务书审批修复

ly 4 ヶ月 前
コミット
66175e6895

+ 2 - 7
src/main/java/com/liang/controller/PrjProjectController.java

@@ -815,9 +815,9 @@ public class PrjProjectController extends BaseController {
815 815
         paraMap1.put("zt", spzt);
816 816
         paraMap1.put("wc", "0");
817 817
         List<PrjApproverecord> approveList = prjApproverecordService.getApproveByXmId(paraMap1);
818
-        if (approveList.size() > 0)
818
+        if (approveList.size() > 0) {
819 819
             model.addAttribute("approveInfo", approveList.get(approveList.size() - 1));
820
-        else {
820
+        }else {
821 821
             PrjProject project = prjProjectService.queryById(xmid);
822 822
             PrjApproverecord approveInfo = new PrjApproverecord();
823 823
             approveInfo.setXmid(xmid);
@@ -825,11 +825,6 @@ public class PrjProjectController extends BaseController {
825 825
             approveInfo.setZt("数据不匹配");
826 826
             model.addAttribute("approveInfo", approveInfo);
827 827
         }
828
-
829
-//        List<CyyEntriy> cyyList =cyyService.queryByAccount(String.valueOf(userInfo.getUserId()));
830
-//        model.addAttribute("cyyList", cyyList);
831
-
832
-
833 828
         if (spzt.contains("未提交")) {
834 829
             Map<String, String> paraMap2 = new HashMap<>();
835 830
             paraMap2.put("postName", PostInfoEnum.KYJHZZ.postName());

+ 6 - 6
src/main/resources/templates/payapply/adds.html

@@ -23,7 +23,7 @@
23 23
                        lay-reqtext="任务书不能为空">
24 24
                 <input type="hidden" id="rwsmc" name="rwsmc" class="layui-input">
25 25
                 <select name="ysrws" id="ysrws" lay-filter="ysrws">
26
-                    <option value="">[无]</option>
26
+                    <option value="">-- 情选择年度预算 --</option>
27 27
                     <option value="-1">[浏览]</option>
28 28
                 </select>
29 29
             </div>
@@ -34,7 +34,7 @@
34 34
                 <input type="hidden" id="fjmc" name="fjmc" class="layui-input">
35 35
                 <input type="hidden" id="fylb" name="fylb" class="layui-input">
36 36
                 <input type="text" id="fylbmc" name="fylbmc" lay-verify="required"
37
-                       lay-reqtext="费用类别不能为空" class="layui-input" readonly>
37
+                       lay-reqtext="费用类别不能为空" class="layui-input" placeholder="请选择费用类别..." readonly>
38 38
             </div>
39 39
         </div>
40 40
         <div class="layui-form-item layui-inline" style="width: 100%">
@@ -44,26 +44,26 @@
44 44
                        lay-reqtext="合同名称不能为空">
45 45
                 <input type="hidden" id="htes" name="htes" class="layui-input">
46 46
                 <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空" lay-search=“”>
47
-                    <option value="">-- 请选择 --</option>
47
+                    <option value="">-- 请选择合同 --</option>
48 48
                     <option value="-1">[浏览]</option>
49 49
                  </select>
50 50
             </div>
51 51
             <label class="layui-form-label required" style="width: 10%">合同金额(万元)</label>
52 52
             <div class="layui-input-inline" style="width: 25%">
53 53
                 <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required"
54
-                       lay-reqtext="合同金额不能为空" autocomplete="off" readonly>
54
+                       lay-reqtext="合同金额不能为空" autocomplete="off" placeholder="请填入合同金额..." readonly>
55 55
             </div>
56 56
         </div>
57 57
         <div class="layui-form-item layui-inline" style="width: 100%">
58 58
             <label class="layui-form-label required" style="width: 15%">付款计划</label>
59 59
             <div class="layui-input-inline" style="width: 30%">
60 60
                 <select name="fkjh" id="fkjh" lay-filter="fkjh" lay-verify="required" lay-reqtext="付款计划不能为空">
61
-                    <option value="">-- 请选择 --</option>
61
+                    <option value="">-- 请选择合同,再选择付款计划 --</option>
62 62
                 </select>
63 63
             </div>
64 64
             <label class="layui-form-label required" style="width: 10%;">本次付款金额(万元)</label>
65 65
             <div class="layui-input-inline" style="width: 25%">
66
-                <input type="number" id="bcfkje" name="bcfkje" class="layui-input" lay-verify="required" lay-affix="number"
66
+                <input type="number" id="bcfkje" name="bcfkje" class="layui-input" lay-verify="required" lay-affix="number" placeholder="请填入本次付款金额..."
67 67
                        lay-reqtext="本次付款金额不能为空" autocomplete="off">
68 68
             </div>
69 69
         </div>

+ 9 - 6
src/main/resources/templates/prjcontract/add.html

@@ -31,7 +31,7 @@
31 31
                                 <input type="hidden" id="rws" name="rws" class="layui-input" lay-verify="required" lay-reqtext="任务书不能为空">
32 32
                                 <input type="hidden" id="rwsmc" name="rwsmc" class="layui-input">
33 33
                                 <select name="ysrws" id="ysrws" lay-filter="ysrws">
34
-                                    <option value="">[无]</option>
34
+                                    <option value="">-- 请选择任务书 --</option>
35 35
                                     <option value="-1">[浏览]</option>
36 36
                                 </select>
37 37
                             </div>
@@ -41,22 +41,22 @@
41 41
                             <label class="layui-form-label required" style="width: 10%">合同名称</label>
42 42
                             <div class="layui-input-inline" style="width: 25%">
43 43
                                 <input type="hidden" id="id" name="id" class="layui-input">
44
-                                <input type="text" id="htmc" name="htmc" lay-verify="required" lay-reqtext="合同名称不能为空" autocomplete="off" class="layui-input">
44
+                                <input type="text" id="htmc" name="htmc" lay-verify="required" lay-reqtext="合同名称不能为空" autocomplete="off" class="layui-input" placeholder="请填入合同名称...">
45 45
                             </div>
46 46
                             <label class="layui-form-label required" style="width: 15%">合同金额(万元)</label>
47 47
                             <div class="layui-input-inline" style="width: 35%">
48
-                                <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required" lay-reqtext="合同金额不能为空" autocomplete="off">
48
+                                <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required" lay-reqtext="合同金额不能为空" autocomplete="off" placeholder="请填入合同金额...">
49 49
                             </div>
50 50
                         </div>
51 51
 
52 52
                         <div class="layui-form-item layui-inline" style="width: 100%">
53 53
                             <label class="layui-form-label required" style="width: 10%">招标批次</label>
54 54
                             <div class="layui-input-inline" style="width: 25%">
55
-                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空!">
55
+                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空!" placeholder="请填入招标批次...">
56 56
                             </div>
57 57
                             <label class="layui-form-label  " style="width: 15%">中选单位</label>
58 58
                             <div class="layui-input-inline" style="width: 35%">
59
-                                <input type="text" id="zxdw" name="zxdw" class="layui-input"
59
+                                <input type="text" id="zxdw" name="zxdw" class="layui-input" placeholder="请填入中选单位..."
60 60
                                        autocomplete="off">
61 61
                             </div>
62 62
                         </div>
@@ -72,10 +72,13 @@
72 72
                                 <input type="text" name="jssj" id="jssj" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空" readonly>
73 73
                             </div>
74 74
                         </div>
75
+                        <div class="layui-form-item layui-inline" style="width: 100%">
76
+                            <p style="width: 100%;margin-left: 10%;color: red">注:请注意,合同周期务必处于项目周期的时间范围之内。</p>
77
+                        </div>
75 78
                         <div class="layui-form-item layui-inline" style="width: 100%">
76 79
                             <label class="layui-form-label required" style="width: 10%">验收时间</label>
77 80
                             <div class="layui-input-inline" style="width: 25%">
78
-                                <input type="text" id="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空!">
81
+                                <input type="text" id="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空!" placeholder="请选择验收时间...">
79 82
                             </div>
80 83
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
81 84
                             <div class="layui-input-inline" style="width: 10%">

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

@@ -524,7 +524,7 @@
524 524
                     var content = AjaxUtil.ctx + 'prjProject/forApproveAdd';
525 525
                     if (data[0].spzt != "未提交")
526 526
                         // content = AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '?spzt=' + data[0].spzt;
527
-                        content = AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt;
527
+                        content = AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].jf + '?spzt=' + data[0].spzt;
528 528
 
529 529
                     layer.open({
530 530
                         title: '提交审批',
@@ -583,7 +583,7 @@
583 583
                                     maxmin: true,
584 584
                                     shadeClose: true,
585 585
                                     area: ['1025px', layerheight + 'px'],
586
-                                    content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
586
+                                    content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].jf + '?spzt=' + data[0].spzt,
587 587
                                     end: function (index) {
588 588
                                         if (updateflag == 1)
589 589
                                             currTable.reload();

+ 3 - 3
src/main/resources/templates/reportinfo/add.html

@@ -180,7 +180,7 @@
180 180
                         <label class="layui-form-label" style="width: 90px">目的和意义</label>
181 181
                         <div class="layui-input-inline" style="width: 85%">
182 182
                             <textarea id="mdhyywb" name="mdhyywb" class="layui-textarea"
183
-                                      style="width: 100%;height: 339px" placeholder="请输入..."></textarea>
183
+                                      style="width: 100%;height: 339px" placeholder="请填入目的和意义..."></textarea>
184 184
                             <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容,如果包含图片,请下载模板编辑后上传,并清空当前编辑框</label>
185 185
                         </div>
186 186
                     </div>
@@ -227,7 +227,7 @@
227 227
                     <div class="layui-form-item">
228 228
                         <label class="layui-form-label" style="width: 90px">研究水平</label>
229 229
                         <div class="layui-input-inline" style="width: 85%">
230
-                            <textarea id="gnwyjspzswb" name="gnwyjspzswb" class="layui-textarea"
230
+                            <textarea id="gnwyjspzswb" name="gnwyjspzswb" class="layui-textarea" placeholder="请填入研究水平..."
231 231
                                       style="width: 100%;height: 339px"></textarea>
232 232
                             <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容,如果包含图片,请下载模板编辑后上传,并清空当前编辑框</label>
233 233
                         </div>
@@ -275,7 +275,7 @@
275 275
                     <div class="layui-form-item">
276 276
                         <label class="layui-form-label" style="width: 90px">理论实践依据</label>
277 277
                         <div class="layui-input-inline" style="width: 85%">
278
-                            <textarea id="xmdllhsjyjwb" name="xmdllhsjyjwb" class="layui-textarea"
278
+                            <textarea id="xmdllhsjyjwb" name="xmdllhsjyjwb" class="layui-textarea" placeholder="请填入理论实际依据..."
279 279
                                       style="width: 100%;height: 339px"></textarea>
280 280
                             <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容,如果包含图片,请下载模板编辑后上传,并清空当前编辑框</label>
281 281
                         </div>