合同管理新建页面BUg 修复

src/main/resources/mapper/PrjContractDao.xml

@@ -21,6 +21,7 @@
         <result property="yssj" column="YSSJ" jdbcType="VARCHAR"/>
         <result property="sfsxtndw" column="SFSXTNDW" jdbcType="INTEGER"/>
         <result property="yqrq" column="YQRQ" jdbcType="VARCHAR"/>
+        <result property="sfys" column="SFYS" jdbcType="INTEGER"/>
 
     </resultMap>
 
@@ -113,8 +114,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into prj_Contract(HTMC, WJ, HTJE, CJR, CJSJ, RWS, ZBPC, ZXDW, YSZL,KSSJ,JSSJ,SPZT,SFSXTNDW,YSSJ,YQRQ)
-        values (#{htmc}, #{wj}, #{htje}, #{cjr}, GETDATE(), #{rws}, #{zbpc}, #{zxdw}, #{yszl},#{kssj},#{jssj},#{spzt},#{sfsxtndw},#{yssj},#{yqrq})
+        insert into prj_Contract(HTMC, WJ, HTJE, CJR, CJSJ, RWS, ZBPC, ZXDW, YSZL,KSSJ,JSSJ,SPZT,SFSXTNDW,YSSJ,YQRQ,SFYS)
+        values (#{htmc}, #{wj}, #{htje}, #{cjr}, GETDATE(), #{rws}, #{zbpc}, #{zxdw}, #{yszl},#{kssj},#{jssj},#{spzt},#{sfsxtndw},#{yssj},#{yqrq},#{sfys})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@@ -150,32 +151,45 @@
         update prj_Contract
         <set>
             <if test="htmc != null and htmc != ''">
-                HTMC = #{htmc},
+                HTMC = #{htmc}
             </if>
             <if test="wj != null and wj !=''">
-                WJ = #{wj},
+                ,WJ = #{wj}
             </if>
             <if test="htje != null and htje !=''">
-                HTJE = #{htje},
+                ,HTJE = #{htje}
             </if>
             <if test="rws != null and rws != ''">
-                RWS = #{rws},
+                ,RWS = #{rws}
             </if>
             <if test="yszl != null and yszl !=''">
-                YSZL = #{yszl},
+                ,YSZL = #{yszl}
             </if>
             <if test="zbpc != null and zbpc !=''">
-                ZBPC = #{zbpc},
+                ,ZBPC = #{zbpc}
             </if>
             <if test="zxdw != null and zxdw != ''">
-                ZXDW = #{zxdw},
+                ,ZXDW = #{zxdw}
             </if>
             <if test="zt != null and zt != ''">
-                ZT = #{zt},
+                ,ZT = #{zt}
             </if>
-                KSSJ = #{kssj},
-                JSSJ = #{jssj},
-                YSSJ = #{yssj}
+            <if test="kssj != null">
+                ,KSSJ = #{kssj}
+            </if>
+            <if test="jssj != null">
+                ,JSSJ = #{jssj}
+            </if>
+            <if test="yssj != null">
+                ,YSSJ = #{yssj}
+            </if>
+            <if test="sfys != null and sfys != ''">
+                ,SFYS = #{sfys}
+            </if>
+            <if test="sfsxtndw != null and sfsxtndw != ''">
+                ,SFSXTNDW = #{sfsxtndw}
+            </if>
+
         </set>
         where ID = #{id}
     </update>

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -313,7 +313,8 @@
     </update>
     <update id="updateHtje">
         update sta_PayApproval
-        set HTJE = #{htje}
+        set
+            HTJE = #{htje}
         where HT = #{id}
     </update>
 

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

@@ -73,26 +73,36 @@
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <p style="width: 100%;margin-left: 10%;color: red">注：请注意，合同周期务必处于项目周期的时间范围之内。</p>
+                            <p style="width: 100%;margin-left: 10%;color: red">注：请注意，任务书带出时间为项目周期时间，请按合同自行调整。<br>规则：合同执行周期务必处于项目周期的时间范围之内。</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="招标批次不能为空！" placeholder="请选择验收时间...">
+
+                            <label class="layui-form-label required" style="width: 10%">是否验收</label>
+                            <div class="layui-input-inline" style="width: 5%">
+                                <input type="checkbox" name="sfys" id="sfys" title="ON|OFF" lay-skin="switch" lay-filter="sfys" checked>
+                            </div>
+                            <div id="mydiv">
+                                <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"   placeholder="请选择验收时间...">
+                                </div>
                             </div>
+
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
                             <div class="layui-input-inline" style="width: 10%">
-                                <select name="sfsxtndw" id="sfsxtndw">
+                      <!--          <select name="sfsxtndw" id="sfsxtndw">
                                     <option value="0">是</option>
                                     <option value="1">否</option>
-                                </select>
+                                </select>-->
+                                <input type="checkbox" name="sfsxtndw" id="sfsxtndw" title="ON|OFF" lay-skin="switch" lay-filter="sfsxtndw" checked>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%;display: none" id="yqrqs" >
-                            <label class="layui-form-label" style="width: 10%">延期日期</label>
-                            <div class="layui-input-inline" style="width: 25%">
-                                <input type="text" id="yqrq" name="yqrq" autocomplete="off" class="layui-input">
-                            </div>
+                                <label class="layui-form-label" style="width: 10%">延期日期</label>
+                                <div class="layui-input-inline" style="width: 25%">
+                                    <input type="text" id="yqrq" name="yqrq" autocomplete="off" class="layui-input">
+                                </div>
+
                         </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
@@ -331,6 +341,46 @@
             }
         });
         //任务书
