合同执行时间必须在任务书中项目周期以内

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

@@ -48,6 +48,8 @@ public class PrjContractController extends BaseController {
     private PrjApproverecordService prjApproverecordService;
     @Resource
     private StaPayapprovalService staPayapprovalService;
+    @Resource
+    private PrjProjectService prjProjectService;
 
     @Resource
     private BasePersonService basePersonService;
@@ -212,8 +214,11 @@ public class PrjContractController extends BaseController {
     public String forUpdate(Model model, @PathVariable Integer id) {
         //当前项目
         PrjContract contract = prjContractService.queryById(id);
+        PrjProject prjProject = prjProjectService.queryById(contract.getRws());
         List<PrjPayplan> payPlanList = prjPayplanService.getPayPlanList(id);
         String userPostName = getSysUserInfo().getUserPostName();
+        model.addAttribute("rwsqssj",prjProject.getQs());
+        model.addAttribute("rwswcsj",prjProject.getWc());
         model.addAttribute("dataFkjh",payPlanList);
         model.addAttribute("contract", contract);
         model.addAttribute("userPostName",userPostName);

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

@@ -149,6 +149,8 @@
 
             localStorage.setItem("rws", project.id);
             localStorage.setItem("rwsmc", project.zwmc);
+            localStorage.setItem("rwsqssj", project.qs);
+            localStorage.setItem("rwswcsj", project.wc);
             localStorage.setItem("xmzxq", project.qs + ' 至 ' + project.wc);
             localStorage.setItem("kybg", project.kybg == null ? '' : project.kybg);
             localStorage.setItem("kybgmc", project.kybgmc == null ? '' : project.kybgmc);

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

@@ -126,8 +126,8 @@
                             </div>
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
                             <div class="layui-input-inline" style="width: 10%">
-                                <input type="text" name="sfsxtnbdw" id="sfsxtnbdw" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
-                                       th:value="${contract.sfsxtnbdw == 0?'是':'否'}"
+                                <input type="text" name="sfsxtndw" id="sfsxtndw" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
+                                       th:value="${contract.sfsxtndw == 0?'是':'否'}"
                                        readonly>
                             </div>
                         </div>
@@ -254,6 +254,8 @@
         var xmApproval = parent.getXmApproval();
         var spzt =xmApproval.spzt;
         var userPostName = [[${userPostName}]]
+        var rwsqssj = [[${rwsqssj}]]
+        var rwswcsj = [[${rwswcsj}]]
 
         console.log(spzt)
         //申请时间
@@ -262,11 +264,34 @@
             done: function (value, date, endDate) {
                 sqsj1 = $("#kssj").val();
                 sqsj2 = $("#jssj").val();
+                yssj = $("#yssj").val();
+                if (rwsqssj ==''||rwswcsj==''){
+                    layer.msg('请先选择任务书！',{icon:8});
+                    $("#kssj").val("");
+                    return;
+                }
+                if (sqsj1<rwsqssj){
+                    layer.msg("合同开始时间不能早于任务书开始时间，应该在任务书项目周期内！",{icon:2})
+                    $("#kssj").val("");
+                    return;
+                }
+                if (sqsj2 !=''&&sqsj1 == sqsj2){
+                    layer.msg('执行周期开始时间与结束时间不能为同一天！',{icon:2});
+                    $("#kssj").val("");
+                    return;
+                }
+                if (yssj != ''){
+                    if (sqsj1 > yssj){
+                        layer.msg('验收时间不能早于或等于合同开始时间！',{icon:2});
+                        $("#kssj").val("");
+                        return;
+                    }
+                }
                 if (sqsj1 != "" && sqsj2 != "") {
                     if (sqsj1 > sqsj2) {
                         Message.warning("起始时间不能晚于终止时间！", 1500);
                         $("#kssj").val("");
-
+                        return;
                     }
                 }
             }
@@ -276,13 +301,31 @@
             done: function (value, date, endDate) {
                 sqsj1 = $("#kssj").val();
                 sqsj2 = $("#jssj").val();
+                const currentDate = new Date();
+                const sqsj3 = new Date(sqsj2);
+                if (rwsqssj ==''||rwswcsj==''){
+                    layer.msg('请先选择任务书！',{icon:8});
+                    $("#jssj").val("");
+                    return;
+                }
+                if (sqsj2>rwswcsj){
+                    layer.msg("合同结束时间不能晚于任务书结束时间，应该在任务书项目周期内！",{icon:2})
+                    $("#jssj").val("");
+                    return;
+                }
+                if (sqsj1!=''&&sqsj1 == sqsj2){
+                    layer.msg('执行周期开始时间与结束时间不能为同一天！',{icon:2});
+                    $("#jssj").val("");
+                    return;
+                }
                 if (sqsj1 != "" && sqsj2 != "") {
                     if (sqsj1 > sqsj2) {
                         Message.warning("终止时间不能早于开始时间！", 1500);
                         $("#jssj").val("");
-
+                        return;
                     }
                 }
+
             }
         });
         // 用于存放表格数据

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

@@ -633,10 +633,10 @@
                     return false;
                 }
             }
-            /*if (bzje!==null && bzje > sqje * 1.2) {
+            if (bzje!==null && bzje > sqje * 1.2) {
                 alert("报账金额不能超过申请金额的120%！");
                 return false; // 阻止表单提交
-            }*/
+            }
             //报销凭证
             var dataWB = [];
             for (const item of dataBxpz) {