Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -1288,11 +1288,6 @@
                                                 cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectConstruction>
                 </div>
 
-                <div class="layui-item nav-btns">
-                    <a href="javascript:void(0)"
-                       onclick="openBill3('新增施工方信息', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=3','95%','95%',false,'inputForm')"
-                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增施工方信息</a>
-                </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTable2" class="table table-bordered table-condensed details">
                         <thead>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -1295,11 +1295,6 @@
                     <sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"
                                                 cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('施工方单位')}" searchKey="name"></sys:gridselectConstruction>
                 </div>
-                <div class="layui-item nav-btns" >
-                    <a href="javascript:void(0)"
-                       onclick="openBill3('新增施工方信息', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=3','95%','95%',false,'inputForm')"
-                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增施工方信息</a>
-                </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTable2" class="table table-bordered table-condensed details">
                         <thead>