申报页的返回跳转问题

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -3358,7 +3358,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     }
                 }
             }
-            if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
         }

src/main/resources/templates/admin/company/projectApplication/apply_add.html

@@ -30,253 +30,292 @@
 
     <form class="form form-horizontal" id="form-projectApplication-add">
         <input type="hidden" th:name="id" th:id="id"/>
-        <input type="hidden" th:name="companyInfo.company_id"  th:id="companyId" th:value="${companyId}"/>
-        <input type="hidden" th:name="declaration_id"  th:id="declaration_id" th:value="${declaration_id}"/>
-        <input type="hidden" th:name="isDraft"  th:id="isDraft" th:value="0"/>
-		<div class="baseInfo">
-			<div class="line">企业基本情况</div>
-			<div id="companyInfo">
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"> 企业名称：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.company_name}" th:name="companyInfo.company_name" />
-						<input type="hidden" th:value="${companyInfo.id}" th:name="companyInfo.id" />
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"> 统一社会信用代码：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:name="companyInfo.uscc" th:value="${companyInfo.uscc}" hidden/>
-						<span>[[${companyInfo.uscc}]]</span>
-					</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>所属行业：</label>
-					<div class="formControls col-xs-8 col-sm-4">
+        <input type="hidden" th:name="companyInfo.company_id" th:id="companyId" th:value="${companyId}"/>
+        <input type="hidden" th:name="declaration_id" th:id="declaration_id" th:value="${declaration_id}"/>
+        <input type="hidden" th:name="isDraft" th:id="isDraft" th:value="0"/>
+        <div class="baseInfo">
+            <div class="line">企业基本情况</div>
+            <div id="companyInfo">
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"> 企业名称：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.company_name}"
+                               th:name="companyInfo.company_name"/>
+                        <input type="hidden" th:value="${companyInfo.id}" th:name="companyInfo.id"/>
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"> 统一社会信用代码：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:name="companyInfo.uscc" th:value="${companyInfo.uscc}"
+                               hidden/>
+                        <span>[[${companyInfo.uscc}]]</span>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>所属行业：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
 						<span class="select-box">
 							<select class="select" th:name="companyInfo.industry_code" id="industryTypeList">
 								<option value="">--请选择--</option>
 								<option value="" th:each="item : ${industryTypeList}" th:value="${item.value}"
-										th:selected="${companyInfo.industry_code==item.value}"
-										th:text="${item.name}">
+                                        th:selected="${companyInfo.industry_code==item.value}"
+                                        th:text="${item.name}">
 								</option>
 							</select>
 						</span>
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"> 组织机构代码：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="hidden" th:name="companyInfo.organization_code" th:value="${companyInfo.organization_code}" />
-						<span th:value="${companyInfo.organization_code}"  >[[${companyInfo.organization_code}]]</span>
-					</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>注册地点：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text"th:value="${companyInfo.registration_address}"  th:name="companyInfo.registration_address" />
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>注册资金：</label>
-					<div class="formControls col-xs-4 col-sm-1">
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"> 组织机构代码：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="hidden" th:name="companyInfo.organization_code"
+                               th:value="${companyInfo.organization_code}"/>
+                        <span th:value="${companyInfo.organization_code}">[[${companyInfo.organization_code}]]</span>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>注册地点：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.registration_address}"
+                               th:name="companyInfo.registration_address"/>
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>注册资金：</label>
+                    <div class="formControls col-xs-4 col-sm-1">
 						<span class="select-box">
-							<select class="select" th:name="companyInfo.currency_unit" id="currency_unit" >
+							<select class="select" th:name="companyInfo.currency_unit" id="currency_unit">
 							   <!-- <option value="">--请选择货币单位--</option> -->
-							   <option th:selected="${companyInfo.currency_unit==item.id}" th:each="item : ${currencyList}"
-									   th:value="${item.id}" th:text="${item.name}"/>
+							   <option th:selected="${companyInfo.currency_unit==item.id}"
+                                       th:each="item : ${currencyList}"
+                                       th:value="${item.id}" th:text="${item.name}"/>
 						   </select>
 					   </span>
