供地审批代码提交

src/main/java/platform/modules/government/dto/IndustrialLandSupplyDto.java

@@ -67,4 +67,6 @@ public class IndustrialLandSupplyDto {
     //审批状态
     //审核信息
     //文件
+
+    private String user_type;
 }

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

@@ -3,7 +3,6 @@ package platform.modules.government.service;
 import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -606,7 +605,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 } else {
                     result.add(entity.getId().toString());
                 }
-             } else if (Objects.equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_LEADER_PASS, entity.getApprove_status())) {
+            } else if (Objects.equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_LEADER_PASS, entity.getApprove_status())) {
                 if (CommonUtils.isNull(entity.getFinal_result())) {
                     result.add(entity.getId().toString());
                 }
@@ -1271,7 +1270,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             for (IndustrialLandSupplyDistribution landSupplyDistribution : industrialLandSupplyDistributionList) {
                 //如果所有咨询都已回答 进入待汇总
                 if (!Objects.equals(landSupplyDistribution.getDepartment_id(), "0")) {
-                    if (CommonUtils.isNull(landSupplyDistribution.getFeedback()) || CommonUtils.isNull(landSupplyDistribution.getUpdate_by())) {
+                    if (CommonUtils.isNull(landSupplyDistribution.getUpdate_by())) {
                         sumbitToSummary = false;
                         break;
                     } else {

src/main/resources/mapper/government/IndustrialLandSupplyDetailDao.xml

@@ -11,11 +11,14 @@
         supply.location location,
         supply.accept_date accept_date,
         supply.approve_status approve_status,
-        supply.process_stage process_stage
+        supply.process_stage process_stage,
+        zuser.user_type user_type
         FROM
         industrial_land_supply supply
         LEFT JOIN
         z_approval approval ON approval.apply_id = supply.id AND approval.type = #{param.approval_type}
+        LEFT JOIN
+        z_user zuser ON zuser.id = supply.create_by
         WHERE
         1 = 1
         AND supply.del_flag !=1

src/main/resources/templates/admin/government/industrial_land_supply/add.html

@@ -92,7 +92,7 @@
                 </div>
             </div>
         </div>
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-secondary radius"><i class="Hui-iconfont">&#xe632;</i>保存草稿</a>
                 <a onclick="release()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>

src/main/resources/templates/admin/government/industrial_land_supply/commerce_approve.html

@@ -33,32 +33,29 @@
 
 <article class="page-container">
     <form class="form form-horizontal" id="form-add">
-
+        <input type="hidden" name="id" th:value="${data.id}"/>
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <input id="id" name="id" type="hidden" th:value="${data.id}"/>
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -82,15 +79,23 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">补充信息：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <textarea id="supplement" name="supplement" required></textarea>
+                <textarea id="supplement" name="supplement" required>[[${data.supplement}]]</textarea>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>补充附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
                 <div class="uploader-thum-container">
-                    <div id="fileListPre" class="uploader-list"></div>
-                    <div id="filePicker">选择文件</div>
+                    <div id="fileListPre" class="uploader-list">
+                        <th:block th:unless="${data.supplement_file==null || data.supplement_file.file_url== null}">
+                            <a th:href=" ${fileUrl} + ${data.supplement_file.file_url}" target="_blank">[[${data.supplement_file.file_name}]]</a>
+                        </th:block>
+                    </div>
+                    <div id="filePicker">上传</div>
+                    <th:block th:switch = "${data.fileDown==null || data.fileDown.file_url== null}" >
+                         <input th:case="true" type="hidden" name="fileDown.file_id" id="files">
+                        <input th:case="false" type="hidden" name="fileDown.file_id" id="files" th:value="${data.fileDown.file_id}">
+                    </th:block>
                 </div>
             </div>
         </div>
@@ -168,7 +173,7 @@
             </div>
         </div>
     </form>
-    <div class="row cl text-c" style="margin-top: 15px;">
+    <div class="row cl text-c" style="margin-top: 15px;background-color: white">
         <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
 
             <a onclick="save()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>
@@ -313,8 +318,8 @@
         });
     });
 
-    var departmentList = [[${departmentList}]];
-    var index = departmentList.length;
+    var consulDepartmentList = [[${consulDepartmentList}]];
+    var index = consulDepartmentList.length;
 
     function addFileLine(divId) {
         var length = index;

src/main/resources/templates/admin/government/industrial_land_supply/detail.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -179,7 +177,7 @@
                             </td>
                         </tr>
                         <tr class="text-c">
-                            <td>商务局分管领导</td>
+                            <td>管委会分管领导</td>
                             <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
                                 th:data="*{data.committee_leader_pre_approve_operate}"></td>
                             <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
@@ -256,7 +254,8 @@
                         <div class="uploader-list">
                             <th:block
                                     th:unless="${data.distribution_summary_file==null || data.distribution_summary_file.file_url== null}">
-                                <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.distribution_summary_file.file_url}"
+                                <a style="color: #0c80fe;"
+                                   th:href="${fileUrl} + ${data.distribution_summary_file.file_url}"
                                    target="_blank">[[${data.distribution_summary_file.file_name}]]</a>
                             </th:block>
                         </div>
@@ -265,6 +264,7 @@
             </div>
 
             <th:block th:if="${data.joint_trial}">
+
                 <div class="line">专题会审</div>
                 <div class="row cl">
                     <label class="form-label col-xs-4 col-sm-2"><span>会审资料：</span></label>
@@ -296,72 +296,72 @@
                         </div>
                     </div>
                 </div>
+
             </th:block>
 
-                <div class="line">供地审批</div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>审批结果：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div>
-                            [[${data.land_supply_result}]]
-                        </div>
+            <div class="line">供地审批</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>审批结果：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div>
+                        [[${data.land_supply_result}]]
                     </div>
                 </div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>审批意见：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div>
-                            [[${data.land_supply_comment}]]
-                        </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>审批意见：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div>
+                        [[${data.land_supply_comment}]]
                     </div>
                 </div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>文件：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div class="uploader-thum-container">
-                            <div class="uploader-list">
-                                <th:block
-                                        th:unless="${data.land_supply_file==null || data.land_supply_file.file_url== null}">
-                                    <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.land_supply_file.file_url}"
-                                       target="_blank">[[${data.land_supply_file.file_name}]]</a>
-                                </th:block>
-                            </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>文件：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div class="uploader-thum-container">
+                        <div class="uploader-list">
+                            <th:block
+                                    th:unless="${data.land_supply_file==null || data.land_supply_file.file_url== null}">
+                                <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.land_supply_file.file_url}"
+                                   target="_blank">[[${data.land_supply_file.file_name}]]</a>
+                            </th:block>
                         </div>
                     </div>
                 </div>