+        // 定义原始校验规则
+        var verify = {
+            required:function (value) {
+                if (value === ''){
+                    return '项目已验收，验收时间不能为空！';
+                }
+                
+            }
+        };
+
+        // 复选框 监听
+        form.on('switch(sfys)', function (data) {
+            console.log('进来了');
+            if (data.elem.checked) {
+                $('#mydiv').css('display','block');
+                $('#sfys').val(1);
+                form.verify(verify);
+                console.log('复选框已选中');
+                return;
+            } else {
+                console.log('复选框已取消选中');
+                $('#mydiv').css('display','none');
+                $('#sfys').val(0);
+                form.verify({});
+                return;
+            }
+        });
+        // 复选框 监听
+        form.on('switch(sfsxtndw)', function (data) {
+            console.log('进来了');
+            if (data.elem.checked) {
+                $('#sfsxtndw').val(1);
+                console.log('复选框已选中');
+                return;
+            } else {
+                console.log('复选框已取消选中');
+                $('#sfsxtndw').val(0);
+                return;
+            }
+        });
         form.on('select(ysrws)', function (data) {
             var len = $("#ysrws")[0].length;
             while (len > 2)
@@ -355,12 +405,16 @@
                         rwsqssj = localStorage.getItem("rwsqssj");
                         rwswcsj = localStorage.getItem("rwswcsj");
                         xmzys = localStorage.getItem("jf");
+                        qs = localStorage.getItem("qs");
+                        wc = localStorage.getItem("wc");
                         var updateflag = localStorage.getItem("updateflag");
                         if (updateflag == "1") {
                             var rwsmc = localStorage.getItem("rwsmc");
                             $("#ysrws").append("<option value=" + rwsId + " selected>" + rwsmc + "</option>");
                             $("#rws").val(rwsId);
                             $("#rwsmc").val(rwsmc);
+                            $("#kssj").val(qs);
+                            $("#jssj").val(wc);
                         } else {
                             $("#ysrws").val(0);
                             $("#rws").val('');
@@ -530,12 +584,26 @@
         // 监听确认按钮(常规)
         form.on('submit(saveBtn)', function (data) {
             var htje =data.field.htje;
+            var sfys = document.getElementById('sfys').value;
+            var yssj = document.getElementById('yssj').value;
+            var sfsxtndw = document.getElementById('sfsxtndw').value;
+            if (sfsxtndw == 'on'){
+                data.field.sfsxtndw = 1;
+            }
+            console.log('sfys:'+sfys)
+            if (sfys == 1 || sfys == 'on'){
+                if (yssj == ''){
+                    layer.msg('项目已验收，验收时间不能为空！',{icon:2});
+                    return ;
+                }
+                data.field.sfys = 1;
+            }
             if (xmzys == null || xmzys == ''){
-                alert('保存失败，当前任务书项目总预算为空，请完善当前任务书的子课题！')
+                layer.msg('保存失败，当前任务书项目总预算为空，请完善当前任务书的子课题！',{icon:2});
                 return false;
             }
             if (htje > xmzys/10000){//校验合同金额是否大于项目总预算
-                alert('保存失败，填写的合同金额大于任务书项目总预算，项目总预算为：'+xmzys/10000+'万元');
+                layer.msg('保存失败，填写的合同金额大于任务书项目总预算，项目总预算为：'+xmzys/10000+'万元',{icon: 2});
                 return false;
             }
             //合同文件

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

@@ -161,6 +161,8 @@
             localStorage.setItem("ssbm", project.ssbm == null ? '' : project.ssbm);
             localStorage.setItem("ssbmmc", project.ssbmmc == null ? '' : project.ssbmmc);
             localStorage.setItem("jf", project.jf == null ? '' : project.jf);
+            localStorage.setItem("qs",project.qs == null ?'' :project.qs);
+            localStorage.setItem("wc",project.wc == null ? '':project.wc);
         });
 
         //双击
@@ -181,6 +183,8 @@
             localStorage.setItem("ssbmmc", project.ssbmmc == null ? '' : project.ssbmmc);
             localStorage.setItem("jf", project.jf == null ? '' : project.jf);
             localStorage.setItem("updateflag", "1");
+            localStorage.setItem("qs",project.qs == null ?'' :project.qs);
+            localStorage.setItem("wc",project.wc == null ? '':project.wc);
 
             parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
         });

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

@@ -120,17 +120,21 @@
                             </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="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！" th:value="${contract.yssj}">
+
+                            <label class="layui-form-label required" style="width: 10%">是否验收</label>
+                            <div class="layui-input-inline" style="width: 10%">
+                                <input type="checkbox" name="sfys" id="sfys" title="ON|OFF" lay-skin="switch" lay-filter="sfys" checked>
+                            </div>
+                            <div id="sfysdiv">
+                                <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="招标批次不能为空！" th:value="${contract.yssj}">
+                                </div>
+
                             </div>
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
                             <div class="layui-input-inline" style="width: 10%">
-                                <input type="text" name="display_sfsxtndw" id="display_sfsxtndw" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
-                                       th:value="${contract.sfsxtndw == 0?'是':'否'}"
-                                       readonly>
-                                <input type="hidden" name="sfsxtndw" id="sfsxtndw"
-                                       th:value="${contract.sfsxtndw}">
+                                <input type="checkbox" name="sfsxtndw" id="sfsxtndw" title="ON|OFF" lay-skin="switch" lay-filter="sfsxtndw" checked>
                             </div>
                         </div>
 
@@ -231,6 +235,30 @@
         </div>
     </div>
 </form>
+<script>
+    const sfys = [[${contract.sfys}]];
+    const sfsxtnbdw = [[${contract.sfsxtndw}]];
+    var sf = document.getElementById('sfys');
+    var nbdw = document.getElementById('sfsxtndw');
+    if (sfys == 1){
+        sf.checked = true;
+        sf.value = 1;
+       document.getElementById('sfysdiv').style.display = 'block';
+
+    }else {
+        sf.checked = false;
+        sf.value = 0;
+        document.getElementById('sfysdiv').style.display = 'none';
+    }
+    if (sfsxtnbdw == 1){
+        nbdw.checked = true;
+        nbdw.value = 1;
+    }else {
+        nbdw.checked = false;
+        nbdw.value = 0;
+    }
+
+</script>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
@@ -349,6 +377,44 @@
 
             }
         });