-					</div>
-					<div class="formControls col-xs-6 col-sm-2" >
-						<input type="text" class="input-text" th:id="registration_capital" th:name="companyInfo.registration_capital" th:value="${companyInfo.registration_capital}"/>
-					</div>
-					<div class="col-xs-4 col-sm-1">（万元）</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表姓名：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.legal_representative}"  th:name="companyInfo.legal_representative" />
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人姓名：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.contact}" th:name="companyInfo.contact"/>
-					</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表职务：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.lr_position}"  th:name="companyInfo.lr_position" />
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人职务：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.contact_position}" th:name="companyInfo.contact_position" />
-					</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表手机：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.lr_phone}" th:name="companyInfo.lr_phone" />
-					</div>
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人手机：</label>
-					<div class="formControls col-xs-8 col-sm-4">
-						<input type="text" class="input-text" th:value="${companyInfo.contact_phone}" th:name="companyInfo.contact_phone" />
-					</div>
-				</div>
-				<div class="row cl">
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>总资产：</label>
-					<div class="formControls col-xs-4 col-sm-1" >
-						<!--<input type="hidden" class="input-text" th:value="${companyInfo.total_assets_currency_unit}" name="companyInfo.total_assets_currency_unit" id="total_assets_currency_unit"/>-->
-						<span class="select-box">
-							<select class="select" th:name="companyInfo.total_assets_currency_unit" >
+                    </div>
+                    <div class="formControls col-xs-6 col-sm-2">
+                        <input type="text" class="input-text" th:id="registration_capital"
+                               th:name="companyInfo.registration_capital"
+                               th:value="${companyInfo.registration_capital}"/>
+                    </div>
+                    <div class="col-xs-4 col-sm-1">（万元）</div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表姓名：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.legal_representative}"
+                               th:name="companyInfo.legal_representative"/>
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人姓名：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.contact}"
+                               th:name="companyInfo.contact"/>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表职务：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.lr_position}"
+                               th:name="companyInfo.lr_position"/>
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人职务：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.contact_position}"
+                               th:name="companyInfo.contact_position"/>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>法人代表手机：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.lr_phone}"
+                               th:name="companyInfo.lr_phone"/>
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>联系人手机：</label>
+                    <div class="formControls col-xs-8 col-sm-4">
+                        <input type="text" class="input-text" th:value="${companyInfo.contact_phone}"
+                               th:name="companyInfo.contact_phone"/>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>总资产：</label>
+                    <div class="formControls col-xs-4 col-sm-1">
+                        <!--<input type="hidden" class="input-text" th:value="${companyInfo.total_assets_currency_unit}" name="companyInfo.total_assets_currency_unit" id="total_assets_currency_unit"/>-->
+                        <span class="select-box">
+							<select class="select" th:name="companyInfo.total_assets_currency_unit">
 							   <!-- <option value="">--请选择货币单位--</option> -->
-							   <option th:selected="${companyInfo.total_assets_currency_unit==item.id}" th:each="item : ${currencyList}"
-									   th:value="${item.id}" th:text="${item.name}"/>
+							   <option th:selected="${companyInfo.total_assets_currency_unit==item.id}"
+                                       th:each="item : ${currencyList}"
+                                       th:value="${item.id}" th:text="${item.name}"/>
 						   </select>
 					   </span>
-					</div>
-					<div class="formControls col-xs-6 col-sm-2" >
-						<input type="text" class="input-text" th:id="total_assets" th:value="${companyInfo.total_assets}" th:name="companyInfo.total_assets" />
-					</div>
-					<div class="col-xs-4 col-sm-1">（万元）</div>
-					<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>固定资产净值：</label>
-					<div class="formControls col-xs-4 col-sm-1" >
+                    </div>
+                    <div class="formControls col-xs-6 col-sm-2">
+                        <input type="text" class="input-text" th:id="total_assets"
+                               th:value="${companyInfo.total_assets}" th:name="companyInfo.total_assets"/>
+                    </div>
+                    <div class="col-xs-4 col-sm-1">（万元）</div>
+                    <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>固定资产净值：</label>
+                    <div class="formControls col-xs-4 col-sm-1">
 						<span class="select-box">
-							<select class="select" th:name="companyInfo.fixed_assets_currency_unit" >
+							<select class="select" th:name="companyInfo.fixed_assets_currency_unit">
 							   <!-- <option value="">--请选择货币单位--</option> -->
