Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectConstruction/projectConstructionForm.jsp

@@ -17,9 +17,6 @@
             left:0;
             top:82px;
         }
-        .layui-layer-dialog{
-            background: #ff0000;
-        }
         td input{
             margin-left:-10px !important;
             height: 42px !important;
@@ -30,6 +27,17 @@
         var isMasterClient = true;//是否是主委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+
+            var length = document.getElementById("file_attachment");
+            if(null != length){
+                var rows = length.rows.length;
+                if(rows<1){
+                    layer.msg('请添加施工合同附件信息', {icon: 5});
+                    return false;
+                }
+            }
+
+
             $("#inputForm").submit();
             return true;
         }
@@ -51,15 +59,6 @@
                 }
             });
 
-            <%--$('#scaleType').editableSelect({--%>
-            <%--effects: 'slide'--%>
-            <%--});--%>
-            <%--$('#scaleType').val("${projectRecords.scaleType}")--%>
-            <%--$('#scaleUnit').editableSelect({--%>
-            <%--effects: 'slide'--%>
-            <%--});--%>
-            <%--$('#scaleUnit').val("${projectRecords.scaleUnit}")--%>
-
             $("input[name='ext']").on('ifChecked',function(event){
                 radioVal = $(this).val();
                 if(radioVal == 0){
@@ -232,23 +231,16 @@
             <form:hidden path="projectId"/>
         <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>合同信息</h2></div>
-                <%--<div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:gridselectProjcontent url="${ctx}/project/constructionContract/selectcontent" id="projectId" name="projectId"  value="${constructionContract.projectId}"  title="选择项目名称" labelName="projectName"
-                                                   labelValue="${constructionContract.projectName}" cssClass="form-control layui-input required" projectId="${constructionContract.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('项目名称')}" searchKey="" ></sys:gridselectProjcontent>
-                    </div>
-                </div>--%>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input  readonly="true" path="projectName" htmlEscape="false"    class="form-control layui-input required"/>
+                        <form:input  readonly="true" path="projectName" htmlEscape="false" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="contractName" htmlEscape="false"    class="form-control layui-input required"/>
+                        <form:input path="contractName" htmlEscape="false" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -393,7 +385,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>附件信息</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                 </div>
@@ -456,50 +448,6 @@
                 </div>
             </div>
         </form:form>
-
-        <%--<form id="termForm" action="#" onsubmit="return false;" method="post" class="form-horizontal">
-            <div class="form-group layui-row lw12">
-                <div class="form-group-label"><h2>合同条款</h2></div>
-                <div class="layui-item nav-btns">
-                    <a href="javascript:void(0)" onclick="addRowTerm('#termTableList',termIdx,termTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
-                </div>
-                <table id="termsTable" class="table table-bordered table-condensed can-edit">
-                    <thead>
-                    <tr>
-                        <th class="hide"></th>
-                        <th>摘要项</th>
-                        <th>摘要内容</th>
-                        <th>对应条款序号</th>
-                        <th>操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="termTableList">
-                    </tbody>
-                </table>
-            </div>
-        </form>--%>
-        <script type="text/template" id="termTpl">//<!--
-        <tr id="termList{{idx}}">
-            <td class="hide">
-                <input id="termList{{idx}}_id" subName="id" class="contentDetail" type="hidden" value="{{row.id}}"/>
-                <input id="termList{{idx}}_delFlag" subName="delFlag" class="contentDetail" type="hidden" value="0"/>
-                <input id="termList{{idx}}_contractId" subName="contractId" class="contentDetail" type="hidden" value="{{row.contractId}}"/>
-            </td>
-            <td>
-                <input id="termList{{idx}}_title" subName="title"  value="{{row.title}}" type="text" class="form-control contentDetail"/>
-            </td>
-            <td>
-                <input id="termList{{idx}}_content" subName="content" value="{{row.content}}" type="text" class="form-control contentDetail"/>
-            </td>
-            <td>
-                <input id="termList{{idx}}_tnumber" subName="tnumber" value="{{row.tnumber}}" type="text" class="form-control contentDetail"/>
-            </td>
-            <td class="text-center op-td">
-                        <a href=javascript:void(0); onclick="delRow(this, '#termList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
-            </td>
-        </tr>//-->
-        </script>
-
     </div>
 </div>