+        var verify = {
+            required:function (value) {
+                if (value === ''){
+                    return '项目已验收，验收时间不能为空！';
+                }
+
+            }
+        };
+        // 监听是否验收
+        form.on('switch(sfys)',function (data) {
+            if (data.elem.checked) {
+                $('#sfysdiv').css('display','block');
+                $('#sfys').val(1);
+                form.verify(verify);
+                console.log('复选框已选中');
+                return;
+            } else {
+                console.log('复选框已取消选中');
+                $('#sfysdiv').css('display','none');
+                $('#sfys').val(0);
+                form.verify({});
+                return;
+            }
+
+        });
+        // 监听是否是内部单位
+        form.on('switch(sfsxtndw)', function (data) {
+            console.log('进来了');
+            if (data.elem.checked) {
+                $('#sfsxtndw').val(1);
+                console.log('复选框已选中');
+                return;
+            } else {
+                console.log('复选框已取消选中');
+                $('#sfsxtndw').val(0);
+                return;
+            }
+        });
 
         // 用于存放表格数据
         var dataHtwj = new Array();

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

@@ -25,51 +25,74 @@
             <div class="layui-tab-item layui-show" style="min-height: 550px; margin-bottom: 5px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form">
+
+
+
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 60px">任务书</label>
-                            <div class="layui-input-inline" style="width: 790px">
+                            <label class="layui-form-label required" style="width: 10%">任务书</label>
+                            <div class="layui-input-inline" style="width: 80%">
                                 <input type="hidden" id="rws" name="rws" class="layui-input" th:value="${contract.rws}"
                                        readonly>
                                 <input type="text" id="rwsmc" name="rwsmc" class="layui-input"
                                        th:value="${contract.rwsmc}" readonly>
                             </div>
                         </div>