-							   <option th:selected="${companyInfo.fixed_assets_currency_unit==item.id}" th:each="item : ${currencyList}"
-									   th:value="${item.id}" th:text="${item.name}"/>
+							   <option th:selected="${companyInfo.fixed_assets_currency_unit==item.id}"
+                                       th:each="item : ${currencyList}"
+                                       th:value="${item.id}" th:text="${item.name}"/>
 						   </select>
 					   </span>
-					</div>
-					<div class="formControls col-xs-6 col-sm-2" >
-						<input type="text" class="input-text" th:id="fixed_assets" th:value="${companyInfo.fixed_assets}" th:name="companyInfo.fixed_assets" />
-					</div>
-					<div class="col-xs-4 col-sm-1">（万元）</div>
-				</div>
-			</div>
-			<div class="line"><span class="c-red">*</span>企业经营情况</div>
-				<table class="table table-border table-bordered table-bg table-hover" id="operationsInfoTb">
-					<thead>
-						<tr class="text-c">
-							<th>年份</th>
-							<th th:each="item,iterStat: ${operationsInfo}">
-								[[${item.year}]] 年
-								<input type="hidden" th:value="${item.year}" th:name="${'operationsInfo['+iterStat.index+'].year'}"/>
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr class="text-c" >
-							<td>营业收入（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}">
-								<input type="hidden" th:value="${item.cid}" th:name="${'operationsInfo['+iterStat.index+'].cid'}"/>
-								<input required type="text" class="input-text number" th:value="${item.operation_income}" th:name="${'operationsInfo['+iterStat.index+'].operation_income'}"/>
-							</td>
-						</tr>
-						<tr class="text-c" >
-							<td>其中：产品销售收入（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}">
-								<input required type="text" class="input-text number" th:value="${item.sales_income}" th:name="${'operationsInfo['+iterStat.index+'].sales_income'}"/>
-							</td>
-						</tr>
-						<tr class="text-c" >
-							<td>加工收入（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number" th:value="${item.processing_income}" th:name="${'operationsInfo['+iterStat.index+'].processing_income'}"/></td>
-						</tr>
-						<tr class="text-c" >
-							<td>入库税金（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number" th:value="${item.storage_tax}" th:name="${'operationsInfo['+iterStat.index+'].storage_tax'}"/></td>
-						</tr>
-						<tr class="text-c" >
-							<td>其中：增值税（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number" th:value="${item.added_value_tax}" th:name="${'operationsInfo['+iterStat.index+'].added_value_tax'}"/></td>
-						</tr>
-						<tr class="text-c" >
-							<td>营业税（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number" th:value="${item.business_tax}" th:name="${'operationsInfo['+iterStat.index+'].business_tax'}"/></td>
-						</tr>
-						<tr class="text-c" >
-							<td>企业所得税（万元）</td>
-							<td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number" th:value="${item.corporate_income_tax}" th:name="${'operationsInfo['+iterStat.index+'].corporate_income_tax'}"/></td>
-						</tr>
-					</tbody>
-
-				</table>
-			<div class="row cl">
-				<div class="formControls col-xs-8 col-sm-4">
-					<input id="isStatement" name="is_statement" type="checkbox" /><strong style="color:red;" > 本企业声明：本企业保证以上信息真实无误！</strong>
-				</div>
-			</div>
-
-			<div class="line">项目申报类别&nbsp;&nbsp;&nbsp;&nbsp; <a th:href="${instructionUrl} " target="_blank" style="color: #5b98dd;">&nbsp;&nbsp;下载</a></div>
-			<div class="row cl">
-				<label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span><span class="c-red">*</span>项目大类：</label>
-				<div class="formControls col-xs-8 col-sm-4">
+                    </div>
+                    <div class="formControls col-xs-6 col-sm-2">
+                        <input type="text" class="input-text" th:id="fixed_assets"
+                               th:value="${companyInfo.fixed_assets}" th:name="companyInfo.fixed_assets"/>
+                    </div>
+                    <div class="col-xs-4 col-sm-1">（万元）</div>
+                </div>
+            </div>
+            <div class="line"><span class="c-red">*</span>企业经营情况</div>
+            <table class="table table-border table-bordered table-bg table-hover" id="operationsInfoTb">
+                <thead>
+                <tr class="text-c">
+                    <th>年份</th>
+                    <th th:each="item,iterStat: ${operationsInfo}">
+                        [[${item.year}]] 年
+                        <input type="hidden" th:value="${item.year}"
+                               th:name="${'operationsInfo['+iterStat.index+'].year'}"/>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr class="text-c">
+                    <td>营业收入（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}">
+                        <input type="hidden" th:value="${item.cid}"
+                               th:name="${'operationsInfo['+iterStat.index+'].cid'}"/>
+                        <input required type="text" class="input-text number" th:value="${item.operation_income}"
+                               th:name="${'operationsInfo['+iterStat.index+'].operation_income'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>其中：产品销售收入（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}">
+                        <input required type="text" class="input-text number" th:value="${item.sales_income}"
+                               th:name="${'operationsInfo['+iterStat.index+'].sales_income'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>加工收入（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number"
+                                                                          th:value="${item.processing_income}"
+                                                                          th:name="${'operationsInfo['+iterStat.index+'].processing_income'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>入库税金（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number"
+                                                                          th:value="${item.storage_tax}"
+                                                                          th:name="${'operationsInfo['+iterStat.index+'].storage_tax'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>其中：增值税（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number"
+                                                                          th:value="${item.added_value_tax}"
+                                                                          th:name="${'operationsInfo['+iterStat.index+'].added_value_tax'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>营业税（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number"
+                                                                          th:value="${item.business_tax}"
+                                                                          th:name="${'operationsInfo['+iterStat.index+'].business_tax'}"/>
+                    </td>
+                </tr>
+                <tr class="text-c">
+                    <td>企业所得税（万元）</td>
+                    <td th:each="item,iterStat: ${operationsInfo}"><input required type="text" class="input-text number"
+                                                                          th:value="${item.corporate_income_tax}"
+                                                                          th:name="${'operationsInfo['+iterStat.index+'].corporate_income_tax'}"/>
+                    </td>
+                </tr>
+                </tbody>
+
+            </table>
+            <div class="row cl">
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input id="isStatement" name="is_statement" type="checkbox"/><strong style="color:red;">
+                    本企业声明：本企业保证以上信息真实无误！</strong>
+                </div>
+            </div>
+
+            <div class="line">项目申报类别&nbsp;&nbsp;&nbsp;&nbsp; <a th:href="${instructionUrl} " target="_blank"
+                                                                style="color: #5b98dd;">&nbsp;&nbsp;下载</a></div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span><span class="c-red">*</span>项目大类：</label>
+                <div class="formControls col-xs-8 col-sm-4">
 					<span class="select-box">
 					<select class="select" th:name="project_type" id="project_type" onChange="changeType(this)">