+            </div>
 
-                <div class="line">最终信息</div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>审批结果：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div>
-                            [[${data.final_result}]]
-                        </div>
+            <div class="line">最终信息</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>审批结果：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div>
+                        [[${data.final_result}]]
                     </div>
                 </div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>审批意见：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div>
-                            [[${data.final_comment}]]
-                        </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>审批意见：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div>
+                        [[${data.final_comment}]]
                     </div>
                 </div>
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2"><span>文件：</span></label>
-                    <div class="formControls col-xs-8 col-sm-9">
-                        <div class="uploader-thum-container">
-                            <div class="uploader-list">
-                                <th:block
-                                        th:unless="${data.final_file==null || data.final_file.file_url== null}">
-                                    <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.final_file.file_url}"
-                                       target="_blank">[[${data.final_file.file_name}]]</a>
-                                </th:block>
-                            </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span>文件：</span></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <div class="uploader-thum-container">
+                        <div class="uploader-list">
+                            <th:block
+                                    th:unless="${data.final_file==null || data.final_file.file_url== null}">
+                                <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.final_file.file_url}"
+                                   target="_blank">[[${data.final_file.file_name}]]</a>
+                            </th:block>
                         </div>
                     </div>
                 </div>
-            </th:block>
+            </div>
 
             <div class="line">流程信息</div>
             <div class="row cl">
@@ -393,14 +393,13 @@
 
         </th:block>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
-                <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>
+                <a onClick="removeIframe();" class="btn btn-default radius">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>
             </div>
         </div>
     </form>
 </article>