+
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 60px">合同名称</label>
-                            <div class="layui-input-inline" style="width: 380px">
-                                <input type="hidden" id="id" name="id" class="layui-input" th:value="${contract.id}">
-                                <input type="text" id="htmc" name="htmc" th:value="${contract.htmc}" class="layui-input"
-                                       readonly>
+                            <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" th:value="${contract.id}" >
+                                <input type="text" id="htmc" name="htmc" lay-verify="required" lay-reqtext="合同名称不能为空" autocomplete="off" class="layui-input" th:value="${contract.htmc}" readonly>
                             </div>
-                            <label class="layui-form-label" style="width: 100px">合同金额(万元)</label>
-                            <div class="layui-input-inline" style="width: 270px">
-                                <input type="number" id="htje" name="htje" class="layui-input"
-                                       th:value="${contract.htje}" readonly>
+                            <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="合同金额不能为空"
+                                       th:value="${contract.htje}"  readonly
+                                       autocomplete="off">
                             </div>
                         </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label " style="width: 60px">招标批次</label>
-                            <div class="layui-input-inline" style="width: 380px">
-                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input"
-                                       th:value="${contract.zbpc}" readonly>
+                            <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="招标批次不能为空" th:value="${contract.zbpc}"  readonly>
                             </div>
-                            <label class="layui-form-label " style="width: 100px">中选单位</label>
-                            <div class="layui-input-inline" style="width: 270px">
-                                <input type="text" id="zxdw" name="zxdw" class="layui-input" autocomplete="off"
-                                       th:value="${contract.zxdw}" readonly>
+                            <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" autocomplete="off" th:value="${contract.zxdw}" readonly >
                             </div>
                         </div>