-						<option value="" >-- 请选择申报项目种类 --</option>
+						<option value="">-- 请选择申报项目种类 --</option>
 						<option th:each="item : ${projectTypeList}" th:value="${item.id}"
-								th:text="${item.type_name}" th:selected = "${applyType}==${item.id}">
+                                th:text="${item.type_name}" th:selected="${applyType}==${item.id}">
 						</option>
 					</select>
 					</span>
-				</div>
-				<label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span><span class="c-red">*</span>项目小类：</label>
-				<div class="formControls col-xs-8 col-sm-4">
+                </div>
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span><span class="c-red">*</span>项目小类：</label>
+                <div class="formControls col-xs-8 col-sm-4">
 					<span class="select-box">
-					<input type="hidden" th:id="project_name" th:name="project_name" />
-					<select class="select" th:name="project_id" th:id="project_id"  onChange="changeProject(this)">
+					<input type="hidden" th:id="project_name" th:name="project_name"/>
+					<select class="select" th:name="project_id" th:id="project_id" onChange="changeProject(this)">
 						<option th:each="item : ${projectNameList}" th:value="${item.value}"
-								th:text="${item.name}" th:selected = "${applyType}==${item.value}">
+                                th:text="${item.name}" th:selected="${applyType}==${item.value}">
 						</option>
 					</select>
 					</span>