-<script type="text/javascript" th:src="@{/h-ui/lib/webuploader/0.1.5/webuploader.min.js}"></script>
 <script th:inline="javascript">
 
     $(function () {

src/main/resources/templates/admin/government/industrial_land_supply/distribute.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -177,7 +175,7 @@
                         </td>
                     </tr>
                     <tr class="text-c">
-                        <td>商务局分管领导</td>
+                        <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
                             th:data="*{data.committee_leader_pre_approve_operate}"></td>
                         <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
@@ -208,8 +206,9 @@
                            th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                     <input class="uploadFileId" type="hidden"
                            th:name="'distributionList[20].distribution_file.file_id'"/>
-                    <input type="hidden" value="0"
+                    <input class="departmentId" type="hidden" value="0"
                            th:name="'distributionList[20].department_id'"/>
+                    <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                 </div>
             </div>
         </div>
@@ -223,14 +222,15 @@
                                th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                         <input class="uploadFileId" type="hidden"
                                th:name="'distributionList['+${itemStat.index}+'].distribution_file.file_id'"/>
-                        <input type="hidden" th:value="${item.id}"
+                        <input class="departmentId" type="hidden" th:value="${item.id}"
                                th:name="'distributionList['+${itemStat.index}+'].department_id'"/>
+                        <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                     </div>
                 </div>
             </div>
         </th:block>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-secondary radius"><i class="Hui-iconfont">&#xe632;</i>提交</a>
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>
@@ -269,6 +269,14 @@
         layer_show('添加文件', pagePath + url, 800, 350);
     }
 
+    function deleteFile(item) {
+        $(item).parent().find(".uploadFileName").val("上传文件")
+        $(item).parent().find(".uploadFileId").val(null)
+        // console.log($(item).parent().find(".uploadFileName").val("上传文件"))
+        // console.log($(item).parent().find(".uploadFileId").val(null))
+        // console.log($(item).parent().find(".departmentId"))
+    }
+
     $(function () {
         //查看完整意见
         $(".viewComment").on("click", function () {

src/main/resources/templates/admin/government/industrial_land_supply/distribute_feedback.html

@@ -30,29 +30,27 @@
 
     <form class="form form-horizontal">
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -184,7 +182,7 @@
             </div>
         </th:block>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>

src/main/resources/templates/admin/government/industrial_land_supply/distribute_summary.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -177,7 +175,7 @@
                         </td>
                     </tr>
                     <tr class="text-c">
-                        <td>商务局分管领导</td>
+                        <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
                             th:data="*{data.committee_leader_pre_approve_operate}"></td>
                         <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
@@ -303,7 +301,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-secondary radius"><i class="Hui-iconfont">&#xe632;</i>提交</a>
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>

src/main/resources/templates/admin/government/industrial_land_supply/edit.html

@@ -146,7 +146,7 @@
             </div>
         </div>
     </form>
-    <div class="row cl text-c" style="margin-top: 15px;">
+    <div class="row cl text-c" style="margin-top: 15px;background-color: white">
         <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
 
             <a onclick="save()" class="btn btn-secondary radius"

src/main/resources/templates/admin/government/industrial_land_supply/feedback.html

@@ -30,29 +30,27 @@
 
     <form class="form form-horizontal">
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -138,7 +136,7 @@
             <div class="line"></div>
         </th:block>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>

src/main/resources/templates/admin/government/industrial_land_supply/feedback_append.html

@@ -35,29 +35,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -137,7 +135,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c" style="margin-top: 15px;">
+        <div class="row cl text-c" style="margin-top: 15px; background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
 
                 <a onclick="save()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>
@@ -181,8 +179,8 @@
     }
 
 
-    var departmentList = [[${departmentList}]];
-    var index = departmentList.length;
+    var consulDepartmentList = [[${consulDepartmentList}]];
+    var index = consulDepartmentList.length;
 
     function addFileLine(divId) {
         var length = index;

src/main/resources/templates/admin/government/industrial_land_supply/feedback_withdraw.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -139,7 +137,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>
             </div>

src/main/resources/templates/admin/government/industrial_land_supply/index.html

@@ -115,9 +115,21 @@
 
                     <th:block th:if="${type=='1'}">
 
-                        <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
-                           th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
-                           th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+                        <th:block th:if="*{user_type=='0'}">
+
+                            <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
+                               th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+
+                        </th:block>
+
+                        <th:block th:if="*{user_type=='4'}">
+
+                            <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/commerce_approve/'+*{id}+'\');'"
+                               th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+
+                        </th:block>
 
                         <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'1')}">
 
@@ -161,9 +173,9 @@
                                th:onclick="'javascript:jump_to(\'预审审批\',\'/land_supply/pre_approve/'+*{id}+'\');'"
                                th:if="*{approve_status=='11'}">预审审批</a>
 
-                            <a title="供地审批" href="javascript:;" class="ml-5" style="text-decoration:none"
-                               th:onclick="'javascript:jump_to(\'供地审批\',\'/land_supply/land_approve/'+*{id}+'\');'"
-                               th:if="*{approve_status=='17'}">供地审批</a>
+<!--                            <a title="供地审批" href="javascript:;" class="ml-5" style="text-decoration:none"-->
+<!--                               th:onclick="'javascript:jump_to(\'供地审批\',\'/land_supply/land_approve/'+*{id}+'\');'"-->
+<!--                               th:if="*{approve_status=='17'}">供地审批</a>-->
 
                         </th:block>
 
@@ -175,13 +187,13 @@
 
                         </th:block>
 
-                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'6')}">
+<!--                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'6')}">-->
 
