Merge remote-tracking branch 'origin/master'

src/main/resources/jeeplus.properties

@@ -42,7 +42,7 @@ redis.port=6380
 #============================#
 
 #\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
-productName=兴光项目管理有限公司
+productName=jsxg
 copyrightYear=2019
 version=V2.4
 

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -73,6 +73,7 @@
                     $("#divv").show();
                 }else{
                     $("#divv").hide();
+                    $("#divv input").val('');
                 }
             });
 
@@ -221,12 +222,15 @@
 
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目合同信息</h2></div>
+                <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">合同情况：</label>
                 <div class="layui-input-block">
                     <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
                     <label for="ext">有合同</label>
                     <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
                     <label for="ext1">无合同</label>
                 </div>
+                </div>
                <div id="divv">
                    <div class="layui-item layui-col-sm12 lw7" id="d1">
                        <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>