-				</div>
-			</div>
-			<div class="line">项目名称</div>
-			<div class="row cl">
-				<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>项目名称：</label>
-				<div class="formControls col-xs-8 col-sm-4">
-					<input type="text" class="input-text" th:name="customize_name" id="customize_name">
-				</div>
-			</div>
-			<!--<div class="row cl">
-				<label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span>项目类别说明：</label>
-				<a th:href="${instructionUrl} " target="_blank" style="color: #5b98dd;">&nbsp;&nbsp;下载</a>
-			</div>-->
-			<div class="row cl">
-				<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
-					<a class="btn btn-primary radius" onclick="createFile();" >&nbsp;&nbsp;保存&nbsp;&nbsp;</a>
-					<button onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;取消&nbsp;&nbsp;</button>
-				</div>
-			</div>
-		</div>
-
-		<div style="display: none" id="applyFile">
-			<div class="line" >申报材料&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;（<span style="color: red;">附件2请下载填写上传；附件1、附件3、附件4系统根据企业填写信息自动生成，请企业下载确认后，再上传盖章扫描件</span>）</div>
-			<div class="row cl" id="applyMaterials">
-				<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
-					<table class="table table-border table-bordered table-bg table-hover">
-						<thead>
-						<tr class="text-c">
-							<th>编号</th>
-							<th>附件</th>
-							<th>申请材料</th>
-						</tr>
-						</thead>
-						<tbody>
-						<tr class="text-c" >
-
-						</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<div class="row cl">
-				<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
-					<a class="btn btn-primary radius" onclick="saveDraft(1);" >&nbsp;&nbsp;保存草稿&nbsp;&nbsp;</a>
-					<a class="btn btn-primary radius" onclick="saveDraft(0);" >&nbsp;&nbsp;提交&nbsp;&nbsp;</a>
-					<button onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;取消&nbsp;&nbsp;</button>
-					<a class="btn btn-primary radius" onclick="returnNext();" >&nbsp;&nbsp;返回上一步&nbsp;&nbsp;</a>
-				</div>
-			</div>
-		</div>
+                </div>
+            </div>
+            <div class="line">项目名称</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>项目名称：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input type="text" class="input-text" th:name="customize_name" id="customize_name">
+                </div>
+            </div>
+            <!--<div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red"></span>项目类别说明：</label>
+                <a th:href="${instructionUrl} " target="_blank" style="color: #5b98dd;">&nbsp;&nbsp;下载</a>
+            </div>-->
+            <div class="row cl">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+                    <a class="btn btn-primary radius" onclick="createFile();">&nbsp;&nbsp;保存&nbsp;&nbsp;</a>
+                    <button onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;取消&nbsp;&nbsp;</button>
+                </div>
+            </div>
+        </div>
+
+        <div style="display: none" id="applyFile">
+            <div class="line">申报材料&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;（<span style="color: red;">附件2请下载填写上传；附件1、附件3、附件4系统根据企业填写信息自动生成，请企业下载确认后，再上传盖章扫描件</span>）
+            </div>
+            <div class="row cl" id="applyMaterials">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+                    <table class="table table-border table-bordered table-bg table-hover">
+                        <thead>
+                        <tr class="text-c">
+                            <th>编号</th>
+                            <th>附件</th>
+                            <th>申请材料</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr class="text-c">
+
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+                    <a class="btn btn-primary radius" onclick="saveDraft(1);">&nbsp;&nbsp;保存草稿&nbsp;&nbsp;</a>
+                    <a class="btn btn-primary radius" onclick="saveDraft(0);">&nbsp;&nbsp;提交&nbsp;&nbsp;</a>
+                    <button onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;取消&nbsp;&nbsp;</button>
+                    <a class="btn btn-primary radius" onclick="returnNext();">&nbsp;&nbsp;返回上一步&nbsp;&nbsp;</a>
+                </div>
+            </div>
+        </div>
 
     </form>
 
@@ -284,20 +323,20 @@
 </article>
 <script type="text/javascript" th:src="@{/js/company/project_application/apply_add.js}"></script>
 <script th:inline="javascript">
-	
-	var fileUrl = [[${fileUrl}]];
-	
-	$(function(){
-		$("#operationsInfoTb").find(".number").each(function(i,item){
-    		$(this).rules('add', {  
-                required:true,
-        		min : 0,
-        		max : 999999999.999999,
-        		isFloat : true,
-        		isFloat6Fn : true
-            });  
-    	});
-	});
+
+    var fileUrl = [[${fileUrl}]];
+
+    $(function () {
+        $("#operationsInfoTb").find(".number").each(function (i, item) {
+            $(this).rules('add', {
+                required: true,
+                min: 0,
+                max: 999999999.999999,
+                isFloat: true,
+                isFloat6Fn: true
+            });
+        });
+    });
 
     $("#industryTypeList").change(function () {
         if ($('#industryTypeList option:selected').val() == "Empty") {
@@ -306,16 +345,16 @@
             $("#industry").hide()
         }
     });