-                            <a title="反馈商务局" href="javascript:;" class="ml-5" style="text-decoration:none"
-                               th:onclick="'javascript:jump_to(\'反馈商务局\',\'/land_supply/distribute_feedback/'+*{id}+'\');'"
-                            >反馈商务局</a>
+<!--                            <a title="反馈商务局" href="javascript:;" class="ml-5" style="text-decoration:none"-->
+<!--                               th:onclick="'javascript:jump_to(\'反馈商务局\',\'/land_supply/distribute_feedback/'+*{id}+'\');'"-->
+<!--                            >反馈商务局</a>-->
 
-                        </th:block>
+<!--                        </th:block>-->
 
                         <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'7')}">
 
@@ -197,9 +209,9 @@
                                th:onclick="'javascript:jump_to(\'分发汇总\',\'/land_supply/distribute_summary/'+*{id}+'\');'"
                                th:if="*{approve_status=='16'}">分发汇总</a>
 
-                            <a title="最终信息" href="javascript:;" class="ml-5" style="text-decoration:none"
-                               th:onclick="'javascript:jump_to(\'最终信息\',\'/land_supply/land_approve/'+*{id}+'\');'"
-                               th:if="*{approve_status=='18'}">最终信息</a>
+<!--                            <a title="最终信息" href="javascript:;" class="ml-5" style="text-decoration:none"-->
+<!--                               th:onclick="'javascript:jump_to(\'最终信息\',\'/land_supply/land_approve/'+*{id}+'\');'"-->
+<!--                               th:if="*{approve_status=='18'}">最终信息</a>-->
 
                         </th:block>
 

src/main/resources/templates/admin/government/industrial_land_supply/land_approve.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -177,7 +175,7 @@
                         </td>
                     </tr>
                     <tr class="text-c">
-                        <td>商务局分管领导</td>
+                        <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
                             th:data="*{data.committee_leader_pre_approve_operate}"></td>
                         <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
@@ -379,7 +377,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c" style="color: #FFFFFF">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="audit(2,3)" class="btn btn-secondary radius"
                    th:if="*{data.approve_status=='17'}">通过</a>

src/main/resources/templates/admin/government/industrial_land_supply/pre_approve.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -199,7 +197,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="audit(2,1)" class="btn btn-primary radius"
                    th:if="*{data.approve_status=='8'}">通过 </a>

src/main/resources/templates/admin/government/industrial_land_supply/summary.html

@@ -30,29 +30,27 @@
     <form class="form form-horizontal">
 
         <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.process_stage_desc}]]</p>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
-            <div class="formControls col-xs-4 col-sm-4">
-                <p>[[${data?.approve_status_desc}]]</p>
-            </div>
-        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-4 col-sm-2">
                 <p>[[${data?.title}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目用地：</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls col-xs-8 col-sm-2">
                 <p>[[${data?.location}]]</p>
             </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>项目介绍：</span></label>
@@ -148,7 +146,7 @@
             </div>
         </div>
 
-        <div class="row cl text-c">
+        <div class="row cl text-c" style="background-color: white">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <a onclick="save()" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe632;</i>提交 </a>
                 <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>