任务书审批修复

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

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

src/main/resources/templates/payapply/adds.html

@@ -23,7 +23,7 @@
                        lay-reqtext="任务书不能为空">
                 <input type="hidden" id="rwsmc" name="rwsmc" class="layui-input">
                 <select name="ysrws" id="ysrws" lay-filter="ysrws">
-                    <option value="">[无]</option>
+                    <option value="">-- 情选择年度预算 --</option>
                     <option value="-1">[浏览]</option>
                 </select>
             </div>
@@ -34,7 +34,7 @@
                 <input type="hidden" id="fjmc" name="fjmc" class="layui-input">
                 <input type="hidden" id="fylb" name="fylb" class="layui-input">
                 <input type="text" id="fylbmc" name="fylbmc" lay-verify="required"
-                       lay-reqtext="费用类别不能为空" class="layui-input" readonly>
+                       lay-reqtext="费用类别不能为空" class="layui-input" placeholder="请选择费用类别..." readonly>
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
@@ -44,26 +44,26 @@
                        lay-reqtext="合同名称不能为空">
                 <input type="hidden" id="htes" name="htes" class="layui-input">
                 <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空" lay-search=“”>
-                    <option value="">-- 请选择 --</option>
+                    <option value="">-- 请选择合同 --</option>
                     <option value="-1">[浏览]</option>
                  </select>
             </div>
             <label class="layui-form-label required" style="width: 10%">合同金额(万元)</label>
             <div class="layui-input-inline" style="width: 25%">
                 <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required"
-                       lay-reqtext="合同金额不能为空" autocomplete="off" readonly>
+                       lay-reqtext="合同金额不能为空" autocomplete="off" placeholder="请填入合同金额..." readonly>
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 15%">付款计划</label>
             <div class="layui-input-inline" style="width: 30%">
                 <select name="fkjh" id="fkjh" lay-filter="fkjh" lay-verify="required" lay-reqtext="付款计划不能为空">
-                    <option value="">-- 请选择 --</option>
+                    <option value="">-- 请先选择合同，再选择付款计划 --</option>
                 </select>
             </div>
             <label class="layui-form-label required" style="width: 10%;">本次付款金额(万元)</label>
             <div class="layui-input-inline" style="width: 25%">
-                <input type="number" id="bcfkje" name="bcfkje" class="layui-input" lay-verify="required" lay-affix="number"
+                <input type="number" id="bcfkje" name="bcfkje" class="layui-input" lay-verify="required" lay-affix="number" placeholder="请填入本次付款金额..."
                        lay-reqtext="本次付款金额不能为空" autocomplete="off">
             </div>
         </div>

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

@@ -31,7 +31,7 @@
                                 <input type="hidden" id="rws" name="rws" class="layui-input" lay-verify="required" lay-reqtext="任务书不能为空">
                                 <input type="hidden" id="rwsmc" name="rwsmc" class="layui-input">
                                 <select name="ysrws" id="ysrws" lay-filter="ysrws">
-                                    <option value="">[无]</option>
+                                    <option value="">-- 请选择任务书 --</option>
                                     <option value="-1">[浏览]</option>
                                 </select>
                             </div>
@@ -41,22 +41,22 @@
                             <label class="layui-form-label required" style="width: 10%">合同名称</label>
                             <div class="layui-input-inline" style="width: 25%">
                                 <input type="hidden" id="id" name="id" class="layui-input">
-                                <input type="text" id="htmc" name="htmc" lay-verify="required" lay-reqtext="合同名称不能为空" autocomplete="off" class="layui-input">
+                                <input type="text" id="htmc" name="htmc" lay-verify="required" lay-reqtext="合同名称不能为空" autocomplete="off" class="layui-input" placeholder="请填入合同名称...">
                             </div>
                             <label class="layui-form-label required" style="width: 15%">合同金额(万元)</label>
                             <div class="layui-input-inline" style="width: 35%">
-                                <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required" lay-reqtext="合同金额不能为空" autocomplete="off">
+                                <input type="number" id="htje" name="htje" class="layui-input" lay-verify="required" lay-reqtext="合同金额不能为空" autocomplete="off" placeholder="请填入合同金额...">
                             </div>
                         </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 10%">招标批次</label>
                             <div class="layui-input-inline" style="width: 25%">
-                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！">
+                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！" placeholder="请填入招标批次...">
                             </div>
                             <label class="layui-form-label  " style="width: 15%">中选单位</label>
                             <div class="layui-input-inline" style="width: 35%">
-                                <input type="text" id="zxdw" name="zxdw" class="layui-input"
+                                <input type="text" id="zxdw" name="zxdw" class="layui-input" placeholder="请填入中选单位..."
                                        autocomplete="off">
                             </div>
                         </div>
@@ -72,10 +72,13 @@
                                 <input type="text" name="jssj" id="jssj" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空" readonly>
                             </div>
                         </div>
+                        <div class="layui-form-item layui-inline" style="width: 100%">
+                            <p style="width: 100%;margin-left: 10%;color: red">注：请注意，合同周期务必处于项目周期的时间范围之内。</p>
+                        </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 10%">验收时间</label>
                             <div class="layui-input-inline" style="width: 25%">
-                                <input type="text" id="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！">
+                                <input type="text" id="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！" placeholder="请选择验收时间...">
                             </div>
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
                             <div class="layui-input-inline" style="width: 10%">

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

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

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

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