-	
-	function saveDraft(isDraft){
-		$("#isDraft").val(isDraft);
-		submit();
-	}
+
+    function saveDraft(isDraft) {
+        $("#isDraft").val(isDraft);
+        submit();
+    }
 
     /**
      * 保存信息，生产附件1、3、4
      */
-	function createFile() {
+    function createFile() {
         if ($("#form-projectApplication-add").valid()) {
             var valid = true;
             if (!$("#isStatement").is(":checked")) {
@@ -344,47 +383,46 @@
                     var baseFileUrl = data.obj.file_url;
                     console.log(baseFileUrl);
 
-                    if(applyMaterials.length > 0){
+                    if (applyMaterials.length > 0) {
 
                         $("#applyMaterials").find("tbody tr").remove();
 
-                        for(var i=0;i< applyMaterials.length; i++){
+                        for (var i = 0; i < applyMaterials.length; i++) {
                             var file = applyMaterials[i];
                             var tr = '<tr class="text-c" >';
                             //编号
-                            tr +='<td class="index" > '+(i+1)+' </td>';
+                            tr += '<td class="index" > ' + (i + 1) + ' </td>';
                             //附件
                             tr += '<td class ="templateFile">';
-                            if(baseFileUrl && file.file_url){
-                                tr += '<a href="'+baseFileUrl + file.file_url+'" target="_blank" style="color: #5b98dd;">'+file.file_name+'</a>';
-                            }else{
-                                tr += '<span>'+file.file_name+'</span>';
+                            if (baseFileUrl && file.file_url) {
+                                tr += '<a href="' + baseFileUrl + file.file_url + '" target="_blank" style="color: #5b98dd;">' + file.file_name + '</a>';
+                            } else {
+                                tr += '<span>' + file.file_name + '</span>';
                             }
                             tr += '</td>';
                             //上传文件
-                            if (file.download_uri){
+                            if (file.download_uri) {
                                 tr += '<td>';
-                                tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials['+i+'].template_id" value="'+file.file_id+'"/>';
-                                tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/'+file.file_id+'\',\'800\',\'350\');"/>';
-                                tr += '<input class="uploadFileId" type="hidden" name="applyMaterials['+i+'].fileDown.file_id" />';
+                                tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials[' + i + '].template_id" value="' + file.file_id + '"/>';
+                                tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/' + file.file_id + '\',\'800\',\'350\');"/>';
+                                tr += '<input class="uploadFileId" type="hidden" name="applyMaterials[' + i + '].fileDown.file_id" />';
                                 tr += '</td>';
-                            }
-                            else {
+                            } else {
                                 tr += '<td>';
-                                tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials['+i+'].template_id" value="'+file.file_id+'"/>';
-                                tr += '<input class="uploadFileContent" type="hidden" name="applyMaterials['+i+'].content" value="annex_template"/>';
-                                tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/'+file.file_id+'\',\'800\',\'350\');"/>';
-                                tr += '<input class="uploadFileId" type="hidden" name="applyMaterials['+i+'].fileDown.file_id" />';
+                                tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials[' + i + '].template_id" value="' + file.file_id + '"/>';
+                                tr += '<input class="uploadFileContent" type="hidden" name="applyMaterials[' + i + '].content" value="annex_template"/>';
+                                tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/' + file.file_id + '\',\'800\',\'350\');"/>';
+                                tr += '<input class="uploadFileId" type="hidden" name="applyMaterials[' + i + '].fileDown.file_id" />';
                                 tr += '</td>';
                             }
 
                             $("#applyMaterials").find("tbody").append(tr);
                         }
-                    }else{
+                    } else {
                         $("#applyMaterials").find("tbody tr").remove();
                     }
 
-					$("#applyFile").show();
+                    $("#applyFile").show();
                     $(".baseInfo").hide();
 
                 } else {
@@ -402,118 +440,119 @@
         $("#applyFile").hide();
         $(".baseInfo").show();
     }
-    
+
     /**
      * 取消
      */
-    function removeIframe(){
-        var index = parent.layer.getFrameIndex(window.name);
-        if(index){
-        	parent.layer.close(index);
-        }else{
-        	//返回门户申报页面
-        	window.location.href = pagePath+"/home/informList/69";
-        	//history.back(-2);
-        }
+    function removeIframe() {
+        // var index = parent.layer.getFrameIndex(window.name);
+        // if(index){
+        // 	parent.layer.close(index);
+        // }else{
+        // 	//返回门户申报页面
+        // 	window.location.href = pagePath+"/home/informList/69";
+        // 	//history.back(-2);
+        // }
+        history.back(-1);
     }
 
-	function changeType(obj){
-		$.ajax({
-			url :pagePath+"/project/getProjectByType",
-			type : "get",
-			data : {
-				'type': $("#project_type").val()
-			},
-			dataType : "json",
-			success: function (result) {
+    function changeType(obj) {
+        $.ajax({
+            url: pagePath + "/project/getProjectByType",
+            type: "get",
+            data: {
+                'type': $("#project_type").val()
+            },
+            dataType: "json",
+            success: function (result) {
                 if (result.success) {
                     var projects = result.obj;
-                    if(projects.length>0){
-                    	$("#project_id").find("option").remove();
-                    	var options = '';
-                    	for(var i=0;i< projects.length;i++){
-                    		options += '<option value="'+projects[i].id+'" project_name="'+projects[i].project_name+'" >'+projects[i].project_name+'</option>';
-	                    }
-                    	$("#project_id").append(options);
-                    	$("#project_name").val(projects[0].project_name);
-						//获取材料模板
+                    if (projects.length > 0) {
+                        $("#project_id").find("option").remove();
+                        var options = '';
+                        for (var i = 0; i < projects.length; i++) {
+                            options += '<option value="' + projects[i].id + '" project_name="' + projects[i].project_name + '" >' + projects[i].project_name + '</option>';
+                        }
+                        $("#project_id").append(options);
+                        $("#project_name").val(projects[0].project_name);
+                        //获取材料模板
                         // getTemplateFiles(null ,projects[0].id);
-                    }else{
-                    	$("#project_id").find("option").remove();
-                    	$("#project_name").val("");
-                    	$("#applyMaterials").find("tbody tr").remove();
+                    } else {
+                        $("#project_id").find("option").remove();
+                        $("#project_name").val("");
+                        $("#applyMaterials").find("tbody tr").remove();
                     }
                 } else {
                     errorMessage(result.message);
                 }
-	         },
-	         error: function () {
-	            errorMessage('系统错误!');
-	         }
-		});
-	}
-	
-	function changeProject(obj){
-    	$("#project_name").val($(obj).find("option:selected").attr("project_name"));
-		// getTemplateFiles(obj);
-	}
-	
-	function getTemplateFiles(obj,pid){
-		var projectId = 0;
-		if(pid){
-			projectId = pid;
-		}else{
-			projectId = $(obj).val();
-		}
-		$.ajax({
-			url :pagePath+"/project/getProjectMaterials",
-			type : "get",
-			data : {
-				'id': projectId
-			},
-			dataType : "json",
-			success: function (result) {
+            },
+            error: function () {
+                errorMessage('系统错误!');
+            }
+        });
+    }
+
+    function changeProject(obj) {
+        $("#project_name").val($(obj).find("option:selected").attr("project_name"));
+        // getTemplateFiles(obj);
+    }
+
+    function getTemplateFiles(obj, pid) {
+        var projectId = 0;
+        if (pid) {
+            projectId = pid;
+        } else {
+            projectId = $(obj).val();
+        }
+        $.ajax({
+            url: pagePath + "/project/getProjectMaterials",
+            type: "get",
+            data: {
+                'id': projectId
+            },
+            dataType: "json",
+            success: function (result) {
                 if (result.success) {
                     var applyMaterials = result.obj.applyMaterials;
-                    if(applyMaterials.length>0){
-                    	$("#applyMaterials").find("tbody tr").remove();
-                    	
-                    	for(var i=0;i< applyMaterials.length;i++){
-                    		var file = applyMaterials[i].templateFile;
-                    		var tr = '<tr class="text-c" >';
-                    		//编号
-        		            tr +='<td class="index" > '+(i+1)+' </td>';
-        		            //模板
-                    		tr += '<td class ="templateFile">'
-                    		if(file && file.file_url){
-                    			url = fileUrl + file.file_url;
-                    			tr += '<a href="'+url+'" target="_blank">'+file.file_name+'</a>';
-                    		}else{
-                    			tr += '<span>'+applyMaterials[i].content+'</span>';
-                    		}
-                    		tr += '</td>';   
-							//上传文件
-							tr += '<td>';
-							tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials['+i+'].template_id" value="'+applyMaterials[i].template_id+'"/>';
-							tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/'+applyMaterials[i].template_id+'\',\'800\',\'350\');"/>';
-							tr += '<input class="uploadFileId" type="hidden" name="applyMaterials['+i+'].fileDown.file_id" />';
-		                	tr += '</td>'; 
-		                	$("#applyMaterials").find("tbody").append(tr);
-	                    }
-                    }else{
-                    	$("#applyMaterials").find("tbody tr").remove();
+                    if (applyMaterials.length > 0) {
+                        $("#applyMaterials").find("tbody tr").remove();
+
+                        for (var i = 0; i < applyMaterials.length; i++) {
+                            var file = applyMaterials[i].templateFile;
+                            var tr = '<tr class="text-c" >';
+                            //编号
+                            tr += '<td class="index" > ' + (i + 1) + ' </td>';
+                            //模板
+                            tr += '<td class ="templateFile">'
+                            if (file && file.file_url) {
+                                url = fileUrl + file.file_url;
+                                tr += '<a href="' + url + '" target="_blank">' + file.file_name + '</a>';
+                            } else {
+                                tr += '<span>' + applyMaterials[i].content + '</span>';
+                            }
+                            tr += '</td>';
+                            //上传文件
+                            tr += '<td>';
+                            tr += '<input class="uploadFileTemplateId" type="hidden" name="applyMaterials[' + i + '].template_id" value="' + applyMaterials[i].template_id + '"/>';
+                            tr += '<input class="uploadFileName input-text" name="uploadFileName" readonly="readonly" type="text" onclick="javascript:addFile(\'添加文件\',\'/stockLand/addApplyFile/1/' + applyMaterials[i].template_id + '\',\'800\',\'350\');"/>';
+                            tr += '<input class="uploadFileId" type="hidden" name="applyMaterials[' + i + '].fileDown.file_id" />';
+                            tr += '</td>';
+                            $("#applyMaterials").find("tbody").append(tr);
+                        }
+                    } else {
+                        $("#applyMaterials").find("tbody tr").remove();
                     }
-                    
+
                 } else {
                     errorMessage(result.message);
                 }
-	         },
-	         error: function () {
-	            errorMessage('系统错误!');
-	         }
-		});
-	}
-    
+            },
+            error: function () {
+                errorMessage('系统错误!');
+            }
+        });
+    }
+
 </script>
 </body>
 </html>

src/main/resources/templates/admin/company/projectIntelligent/apply_add.html

@@ -262,14 +262,15 @@
      * 取消
      */
     function removeIframe(){
-        var index = parent.layer.getFrameIndex(window.name);
-        if(index){
-        	parent.layer.close(index);
-        }else{
-        	//返回门户申报页面
-        	window.location.href = pagePath+"/home/informList/69";
-        	//history.back(-2);
-        }
+        // var index = parent.layer.getFrameIndex(window.name);
+        // if(index){
+        // 	parent.layer.close(index);
+        // }else{
+        // 	//返回门户申报页面
+        // 	window.location.href = pagePath+"/home/informList/69";
+        // 	//history.back(-2);
+        // }
+		history.back(-1);
     }
 
 	function changeType(obj){

src/main/resources/templates/admin/company/projectProvinces/apply_add.html

@@ -330,14 +330,15 @@
      * 取消
      */
     function removeIframe(){
-        var index = parent.layer.getFrameIndex(window.name);
-        if(index){
-        	parent.layer.close(index);
-        }else{
-        	//返回门户申报页面
-        	window.location.href = pagePath+"/index/#/projectList";
-        	//history.back(-2);
-        }
+        // var index = parent.layer.getFrameIndex(window.name);
+        // if(index){
+        // 	parent.layer.close(index);
+        // }else{
+        // 	//返回门户申报页面
+        // 	window.location.href = pagePath+"/index/#/projectList";
+        // 	//history.back(-2);
+        // }
+		history.back(-1);
     }
 
 	function changeType(obj){