+
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label required" style="width: 60px">执行周期</label>
-                            <div class="layui-input-inline" style="width: 380px">
+                            <label class="layui-form-label required" style="width: 10%">执行周期</label>
+                            <div class="layui-input-inline" style="width: 25%">
                                 <input type="text" name="kssj" id="kssj" placeholder="开始时间" class="layui-input" lay-verify="required" lay-reqtext="开始时间不能为空"
-                                       th:value="${contract.kssj}" readonly>
+                                       th:value="${contract.kssj}"
+                                       readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
-                            <div class="layui-input-inline" style="width: 380px">
+                            <div class="layui-input-inline" style="width: 25%">
                                 <input type="text" name="jssj" id="jssj" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
-                                       th:value="${contract.jssj}" readonly>
+                                       th:value="${contract.jssj}"
+                                       readonly>
+                            </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: 10%">
+                                <input type="checkbox" name="sfys" id="sfys" title="ON|OFF" lay-skin="switch" lay-filter="sfys" disabled checked>
+                            </div>
+                            <div id="sfysdiv">
+                                <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="招标批次不能为空！" th:value="${contract.yssj}" readonly>
+                                </div>
+
+                            </div>
+                            <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
+                            <div class="layui-input-inline" style="width: 10%">
+                                <input type="checkbox" name="sfsxtndw" id="sfsxtndw" title="ON|OFF" lay-skin="switch" lay-filter="sfsxtndw" disabled checked>
                             </div>
                         </div>
 
@@ -88,19 +111,29 @@
                                 </div>
                                 <table class="layui-hide" id="currentTableId1" name="currentTableId1"
                                        lay-filter="currentTableFilter1"
-                                       style="                           padding-top: 0px;margin-top: 0px"></table>
-                                <label>上传招标合同、中标通知书、合同流转单。</label>
+                                       style="padding-top: 0px;margin-top: 0px"></table>
+                                <label>上传招标合同、中标通知书、合同流转单（上传文件形式：word.pdf.excel)。</label>
                             </div>
                         </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 60px">验收资料</label>
                             <div class="layuimini-container"
-                                 style="margin-left: 90px; margin-right: 20px; margin-bottom: -30px">
+                                 style="margin-left: 90px; margin-right: 20px; padding-bottom: 10px">
                                 <input type="hidden" id="yszl" name="yszl" class="layui-input"
                                        th:value="${contract.yszl}">
+                                <div class="layui-btn-group" style="margin-bottom: -8px">
+                                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm upload"
+                                            id="upLoad2" lay-data="{fileType:'yszl'}"><i class="layui-icon"></i>上传
+                                    </button>
+                                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
+                                            lay-filter="deleteFile2"><i class="layui-icon"></i>删除
+                                    </button>
+                                </div>
                                 <table class="layui-hide" id="currentTableId2" name="currentTableId2"
-                                       lay-filter="currentTableFilter2"></table>
+                                       lay-filter="currentTableFilter2"
+                                       style="padding-top: 0px;margin-top: 0px"></table>
+                                <label>需上传合同约定的技术报告、测试报告、第三方检测报告、图纸、文宣专利等乙方应提供成果；外委验收意见（包括完成情况表及专家签名）。</label>
                             </div>
                         </div>
 
@@ -134,6 +167,30 @@
         </div>
     </div>
 </form>
+<script>
+    const sfys = [[${contract.sfys}]];
+    const sfsxtnbdw = [[${contract.sfsxtndw}]];
+    var sf = document.getElementById('sfys');
+    var nbdw = document.getElementById('sfsxtndw');
+    if (sfys == 1){
+        sf.checked = true;
+        sf.value = 1;
+        document.getElementById('sfysdiv').style.display = 'block';
+
+    }else {
+        sf.checked = false;
+        sf.value = 0;
+        document.getElementById('sfysdiv').style.display = 'none';
+    }
+    if (sfsxtnbdw == 1){
+        nbdw.checked = true;
+        nbdw.value = 1;
+    }else {
+        nbdw.checked = false;
+        nbdw.value = 0;
+    }
+
+</script>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>