储备项目库

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -13,6 +13,7 @@ import com.rtrh.projects.modules.projects.po.SubLabel;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
+import com.rtrh.projects.vo.subject.MoveDbParamVo;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
 
 public interface SubInfoService {
@@ -398,4 +399,6 @@ public interface SubInfoService {
 	List<String> selectAllSubInfoIds();
 
 	SubInfoGxj findById(String subId);
+
+	boolean moveDb(MoveDbParamVo vo);
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -1347,6 +1347,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
 		sql.append(" AND ( wamf.file_type=101 OR wamf.file_type= 102 OR wamf.file_type =203) ORDER BY wamf.create_time desc LIMIT 1 ");
 		sql.append(" ) fileId ");*/
         sql.append(", a.work_space_img fileId ");
+        sql.append(", a.tc_date tcDate ");
 
         if (Boolean.TRUE.equals(queryVO.getApp())) {
             sql.append(", NOT ISNULL(sc.id) as isAttention ");

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -22,6 +22,7 @@ import com.rtrh.projects.modules.system.po.*;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.util.TargetDataSource;
 import com.rtrh.projects.vo.SubIdVO;
+import com.rtrh.projects.vo.subject.MoveDbParamVo;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.criterion.Criterion;
@@ -4697,6 +4698,13 @@ public class SubInfoServiceImpl implements SubInfoService {
         return subInfo;
     }
 
+    @Override
+    public boolean moveDb(MoveDbParamVo vo) {
+        SubInfo subinfo = subInfoDao.findById(vo.getId());
+        int i = subInfoDao.updateBySql("update sub_info set status='" + vo.getStatus() + "' where id='" + vo.getId() + "'");
+        return i > 0;
+    }
+
 
     public List<SubLabel> getSubLabels(SubLabelAddVO vo) {
         List<SubLabel> labelList = subLabelDao.findByCon(vo);

projects-service/src/main/java/com/rtrh/projects/vo/subject/MoveDbParamVo.java

@@ -0,0 +1,10 @@
+package com.rtrh.projects.vo.subject;
+
+import lombok.Data;
+
+@Data
+public class MoveDbParamVo {
+    private String id;
+
+    private String status;
+}

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -348,7 +348,7 @@ public class SubInfoApiController extends BaseController {
     public Message prejudge(@RequestBody SubInfoJsonGetVO getVO) {
         Message message = new Message();
         try {
-            SubJudge infoVO =subJudgeService.getBySubId(getVO.getId());
+            SubJudge infoVO = subJudgeService.getBySubId(getVO.getId());
             message.setData(infoVO);
         } catch (Exception e) {
             logger.error("", e);
@@ -366,7 +366,7 @@ public class SubInfoApiController extends BaseController {
     public Message prejudge(@RequestBody SubJudge vo) {
         Message message = new Message();
         try {
-            subJudgeService.saveOrUpate(vo,getCurUser().getLoginUser());
+            subJudgeService.saveOrUpate(vo, getCurUser().getLoginUser());
         } catch (Exception e) {
             logger.error("", e);
             message.add("保存失败");
@@ -675,7 +675,7 @@ public class SubInfoApiController extends BaseController {
     public Message getPreLogList(@RequestBody SubIdVO subIdVO) {
         Message message = new Message();
         try {
-            List<SubPreLog> lst = subPreLogDao.ListAll(subIdVO.getSubId(),subIdVO.getFlowId());
+            List<SubPreLog> lst = subPreLogDao.ListAll(subIdVO.getSubId(), subIdVO.getFlowId());
             message.setData(lst);
         } catch (Exception e) {
             logger.error("", e);
@@ -987,7 +987,7 @@ public class SubInfoApiController extends BaseController {
                 if ("1".equals(vo.getIsMajor())) {
                     subKeyDao.saveOrUpdate(new SubKey().setId(Identities.uuid()).setSubId(vo.getSubId()).setCat("1").setYear(DateUtils.GetCurYear()).setCreateUserId(userVO.getId()).setCreateTime(new Date()));
                 } else {
-                    List list = subKeyDao.queryForClsListBySql("select a.Id from sub_key a where sub_id='" + vo.getSubId() + "' and cat=1  and year=" + DateUtils.GetCurYear(),SubKey.class);
+                    List list = subKeyDao.queryForClsListBySql("select a.Id from sub_key a where sub_id='" + vo.getSubId() + "' and cat=1  and year=" + DateUtils.GetCurYear(), SubKey.class);
                     subKeyDao.deleteAll(list);
                 }
                 subinfo.setStatusZd(vo.getIsMajor().equals("1") ? "1" : "0");
@@ -1071,7 +1071,7 @@ public class SubInfoApiController extends BaseController {
                 if ("1".equals(vo.getIsFix())) {
                     subFixDao.saveOrUpdate(new SubFix().setId(Identities.uuid()).setSubId(vo.getSubId()).setCat(vo.getStateFix()).setYear(vo.getYear()).setCreateUserId(userVO.getId()).setCreateTime(new Date()));
                 } else {
-                    List list = subFixDao.queryForClsListBySql("select a.Id from sub_fix a where sub_id='" + vo.getSubId() + "' and year=" + vo.getYear(),SubFix.class);
+                    List list = subFixDao.queryForClsListBySql("select a.Id from sub_fix a where sub_id='" + vo.getSubId() + "' and year=" + vo.getYear(), SubFix.class);
                     subFixDao.deleteAll(list);
                 }
             }
@@ -1183,6 +1183,20 @@ public class SubInfoApiController extends BaseController {
         return message;
     }
 
+    @PostMapping(value = "/moveDb")
+    public Message moveDb(@RequestBody MoveDbParamVo vo) {
+        Message message = new Message();
+        try {
+            boolean isSuccess = subInfoService.moveDb(vo);
+            message.add(isSuccess ? "移入成功" : "移入失败");
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("移入失败");
+        }
+
+        return message;
+    }
+
 
     /**
      * 项目前期按部门查询
@@ -1313,13 +1327,13 @@ public class SubInfoApiController extends BaseController {
     }
 
     @PostMapping("/importFixData")
-    public Message importFixData(MultipartFile file, String stateFix,String year) {
+    public Message importFixData(MultipartFile file, String stateFix, String year) {
         Message message = new Message();
         try {
             ImportParams importParams = new ImportParams();
             importParams.setHeadRows(2);
             List<SubInfoFixVO> list = ExcelImportUtil.importExcel(file.getInputStream(), SubInfoFixVO.class, importParams);
-            subInfoService.importFixData(list, getCurUser().getLoginUser(), stateFix,year);
+            subInfoService.importFixData(list, getCurUser().getLoginUser(), stateFix, year);
         } catch (Exception e) {
             logger.error("", e);
             message.addError(e.getMessage());
@@ -1337,8 +1351,8 @@ public class SubInfoApiController extends BaseController {
         /*return subInfoService.addLabelS(vo);*/
         Message message = new Message();
         Page pageData = subInfoQueryService.pageAll(null, getCurUser().getLoginUser(), vo.getParam());
-        if(pageData.getList().size()>0){
-            subInfoService.addLabelS(vo,pageData.getList());
+        if (pageData.getList().size() > 0) {
+            subInfoService.addLabelS(vo, pageData.getList());
         }
 /*        List<SubLabel> subLabels = subInfoService.getSubLabels(vo);
         List<String> collect = new ArrayList<>();

projects/src/main/webapp/vmodules/subject/subInfo/editSubInfo.jsp

@@ -411,18 +411,18 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-row">
-                        <div class="layui-col-xs12 layui-col-sm12">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label required"
-                                >项目基本情况</label>
-                                <div class="layui-input-block">
-                                    <textarea required lay-verify="required" autocomplete="off" class="layui-textarea"
-                                              v-model="subInfo.content"></textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+<%--                    <div class="layui-row">--%>
+<%--                        <div class="layui-col-xs12 layui-col-sm12">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label required"--%>
+<%--                                >项目基本情况</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <textarea required lay-verify="required" autocomplete="off" class="layui-textarea"--%>
+<%--                                              v-model="subInfo.content"></textarea>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
                     <div class="layui-row">
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                             <div class="layui-form-item">

projects/src/main/webapp/vmodules/subject/subInfo/tz/cb.jsp

@@ -102,6 +102,11 @@
                  style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center; font-weight: bold;">
                 储备项目库
             </div>
+            <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
+                <button type="button" class="layui-btn">导出明细</button>
+                <button type="button" class="layui-btn">导出总表</button>
+                <button type="button" class="layui-btn">自定义导出</button>
+            </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
                     <div class="layui-colla-content layui-show">
@@ -138,19 +143,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                                                    <div class="layui-form-item">
-                                                                        <label class="layui-form-label label-longers required" style="width: 100px;">金额(万元)</label>
-                                                                        <div class="layui-input-block time_box">
-                                                                            <input type="text" id="startAmt" name="startAmt"
-                                                                                   placeholder="请输入最小金额"
-                                                                                   autocomplete="off" class="layui-input" value="${minAmt}">
-                                                                            <span class="split_txt">至</span>
-                                                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                                                   autocomplete="off" class="layui-input" value="${maxAmt}">
-                                                                        </div>
-                                                                    </div>
-                                                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资</label>
@@ -617,7 +609,11 @@
             light: null,
             sort: {field: "abc", type: ""},
             pageSize: 10,
-            showExport: false
+            showExport: false,
+            moveDbParam:{
+                moveStatus: "",
+                moveId: ""
+            }
         },
         mounted: function () {
             this.init()
@@ -627,11 +623,18 @@
                 layui.layer.closeAll(); // 关闭所有弹框
             },
             confirmMove: function () {
-                console.log("移入")
+                let param = this.moveDbParam
+                App.postJson("/api/subject/subInfo/moveDb",param, (res)=>{
+                    App.msg.success(res.msg);
+                })
                 this.closeAllLayers();
             },
             init: function () {
                 let self = this;
+                layui.form.on("select(moveStatus)", function (data) {
+                    self.moveStatus = data.value;
+                });
+
                 App.postJson("/api/dict/query/index", {}, function (res) {
                     self.JSDD = res.data.JSDD;
                 })
@@ -1032,11 +1035,10 @@
                     });
                 });
             },
+
             move (obj) {
-                let id = obj.data.id
-                let cbStatus = obj.data.cbStatus
-                console.log(id,cbStatus)
-                console.log("+++++++++++++++")
+                this.moveDbParam.moveId = obj.data.id
+                this.moveDbParam.moveStatus = obj.data.cbStatus
                 layer.open({
                     type: 1,
                     title: '标题',
@@ -1050,8 +1052,8 @@
                                 '<div class="layui-form-item">' +
                                     '<label class="layui-form-label">移入到：</label>' +
                                     '<div class="layui-input-block">' +
-                                        '<select name="moveStatus">' +
-                                            '<option value="1">储备</option>' +
+                                        '<select v-model="subInfo.status" lay-filter="moveStatus" lay-verify="required">' +
+                                            '<option value="">请选择</option>' +
                                             '<option value="2">新建</option>' +
                                             '<option value="3">在建</option>' +
                                             '<option value="9">投产</option>' +

projects/src/main/webapp/vmodules/subject/subInfo/tz/cb_sum.jsp

@@ -704,33 +704,38 @@
 </script>
 <script type="text/html" id="toolBar">
     <div class="toolBar">
-        <span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>
-        <c:if test="${isHydw}">
-            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>
-            <%--      <span title="问题督办" lay-event="problem" class="no-wrap">&nbsp;问题督办</span>--%>
-        </c:if>
-        {{# if(d.unitId == "${currUnitId}") { }}
-        <span title="原因录入" lay-event="setSubReason" class="no-wrap">&nbsp;原因录入</span>
-        {{#}}}
-
+        <span title="项目查询" lay-event="toDetail" class="no-wrap">项目查询</span>
         {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}
-        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>
+        <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
-        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>
-        <%--	{{# if("${currUser.edit}" == 'true') { }}--%>
-        <%--	{{# if(d.status != '0' && d.status != '6' && d.status != '7' && d.status != '8' && d.status != '9' && d.status != 'A') { }}--%>
-        <%--		<span title="退回暂存" lay-event="toTh">&nbsp;退回暂存</span>--%>
-        <%--	{{#}}}--%>
-        <%--	{{#} }}--%>
-        <span title="手续办理" lay-event="preNew" class="no-wrap">&nbsp;手续办理</span>
-        <c:if test="${admin || isSfgw}">
-     <%--       {{# if(d.isHide == "1") { }}
-            <span title="取消在建库" lay-event="isNoHide" class="no-wrap">&nbsp;取消在建库</span>
-            {{#} else { }}--%>
-            <span title="移入在建库" lay-event="isHide" class="no-wrap">&nbsp;移入在建库</span>
-   <%--         {{#} }}--%>
-            <span title="移入新建库" lay-event="setIsNew" class="no-wrap">&nbsp;移入新建库</span>
-        </c:if>
+        <span title="移入" lay-event="move" class="no-wrap">移入</span>
+<%--        <span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>--%>
+<%--        <c:if test="${isHydw}">--%>
+<%--            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>--%>
+<%--            &lt;%&ndash;      <span title="问题督办" lay-event="problem" class="no-wrap">&nbsp;问题督办</span>&ndash;%&gt;--%>
+<%--        </c:if>--%>
+<%--        {{# if(d.unitId == "${currUnitId}") { }}--%>
+<%--        <span title="原因录入" lay-event="setSubReason" class="no-wrap">&nbsp;原因录入</span>--%>
+<%--        {{#}}}--%>
+
+<%--        {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}--%>
+<%--        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>--%>
+<%--        {{#} }}--%>
+<%--        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>--%>
+<%--        &lt;%&ndash;	{{# if("${currUser.edit}" == 'true') { }}&ndash;%&gt;--%>
+<%--        &lt;%&ndash;	{{# if(d.status != '0' && d.status != '6' && d.status != '7' && d.status != '8' && d.status != '9' && d.status != 'A') { }}&ndash;%&gt;--%>
+<%--        &lt;%&ndash;		<span title="退回暂存" lay-event="toTh">&nbsp;退回暂存</span>&ndash;%&gt;--%>
+<%--        &lt;%&ndash;	{{#}}}&ndash;%&gt;--%>
+<%--        &lt;%&ndash;	{{#} }}&ndash;%&gt;--%>
+<%--        <span title="手续办理" lay-event="preNew" class="no-wrap">&nbsp;手续办理</span>--%>
+<%--        <c:if test="${admin || isSfgw}">--%>
+<%--     &lt;%&ndash;       {{# if(d.isHide == "1") { }}--%>
+<%--            <span title="取消在建库" lay-event="isNoHide" class="no-wrap">&nbsp;取消在建库</span>--%>
+<%--            {{#} else { }}&ndash;%&gt;--%>
+<%--            <span title="移入在建库" lay-event="isHide" class="no-wrap">&nbsp;移入在建库</span>--%>
+<%--   &lt;%&ndash;         {{#} }}&ndash;%&gt;--%>
+<%--            <span title="移入新建库" lay-event="setIsNew" class="no-wrap">&nbsp;移入新建库</span>--%>
+<%--        </c:if>--%>
 
     </div>
 </script>
@@ -1104,11 +1109,20 @@
                 param.orderBy = this.sort.field;
                 param.orderType = this.sort.type || "asc";
                 param = Object.assign(param, ${sumParams});
-                App.postJson("/api/subInfo/query/all", param, function (res) {
+
+                param.status = 1;
+                App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
                     self.loadPage(res.total);
                     self.loadTable();
                 });
+
+
+                // App.postJson("/api/subInfo/query/all", param, function (res) {
+                //     self.dataList = res.rows;
+                //     self.loadPage(res.total);
+                //     self.loadTable();
+                // });
                 App.postJson("/api/subInfo/query/beginRate", param, function (res) {
                     if (res.success) {
                         self.beginRate = res.data;
@@ -1186,7 +1200,7 @@
                     cols: [[ // 设置表头
                         {type: 'numbers', fixed: 'left', align: 'center', width: 44, title: '序号'},
                         {field: 'subName', fixed: 'left', title: '项目名称', width: 200, templet: '#subName'},
-                        {
+                        /*{
                             field: 'abc',
                             type: 'string',
                             title: 'ABC',
@@ -1200,7 +1214,7 @@
                         // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort:"amtTotal"},
                         // {field: 'offset', title: '偏离度-%', width: 100},
                         // {field: 'fileId', title: '现场影像', width: 150, templet:'#imageDiv'},
-                        /*  {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},*/
+                        /!*  {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},*!/
                         {field: 'xmbaStatus', title: '计划时间', width: 160, templet: '#date'},
                         {field: 'xmbaStatus', title: '总投资', width: 245, templet: '#amtTotal'},
                         {field: 'indusKindName', title: '所属行业', width: 115},
@@ -1209,7 +1223,7 @@
                         {field: 'unitName', title: '项目单位', minWidth: 150},
                         // {field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight'},
                         // {field: 'statusName', title: '项目进度', width: 200},
-                   /*     {
+                   /!*     {
                             field: 'isHide',
                             type: 'string',
                             title: '在建库',
@@ -1223,7 +1237,15 @@
                                 }
                                 return "";
                             }
-                        },*/
+                        },*!/*/
+                        {field: 'subjectName', fixed: 'left', title: '项目所在地', width: 200},
+                        {
+                            field: 'amtTotal', fixed: 'left', title: '项目建设内容（亿元）', width: 200, templet: function (d) {
+                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            }
+                        },
+                        {field: 'progress', fixed: 'left', title: '进展情况', width: 200},
+                        {field: 'remark', fixed: 'left', title: '备注', width: 200},
                         {title: '操作', width: 225, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/end.jsp

@@ -77,6 +77,11 @@
         <div class="right_title">
  <%--           <span class="txt">竣工项目库</span>--%>
             <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">竣工项目库</div>
+     <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
+         <button type="button" class="layui-btn">导出明细</button>
+         <button type="button" class="layui-btn">导出总表</button>
+         <button type="button" class="layui-btn">自定义导出</button>
+     </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
                     <%--						<%--                    <h2 class="layui-colla-title">筛选</h2>--%>
@@ -84,6 +89,61 @@
                         <form class="layui-form" lay-filter="searchForm" id="searchForm">
                             <input type="hidden" name="queryType" value="4">
                             <div class="layui-row">
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">项目名称</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <input type="text" name="subName" placeholder="请输入" autocomplete="off"--%>
+<%--                                                   class="layui-input">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3" style="display: none">--%>
+<%--                                    <div class="layui-form-item" style="height:28px;">--%>
+<%--                                        <label class="layui-form-label label-longers required">项目类型</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <div id="kind" name="kind"></div>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required" style="width: 100px;">金额(万元)</label>--%>
+<%--                                        <div class="layui-input-block time_box">--%>
+<%--                                            <input type="text" id="startAmt" name="startAmt" placeholder="请输入最小金额"--%>
+<%--                                                   autocomplete="off" class="layui-input" value="${minAmt}">--%>
+<%--                                            <span class="split_txt">至</span>--%>
+<%--                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"--%>
+<%--                                                   autocomplete="off" class="layui-input" value="${maxAmt}">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">建设性质</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <select name="propKind">--%>
+<%--                                                <option value="">请选择</option>--%>
+<%--                                                <c:forEach items="${JSXZ}" var="js">--%>
+<%--                                                    <option value="${js.code }">${js.title }</option>--%>
+<%--                                                </c:forEach>--%>
+<%--                                            </select>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">建设地点</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <select name="subjectId">--%>
+<%--                                                <option value="">请选择</option>--%>
+<%--                                                <c:forEach items="${JSDD }" var="hy">--%>
+<%--                                                    <option value="${hy.code }">${hy.title }</option>--%>
+<%--                                                </c:forEach>--%>
+<%--                                            </select>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required">项目名称</label>
@@ -93,42 +153,9 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3" style="display: none">
-                                    <div class="layui-form-item" style="height:28px;">
-                                        <label class="layui-form-label label-longers required">项目类型</label>
-                                        <div class="layui-input-block">
-                                            <div id="kind" name="kind"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required" style="width: 100px;">金额(万元)</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="startAmt" name="startAmt" placeholder="请输入最小金额"
-                                                   autocomplete="off" class="layui-input" value="${minAmt}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                   autocomplete="off" class="layui-input" value="${maxAmt}">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设性质</label>
-                                        <div class="layui-input-block">
-                                            <select name="propKind">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${JSXZ}" var="js">
-                                                    <option value="${js.code }">${js.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设地点</label>
+                                        <label class="layui-form-label required label-longers">项目属地</label>
                                         <div class="layui-input-block">
                                             <select name="subjectId">
                                                 <option value="">请选择</option>
@@ -141,168 +168,212 @@
                                 </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">所属行业</label>
+                                        <label class="layui-form-label required label-longers">行业类别</label>
                                         <div class="layui-input-block">
                                             <div id="indusKind"></div>
                                         </div>
                                     </div>
                                 </div>
-
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">投资类型</label>
-                                        <div class="layui-input-block">
-                                            <select name="kindNature">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${TZXZ }" var="hy">
-                                                    <option value="${hy.code }">${hy.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-            <%--                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">项目单位名称</label>
-                                        <div class="layui-input-block">
-                                            <input name="sbdw" class="layui-input" value="${unitName }">
-                                        </div>
-                                    </div>
-                                </div>--%>
-                                <c:if test="${currUser.statusProj == 1 }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers required">行业单位</label>
-                                            <div class="layui-input-block">
-                                                <select name="hydw" lay-search>
-                                                    <option value="">--请选择--</option>
-                                                    <c:forEach items="${HYDW }" var="hy">
-                                                        <option value="${ hy.id}">${hy.title }</option>
-                                                    </c:forEach>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <%--									<c:if test="${isHydw}">--%>
-                                <%--										<div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-                                <%--											<div class="layui-form-item">--%>
-                                <%--												<label class="layui-form-label required" >灯色：</label>--%>
-                                <%--												<div class="layui-input-block">--%>
-                                <%--													<div id="light"></div>--%>
-                                <%--												</div>--%>
-                                <%--											</div>--%>
-                                <%--										</div>--%>
-                                <%--									</c:if>--%>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers queryTimeType" style="width: 130px;">
-                                            <select name="queryTimeType">
-                                                <option value="">建设日期</option>
-                                                <option value="1">计划开工日期</option>
-                                                <option value="2">计划结束日期</option>
-                                                <option value="3">创建日期</option>
-                                            </select>
-                                        </label>
-                                        <div class="layui-input-block time_box" style="margin-left:120px">
-                                            <input type="text" id="startTime" name="rangeDate" placeholder="请选择时间段"
-                                                   autocomplete="off" class="layui-input" style="margin-left: 20px;">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers" style="width: 100px;">完成比例(%)</label>
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资</label>
                                         <div class="layui-input-block time_box">
-                                            <input type="number" name="endBl" placeholder="请填写最小完成比例" autocomplete="off"
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
+                                                   autocomplete="off"
                                                    class="layui-input">
                                             <span class="split_txt">至</span>
-                                            <input type="number" name="endBlPlus" placeholder="请填写最大完成比例"
-                                                   autocomplete="off" class="layui-input">
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">资金来源</label>
+                                        <label class="layui-form-label label-longers">项目单位</label>
                                         <div class="layui-input-block">
-                                            <select name="zjly" lay-search="">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${ZJLY }" var="zj">
-                                                    <option value="${zj.id }">${zj.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <c:if test="${isHydw }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers ">是否分管</label>
-                                            <div class="layui-input-block">
-                                                <select name="blSub">
-                                                    <option value="false">所有项目</option>
-                                                    <option value="true">是</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <c:if test="${admin }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers required">在建库</label>
-                                            <div class="layui-input-block">
-                                                <select name="isHide">
-                                                    <option value="">所有</option>
-                                                    <option value="1">是</option>
-                                                    <option value="0">否</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">年份</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="year" readonly="readonly" name="year"
+                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
+                                                   autocomplete="off"
                                                    class="layui-input">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">月份</label>
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">升规入统时间</label>
                                         <div class="layui-input-block time_box">
-                                            <select id="month" name="month">
-                                                <option value="">请选择</option>
-                                                <option value="1">1月</option>
-                                                <option value="2">2月</option>
-                                                <option value="3">3月</option>
-                                                <option value="4">4月</option>
-                                                <option value="5">5月</option>
-                                                <option value="6">6月</option>
-                                                <option value="7">7月</option>
-                                                <option value="8">8月</option>
-                                                <option value="9">9月</option>
-                                                <option value="10">10月</option>
-                                                <option value="11">11月</option>
-                                                <option value="12">12月</option>
-                                            </select>
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
+                                                   autocomplete="off"
+                                                   class="layui-input">
+                                            <span class="split_txt">至</span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">所属行业</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <div id="indusKind"></div>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">投资类型</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <select name="kindNature">--%>
+<%--                                                <option value="">请选择</option>--%>
+<%--                                                <c:forEach items="${TZXZ }" var="hy">--%>
+<%--                                                    <option value="${hy.code }">${hy.title }</option>--%>
+<%--                                                </c:forEach>--%>
+<%--                                            </select>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+            <%--                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目单位</label>
+                                        <label class="layui-form-label label-longers required">项目单位名称</label>
                                         <div class="layui-input-block">
-                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
-                                                   autocomplete="off"
-                                                   class="layui-input">
+                                            <input name="sbdw" class="layui-input" value="${unitName }">
                                         </div>
                                     </div>
-                                </div>
+                                </div>--%>
+<%--                                <c:if test="${currUser.statusProj == 1 }">--%>
+<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                        <div class="layui-form-item">--%>
+<%--                                            <label class="layui-form-label label-longers required">行业单位</label>--%>
+<%--                                            <div class="layui-input-block">--%>
+<%--                                                <select name="hydw" lay-search>--%>
+<%--                                                    <option value="">--请选择--</option>--%>
+<%--                                                    <c:forEach items="${HYDW }" var="hy">--%>
+<%--                                                        <option value="${ hy.id}">${hy.title }</option>--%>
+<%--                                                    </c:forEach>--%>
+<%--                                                </select>--%>
+<%--                                            </div>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </c:if>--%>
+                                <%--									<c:if test="${isHydw}">--%>
+                                <%--										<div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
+                                <%--											<div class="layui-form-item">--%>
+                                <%--												<label class="layui-form-label required" >灯色：</label>--%>
+                                <%--												<div class="layui-input-block">--%>
+                                <%--													<div id="light"></div>--%>
+                                <%--												</div>--%>
+                                <%--											</div>--%>
+                                <%--										</div>--%>
+                                <%--									</c:if>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers queryTimeType" style="width: 130px;">--%>
+<%--                                            <select name="queryTimeType">--%>
+<%--                                                <option value="">建设日期</option>--%>
+<%--                                                <option value="1">计划开工日期</option>--%>
+<%--                                                <option value="2">计划结束日期</option>--%>
+<%--                                                <option value="3">创建日期</option>--%>
+<%--                                            </select>--%>
+<%--                                        </label>--%>
+<%--                                        <div class="layui-input-block time_box" style="margin-left:120px">--%>
+<%--                                            <input type="text" id="startTime" name="rangeDate" placeholder="请选择时间段"--%>
+<%--                                                   autocomplete="off" class="layui-input" style="margin-left: 20px;">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers" style="width: 100px;">完成比例(%)</label>--%>
+<%--                                        <div class="layui-input-block time_box">--%>
+<%--                                            <input type="number" name="endBl" placeholder="请填写最小完成比例" autocomplete="off"--%>
+<%--                                                   class="layui-input">--%>
+<%--                                            <span class="split_txt">至</span>--%>
+<%--                                            <input type="number" name="endBlPlus" placeholder="请填写最大完成比例"--%>
+<%--                                                   autocomplete="off" class="layui-input">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">资金来源</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <select name="zjly" lay-search="">--%>
+<%--                                                <option value="">请选择</option>--%>
+<%--                                                <c:forEach items="${ZJLY }" var="zj">--%>
+<%--                                                    <option value="${zj.id }">${zj.title }</option>--%>
+<%--                                                </c:forEach>--%>
+<%--                                            </select>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <c:if test="${isHydw }">--%>
+<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                        <div class="layui-form-item">--%>
+<%--                                            <label class="layui-form-label label-longers ">是否分管</label>--%>
+<%--                                            <div class="layui-input-block">--%>
+<%--                                                <select name="blSub">--%>
+<%--                                                    <option value="false">所有项目</option>--%>
+<%--                                                    <option value="true">是</option>--%>
+<%--                                                </select>--%>
+<%--                                            </div>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </c:if>--%>
+<%--                                <c:if test="${admin }">--%>
+<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                        <div class="layui-form-item">--%>
+<%--                                            <label class="layui-form-label label-longers required">在建库</label>--%>
+<%--                                            <div class="layui-input-block">--%>
+<%--                                                <select name="isHide">--%>
+<%--                                                    <option value="">所有</option>--%>
+<%--                                                    <option value="1">是</option>--%>
+<%--                                                    <option value="0">否</option>--%>
+<%--                                                </select>--%>
+<%--                                            </div>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </c:if>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">年份</label>--%>
+<%--                                        <div class="layui-input-block time_box">--%>
+<%--                                            <input type="text" id="year" readonly="readonly" name="year"--%>
+<%--                                                   class="layui-input">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers required">月份</label>--%>
+<%--                                        <div class="layui-input-block time_box">--%>
+<%--                                            <select id="month" name="month">--%>
+<%--                                                <option value="">请选择</option>--%>
+<%--                                                <option value="1">1月</option>--%>
+<%--                                                <option value="2">2月</option>--%>
+<%--                                                <option value="3">3月</option>--%>
+<%--                                                <option value="4">4月</option>--%>
+<%--                                                <option value="5">5月</option>--%>
+<%--                                                <option value="6">6月</option>--%>
+<%--                                                <option value="7">7月</option>--%>
+<%--                                                <option value="8">8月</option>--%>
+<%--                                                <option value="9">9月</option>--%>
+<%--                                                <option value="10">10月</option>--%>
+<%--                                                <option value="11">11月</option>--%>
+<%--                                                <option value="12">12月</option>--%>
+<%--                                            </select>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
+<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
+<%--                                    <div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label label-longers">项目单位</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"--%>
+<%--                                                   autocomplete="off"--%>
+<%--                                                   class="layui-input">--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams" style="display: flex">
                                     <div class="layui-form-item">
                                         <button type="button" class="layui-btn layui-btn-normal" @click="search">查询
@@ -611,22 +682,12 @@
 
 <script type="text/html" id="toolBar">
     <div class="toolBar">
-        <span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>
-        <c:if test="${isHydw}">
-            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>
-        </c:if>
-        {{# if("${currUser.edit}" == 'true') { }}
-        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>
-        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>
+        <span title="项目查询" lay-event="toDetail" class="no-wrap">项目查询</span>
+        {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}
+        <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
-        <c:if test="${admin}">
-            {{# if(d.isHide == "1") { }}
-            <span title="取消在建库" lay-event="isNoHide" class="no-wrap">&nbsp;取消在建库</span>
-            {{#} else { }}
-            <span title="移入在建库" lay-event="isHide" class="no-wrap">&nbsp;移入在建库</span>
-            {{#} }}
-            <span title="项目后评价" lay-event="setAssess" class="no-wrap">&nbsp;项目后评价</span>
-        </c:if>
+        <span title="移入" lay-event="move" class="no-wrap">移入</span>
+        <span title="移入" lay-event="rg" class="no-wrap">入规</span>
     </div>
 </script>
 <script>
@@ -678,11 +739,11 @@
                 <c:forEach items="${XMLX}" var="xm">
                 xmlx.push({value: "${xm.code}", name: "${xm.title}"});
                 </c:forEach>
-                this.kind = layui.xmSelect.render({
-                    el: "#kind",
-                    language: 'zn',
-                    data: xmlx
-                });
+                // this.kind = layui.xmSelect.render({
+                //     el: "#kind",
+                //     language: 'zn',
+                //     data: xmlx
+                // });
                 var indusKindData = [];
                 <c:forEach items="${HYFL}" var="xm">
                 indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
@@ -778,7 +839,7 @@
                 if (this.indusKind) {
                     param.indusKind = this.indusKind.getValue("valueStr");
                 }
-                param.kind = this.kind.getValue("value").sort().join(",");
+                // param.kind = this.kind.getValue("value").sort().join(",");
                 delete (param.select)
                 return param;
             },
@@ -904,36 +965,40 @@
                         <%--	return temp;--%>
                         <%--	}},--%>
                         {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 300, templet: '#subName'},
-                        <c:if test="${sfgw}">
-                        // {field: 'score', title: '得分', width: 70, templet: '#scoreTem'},
-                        {field: 'assessReason', title: '项目后评价', minWidth: 150, templet: '#assessReasonTem'},
-                        </c:if>
-                        {field: 'acceptanceReport', title: '验收报告', minWidth: 150},
-                        {field: 'acceptanceReports', title: '验收报告', minWidth: 150, templet: function(row) {
-                                if (row.acceptanceReports && row.acceptanceReports.length > 0) {
-                                    // 渲染所有文件名，并绑定文件路径
-                                    return row.acceptanceReports.map(function(report) {
-                                        return '<a href="' + report.picAddre + '" target="_blank">' + report.picName + '</a>';
-                                    }).join('<br>');  // 使用 <br> 分隔多个文件
-                                } else {
-                                    return '无报告';
-                                }
-                            }},
-                        // {field: 'regulationStatus', title: '申规入统', minWidth: 150},
-                        {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt'},
-                        // {field: 'offset', title: '偏离度-%', width: 100 },
-                        {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                        {field: 'unitName', title: '项目单位', minWidth: 120},
-                        // {field: 'statusName', title: '项目进度', width: 200},
-                        // {field: 'isHide', title: '在建库', minWidth: 120,templet: function(row) {
-                        // 		if(row.isHide == "1") {
-                        // 			return '<span>是</span>';
-                        // 		}else{
-                        // 			return '<span>否</span>';
-                        // 		}
-                        // 		return "";
-                        // 	}},
-                        // {field: 'reason', title: '退回/不同意原因', width: 160},
+<%--                        <c:if test="${sfgw}">--%>
+<%--                        // {field: 'score', title: '得分', width: 70, templet: '#scoreTem'},--%>
+<%--                        {field: 'assessReason', title: '项目后评价', minWidth: 150, templet: '#assessReasonTem'},--%>
+<%--                        </c:if>--%>
+                        {field: 'subjectId', title: '项目所在地', minWidth: 150},
+                        {field: 'content', title: '项目基本情况', minWidth: 150},
+                        {field: 'rgDate', title: '升规入统时间', minWidth: 150},
+                        {field: 'progress', title: '进展情况', minWidth: 150},
+                        {field: 'remark', title: '备注', minWidth: 150},
+                        // {field: 'acceptanceReports', title: '验收报告', minWidth: 150, templet: function(row) {
+                        //         if (row.acceptanceReports && row.acceptanceReports.length > 0) {
+                        //             // 渲染所有文件名，并绑定文件路径
+                        //             return row.acceptanceReports.map(function(report) {
+                        //                 return '<a href="' + report.picAddre + '" target="_blank">' + report.picName + '</a>';
+                        //             }).join('<br>');  // 使用 <br> 分隔多个文件
+                        //         } else {
+                        //             return '无报告';
+                        //         }
+                        //     }},
+                        // // {field: 'regulationStatus', title: '申规入统', minWidth: 150},
+                        // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt'},
+                        // // {field: 'offset', title: '偏离度-%', width: 100 },
+                        // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
+                        // {field: 'unitName', title: '项目单位', minWidth: 120},
+                        // // {field: 'statusName', title: '项目进度', width: 200},
+                        // // {field: 'isHide', title: '在建库', minWidth: 120,templet: function(row) {
+                        // // 		if(row.isHide == "1") {
+                        // // 			return '<span>是</span>';
+                        // // 		}else{
+                        // // 			return '<span>否</span>';
+                        // // 		}
+                        // // 		return "";
+                        // // 	}},
+                        // // {field: 'reason', title: '退回/不同意原因', width: 160},
                         {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/main.jsp

@@ -78,8 +78,13 @@
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
-    <%--        <span class="txt" style="width: 100%;text-align: center">在建项目库</span>--%>
-                <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">在建项目库</div>
+            <%--        <span class="txt" style="width: 100%;text-align: center">在建项目库</span>--%>
+            <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">在建项目库</div>
+                <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
+                    <button type="button" class="layui-btn">导出明细</button>
+                    <button type="button" class="layui-btn">导出总表</button>
+                    <button type="button" class="layui-btn">自定义导出</button>
+                </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
@@ -96,29 +101,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">领导</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="leaderName" placeholder="请输入领导姓名"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3  hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">投资类型</label>
-                                        <div class="layui-input-block">
-                                            <select name="kindNature">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${TZXZ }" var="hy">
-                                                    <option value="${hy.code }">${hy.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
+
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 " style="display:none;">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required">项目类型</label>
@@ -127,67 +110,9 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">月份</label>
-                                        <div class="layui-input-block">
-                                            <select id="month" name="month">
-                                                <option value="">请选择</option>
-                                                <option value="1">1月</option>
-                                                <option value="2">2月</option>
-                                                <option value="3">3月</option>
-                                                <option value="4">4月</option>
-                                                <option value="5">5月</option>
-                                                <option value="6">6月</option>
-                                                <option value="7">7月</option>
-                                                <option value="8">8月</option>
-                                                <option value="9">9月</option>
-                                                <option value="10">10月</option>
-                                                <option value="11">11月</option>
-                                                <option value="12">12月</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <c:if test="${isHydw}">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers required">预警灯</label>
-                                            <div class="layui-input-block">
-                                                <div id="light"></div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设性质</label>
-                                        <div class="layui-input-block">
-                                            <select name="propKind">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${JSXZ}" var="js">
-                                                    <option value="${js.code }">${js.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">资金来源</label>
-                                        <div class="layui-input-block">
-                                            <select name="zjly" lay-search="">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${ZJLY }" var="zj">
-                                                    <option value="${zj.id }">${zj.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">建设地点</label>
+                                        <label class="layui-form-label required label-longers">项目属地</label>
                                         <div class="layui-input-block">
                                             <select name="subjectId">
                                                 <option value="">请选择</option>
@@ -200,7 +125,7 @@
                                 </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">所属行业</label>
+                                        <label class="layui-form-label label-longers required">行业类别</label>
                                         <div class="layui-input-block">
                                             <div id="indusKind"></div>
                                             <%--         <select name="indusKind" lay-search="" multiple>
@@ -212,110 +137,52 @@
                                         </div>
                                     </div>
                                 </div>
-                                <c:if test="${isHydw }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers">是否分管</label>
-                                            <div class="layui-input-block">
-                                                <select name="blSub">
-                                                    <option value="false">所有项目</option>
-                                                    <option value="true">是</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目单位</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
                                                    autocomplete="off"
                                                    class="layui-input">
+                                            <span class="split_txt">至</span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
                                         </div>
                                     </div>
                                 </div>
-                     <%--           <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设地点</label>
-                                        <div class="layui-input-block">
-                                            <select name="subjectId">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${JSDD }" var="hy">
-                                                    <option value="${hy.code }">${hy.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>--%>
-
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目状态</label>
+                                        <label class="layui-form-label label-longers">项目单位</label>
                                         <div class="layui-input-block">
-                                            <select name="status">
-                                                <option value="">请选择</option>
-                                                <%--                 <option value="1">项目前期</option>
-                                                                 <option value="6">待开工</option>--%>
-                                                <option value="7">施工中</option>
-                                                <option value="8">暂停施工</option>
-                                                <%--           <option value="A">已竣工</option>--%>
-                                            </select>
+                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
+                                                   autocomplete="off"
+                                                   class="layui-input">
                                         </div>
                                     </div>
                                 </div>
-                                <%--                   <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                                       <div class="layui-form-item">
-                                                           <label class="layui-form-label label-longers required">资金来源</label>
-                                                           <div class="layui-input-block">
-                                                               <select name="zjly" lay-search="">
-                                                                   <option value="">请选择</option>
-                                                                   <c:forEach items="${ZJLY }" var="zj">
-                                                                       <option value="${zj.id }">${zj.title }</option>
-                                                                   </c:forEach>
-                                                               </select>
-                                                           </div>
-                                                       </div>
-                                                   </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers ">偏离度</label>
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">建成投产时间</label>
                                         <div class="layui-input-block time_box">
-                                            <input type="text" id="offsetMin" name="offsetMin"
-                                                   placeholder="请输入最小偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMin}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="offsetMax" name="offsetMax"
-                                                   placeholder="请输入最大偏离度"
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
                                                    autocomplete="off"
-                                                   class="layui-input" value="${offsetMax}">
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">年份</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" id="year" readonly="readonly" name="year"
+                                                   class="layui-input">
+                                            <span class="split_txt"> - </span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
                                                    class="layui-input">
                                         </div>
                                     </div>
                                 </div>
-
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">金额(万元)</label>
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">年度投资</label>
                                         <div class="layui-input-block time_box">
-                                            <input type="text" id="startAmt" name="startAmt"
-                                                   placeholder="请输入最小金额"
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
                                                    autocomplete="off"
-                                                   class="layui-input" value="${minAmt}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${maxAmt}">
+                                                   class="layui-input">
+                                            <span class="split_txt"> - </span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -346,115 +213,115 @@
         </div>
         <div>
             <div class="layui-row">
-<%--                <div style="display: flex;margin-bottom: 3px">--%>
-<%--                    <label class="juli">--%>
-<%--                        在建项目总数<span class="lanse-first">{{beginRate.total}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--         &lt;%&ndash;           <label class="juli">--%>
-<%--                        未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli">--%>
-<%--                        已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>&ndash;%&gt;--%>
-<%--                    &lt;%&ndash; <label class="juli">--%>
-<%--                         已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>--%>
-<%--                         <div class="progress-div">--%>
-<%--                             <div class="layui-progress">--%>
-<%--                                 <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
-<%--                             </div>--%>
-<%--                         </div>--%>
-<%--                     </label>--%>
-<%--                     <label class="juli">--%>
-<%--                         停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>--%>
-<%--                         <div class="progress-div">--%>
-<%--                             <div class="layui-progress" lay-filter="layui-progress-bar">--%>
-<%--                                 <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>--%>
-<%--                             </div>--%>
-<%--                         </div>--%>
-<%--                     </label>&ndash;%&gt;--%>
-
-<%--             &lt;%&ndash;       <label class="juli">--%>
-<%--                        开工率<span class="lanse-first">{{beginRate.beginRate}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>&ndash;%&gt;--%>
-<%--                    <label class="juli">--%>
-<%--                        转已竣工项目数<span class="lanse-first">{{beginRate.zjzh}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.kgRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli">--%>
-<%--                        竣工项目转化率<span class="lanse-first">{{beginRate.jgRate}}%</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.jgRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--   &lt;%&ndash;                 <label class="juli">--%>
-<%--                        竣工率<span class="lanse-first">{{beginRate.endRate}}</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>&ndash;%&gt;--%>
-<%--    &lt;%&ndash;                <label class="juli">--%>
-<%--                        投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>&ndash;%&gt;--%>
-<%--                </div>--%>
-<%--                <div style="display: flex;margin-bottom: 3px">--%>
-<%--                    <label class="juli">--%>
-<%--                        年初计划投资<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli">--%>
-<%--                        月度任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli">--%>
-<%--                        月度实际投资<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>--%>
-<%--                        <div class="progress-div">--%>
-<%--                            <div class="layui-progress">--%>
-<%--                                <div class="layui-progress-bar"></div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </label>--%>
-<%--                </div>--%>
+                <%--                <div style="display: flex;margin-bottom: 3px">--%>
+                <%--                    <label class="juli">--%>
+                <%--                        在建项目总数<span class="lanse-first">{{beginRate.total}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--         &lt;%&ndash;           <label class="juli">--%>
+                <%--                        未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--                    <label class="juli">--%>
+                <%--                        已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>&ndash;%&gt;--%>
+                <%--                    &lt;%&ndash; <label class="juli">--%>
+                <%--                         已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>--%>
+                <%--                         <div class="progress-div">--%>
+                <%--                             <div class="layui-progress">--%>
+                <%--                                 <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
+                <%--                             </div>--%>
+                <%--                         </div>--%>
+                <%--                     </label>--%>
+                <%--                     <label class="juli">--%>
+                <%--                         停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>--%>
+                <%--                         <div class="progress-div">--%>
+                <%--                             <div class="layui-progress" lay-filter="layui-progress-bar">--%>
+                <%--                                 <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>--%>
+                <%--                             </div>--%>
+                <%--                         </div>--%>
+                <%--                     </label>&ndash;%&gt;--%>
+
+                <%--             &lt;%&ndash;       <label class="juli">--%>
+                <%--                        开工率<span class="lanse-first">{{beginRate.beginRate}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>&ndash;%&gt;--%>
+                <%--                    <label class="juli">--%>
+                <%--                        转已竣工项目数<span class="lanse-first">{{beginRate.zjzh}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.kgRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--                    <label class="juli">--%>
+                <%--                        竣工项目转化率<span class="lanse-first">{{beginRate.jgRate}}%</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.jgRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--   &lt;%&ndash;                 <label class="juli">--%>
+                <%--                        竣工率<span class="lanse-first">{{beginRate.endRate}}</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>&ndash;%&gt;--%>
+                <%--    &lt;%&ndash;                <label class="juli">--%>
+                <%--                        投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>&ndash;%&gt;--%>
+                <%--                </div>--%>
+                <%--                <div style="display: flex;margin-bottom: 3px">--%>
+                <%--                    <label class="juli">--%>
+                <%--                        年初计划投资<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--                    <label class="juli">--%>
+                <%--                        月度任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--                    <label class="juli">--%>
+                <%--                        月度实际投资<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>--%>
+                <%--                        <div class="progress-div">--%>
+                <%--                            <div class="layui-progress">--%>
+                <%--                                <div class="layui-progress-bar"></div>--%>
+                <%--                            </div>--%>
+                <%--                        </div>--%>
+                <%--                    </label>--%>
+                <%--                </div>--%>
 
                 <div style="display: flex;margin-bottom: 3px">
 
@@ -653,7 +520,7 @@
 <script type="text/html" id="subName">
     <div style="display: flex;flex-direction: column;justify-content: center;height: 100%">
         <%--	{{# if(d.usersub == "1") { }}--%>
-            <span lay-event="toDetail" title="{{d.subName}}">{{d.subName}}</span>
+        <span lay-event="toDetail" title="{{d.subName}}">{{d.subName}}</span>
         <%--        <div title="{{d.subName}}">分管领导： {{d.leaderName||'--'}}</div>--%>
         <%--	{{# }else { }}--%>
         <%--	<span title="{{d.subName}}">{{d.subName}}</span>--%>
@@ -799,46 +666,27 @@
 
 <script type="text/html" id="date">
     <div title="">
-        <div class="line"><span class="qianse">计划开工：</span><span class="shense">{{d.beginDate}}</span>
+        <div class="line"><span class="shense">{{d.tcDate}}</span>
 
         </div>
-        <div class="line"><span class="qianse">实际开工：</span><span class="shense"></span>
+<%--        <div class="line"><span class="qianse">计划开工：</span><span class="shense">{{d.beginDate}}</span>--%>
 
-        </div>
-        <div class="line"><span class="qianse">计划竣工：</span><span class="shense">{{d.endDate}}</span>
+<%--        </div>--%>
+<%--        <div class="line"><span class="qianse">实际开工：</span><span class="shense"></span>--%>
 
-        </div>
+<%--        </div>--%>
+<%--        <div class="line"><span class="qianse">计划竣工：</span><span class="shense">{{d.endDate}}</span>--%>
+
+<%--        </div>--%>
     </div>
 </script>
 <script type="text/html" id="toolBar">
     <div class="toolBar">
-        <span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>
-        <c:if test="${isHydw}">
-            <%--            <span title="问题督办" lay-event="problem" class="no-wrap">&nbsp;问题督办</span>--%>
-            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>
-        </c:if>
-        {{# if(d.unitId == "${currUnitId}") { }}
-        <span title="原因录入" lay-event="setSubReason" class="no-wrap">&nbsp;原因录入</span>
-        {{#}}}
-        {{# if("${currUser.edit}" == 'true') { }}
-        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>
-        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>
+        <span title="项目查询" lay-event="toDetail" class="no-wrap">项目查询</span>
+        {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}
+        <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
-
-        {{#if(d.status == "8"){ }}
-        <span title="开工" lay-event="changeTg" class="no-wrap">&nbsp;开工</span>
-        {{#} else if(d.status === "7"){ }}
-        <span title="停工" lay-event="changeTg" class="no-wrap">&nbsp;停工</span>
-        {{#} }}
-
-        <c:if test="${admin}">
-        <%--    {{# if(d.isHide == "1") { }}--%>
-            <span title="滚动退出在建库" lay-event="isNoHide">&nbsp;滚动退出在建库</span>
-   <%--         {{#} else { }}
-            <span title="移入在建库" lay-event="isHide">&nbsp;移入在建库</span>--%>
-<%--            {{#} }}--%>
-        </c:if>
-
+        <span title="移入" lay-event="move" class="no-wrap">移入</span>
     </div>
 </script>
 <script>
@@ -860,10 +708,10 @@
             light: null,
             sort: {field: "amtTotal", type: "desc"},
             pageSize: 10,
-   /*         sort: {
-                field: 'amtTotal',
-                type: null
-            },*/
+            /*         sort: {
+                         field: 'amtTotal',
+                         type: null
+                     },*/
             showExport: false
         },
         mounted: function () {
@@ -908,24 +756,13 @@
                     type: 'year',
                     theme: layDateTheme,
                     btns: ['now', 'confirm'],
-/*                    value: new Date().getFullYear()*/
+                    /*                    value: new Date().getFullYear()*/
                 });
                 var params = window.localStorage.getItem(this.cacheName);
                 if (params) {
                     layui.form.val("searchForm", JSON.parse(params));
                 }
-                if (${ isHydw }) {
-                    this.light = layui.xmSelect.render({
-                        el: "#light",
-                        language: 'zn',
-                        data: [
-                            /*       {value: '0', name: '绿灯'},*/
-                            {value: '1', name: '黄灯'},
-                            {value: '2', name: '红灯'}
-                        ]
-                    })
-                }
-                ;
+
                 var indusKindData = [];
                 <c:forEach items="${HYFL}" var="xm">
                 indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
@@ -1194,27 +1031,37 @@
                         {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                         // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
                         /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
+                        // {
+                        //     field: 'offsetLight',
+                        //     // title: '偏离状态',
+                        //     title: '投资偏离度',
+                        //     type: 'string',
+                        //     align: 'center',
+                        //     fixed: 'left',
+                        //     width: 100,
+                        //     templet: '#offsetLight'
+                        // },
+                        {field: 'subjectName', title: '项目所在地', width: 200},
                         {
-                            field: 'offsetLight',
-                            // title: '偏离状态',
-                            title: '投资偏离度',
-                            type: 'string',
-                            align: 'center',
-                            fixed: 'left',
-                            width: 100,
-                            templet: '#offsetLight'
+                            field: 'amtTotal',  title: '项目建设内容（亿元）', width: 200, templet: function (d) {
+                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            }
                         },
-                        {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
-
-                        // {field: 'statusName', title: '建设进度', width: 60},
-                        {field: 'ybContent', title: '建设进度', width: 60},
-                        {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                        // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
-                        {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-
-                        {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                        {field: 'unitName', title: '项目单位', minWidth: 110},
-                        // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
+                        {field: 'tcDate',  title: '建成投产时间', width: 200,templet: '#date'},
+                        {field: 'amtTotal', title: '年度投资', width: 200},
+                        {field: 'progress',  title: '进展情况', width: 200},
+                        {field: 'remark', title: '备注', width: 200},
+
+                        // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
+                        // // {field: 'statusName', title: '建设进度', width: 60},
+                        // {field: 'ybContent', title: '建设进度', width: 60},
+                        // {field: 'state', title: '计划时间', width: 140, templet: '#date'},
+                        // // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
+                        // {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
+                        //
+                        // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
+                        // {field: 'unitName', title: '项目单位', minWidth: 110},
+                        // // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                         {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                     ]],
                     fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -99,6 +99,11 @@
         <!-- 内容区域 -->
         <div class="right_title">
             <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">新建项目库</div>
+            <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
+                <button type="button" class="layui-btn">导出明细</button>
+                <button type="button" class="layui-btn">导出总表</button>
+                <button type="button" class="layui-btn">自定义导出</button>
+            </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
                     <%--						<h2 class="layui-colla-title">筛选</h2>--%>
@@ -117,7 +122,7 @@
                                 </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">建设地点</label>
+                                        <label class="layui-form-label required label-longers">项目属地</label>
                                         <div class="layui-input-block">
                                             <select name="subjectId">
                                                 <option value="">请选择</option>
@@ -128,7 +133,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                               <%-- <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required" style="width: 100px;">金额(万元)</label>
                                         <div class="layui-input-block time_box">
@@ -166,17 +171,52 @@
                                             </select>
                                         </div>
                                     </div>
-                                </div>
+                                </div>--%>
 
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">所属行业</label>
+                                        <label class="layui-form-label required label-longers">行业类别</label>
                                         <div class="layui-input-block">
                                             <div id="indusKind"></div>
                                         </div>
                                     </div>
                                 </div>
-
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
+                                                   autocomplete="off"
+                                                   class="layui-input">
+                                            <span class="split_txt">至</span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers">项目单位</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
+                                                   autocomplete="off"
+                                                   class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">预计开工日期</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
+                                                   autocomplete="off"
+                                                   class="layui-input">
+                                            <span class="split_txt"> - </span>
+                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
+                                                   class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
                                 <%--                           <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
                                                                <div class="layui-form-item">
                                                                    <label class="layui-form-label label-longers">所属行业</label>
@@ -188,7 +228,7 @@
                                                            </div>--%>
 
 
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                <%--<div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label queryTimeType label-longers"
                                                style="width: 130px;">
@@ -234,14 +274,14 @@
                                         </div>
                                     </div>
                                 </div>
-            <%--                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+            &lt;%&ndash;                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required">项目单位名称</label>
                                         <div class="layui-input-block">
                                             <input name="sbdw" class="layui-input" value="${unitName }">
                                         </div>
                                     </div>
-                                </div>--%>
+                                </div>&ndash;%&gt;
                                 <c:if test="${currUser.statusProj == 1 }">
                                     <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                         <div class="layui-form-item">
@@ -352,7 +392,7 @@
                                                    class="layui-input">
                                         </div>
                                     </div>
-                                </div>
+                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label"></label>
@@ -420,15 +460,15 @@
                             </div>
                         </div>
                     </label>--%>
-                    <label class="juli">
-                        <%--                        已开工项目数--%>转开工项目数
+<%--                    <label class="juli">
+                        &lt;%&ndash;                        已开工项目数&ndash;%&gt;转开工项目数
                         <span class="lanse-first">{{beginRate.xjzh}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                             </div>
                         </div>
-                    </label>
+                    </label>--%>
                     <%--                    <label class="juli">--%>
                     <%--                        已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>--%>
                     <%--                        <div class="progress-div">--%>
@@ -445,15 +485,15 @@
                     <%--                            </div>--%>
                     <%--                        </div>--%>
                     <%--                    </label>--%>
-                    <label class="juli">
-                        <%--                        开工率--%>开工项目转化率
+<%--                    <label class="juli">
+                        &lt;%&ndash;                        开工率&ndash;%&gt;开工项目转化率
                         <span class="lanse-first">{{beginRate.zjRate}}%</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar" :style="'width:'+beginRate.zjRate"></div>
                             </div>
                         </div>
-                    </label>
+                    </label>--%>
                     <%--                    <label class="juli">--%>
                     <%--                        竣工率--%>
                     <%--                        --%>
@@ -657,9 +697,9 @@
         <div class="line"><span class="qianse">计划开工：</span> <span class="shense">{{d.beginDate}}</span>
 
         </div>
-        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>
+<%--        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>--%>
 
-        </div>
+<%--        </div>--%>
 
     </div>
 </script>
@@ -703,35 +743,11 @@
 </script>
 <script type="text/html" id="toolBar">
     <div class="toolBar">
-        <span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>
-        <c:if test="${isHydw}">
-            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>
-            <%--      <span title="问题督办" lay-event="problem" class="no-wrap">&nbsp;问题督办</span>--%>
-        </c:if>
-        {{# if(d.unitId == "${currUnitId}") { }}
-        <span title="原因录入" lay-event="setSubReason" class="no-wrap">&nbsp;原因录入</span>
-        {{#}}}
-
+        <span title="项目查询" lay-event="toDetail" class="no-wrap">项目查询</span>
         {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}
-        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>
+        <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
-        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>
-        <%--	{{# if("${currUser.edit}" == 'true') { }}--%>
-        <%--	{{# if(d.status != '0' && d.status != '6' && d.status != '7' && d.status != '8' && d.status != '9' && d.status != 'A') { }}--%>
-        <%--		<span title="退回暂存" lay-event="toTh">&nbsp;退回暂存</span>--%>
-        <%--	{{#}}}--%>
-        <%--	{{#} }}--%>
-        <span title="手续办理" lay-event="preNew" class="no-wrap">&nbsp;手续办理</span>
-        <c:if test="${admin || isSfgw}">
-  <%--          {{# if(d.isHide == "1") { }}
-            <span title="取消在建库" lay-event="isNoHide" class="no-wrap">&nbsp;取消在建库</span>
-            {{#} else { }}--%>
-            <span title="移入在建库" lay-event="isHide" class="no-wrap">&nbsp;移入在建库</span>
-            <span title="移入储备库" lay-event="setIsCb" class="no-wrap">&nbsp;移入储备库</span>
-<%--            {{#} }}
-            <span title="移入新建库" lay-event="setIsNew" class="no-wrap">&nbsp;移入新建库</span>--%>
-        </c:if>
-
+        <span title="移入" lay-event="move" class="no-wrap">移入</span>
     </div>
 </script>
 
@@ -741,9 +757,9 @@
         <%--        <div class="line"><span class="qianse">总的手续：</span> <span class="shense">{{d.preTotal}}</span>个--%>
 
         <%--        </div>--%>
-        <div class="line"><span class="qianse">无需办理的手续：</span> <span class="shense">{{d.preNoNum}}</span>个
+<%--        <div class="line"><span class="qianse">无需办理的手续：</span> <span class="shense">{{d.preNoNum}}</span>个--%>
 
-        </div>
+<%--        </div>--%>
         <div class="line"><span class="qianse">办理中的手续：</span> <span class="shense">{{d.preProceNum}}</span>个
 
         </div>
@@ -1055,11 +1071,18 @@
                 param.orderBy = this.sort.field;
                 param.orderType = this.sort.type || "asc";
 
-                App.postJson("/api/subInfo/query/all", param, function (res) {
+
+                param.status = 2;
+                App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
                     self.loadPage(res.total);
                     self.loadTable();
                 });
+                // App.postJson("/api/subInfo/query/all", param, function (res) {
+                //     self.dataList = res.rows;
+                //     self.loadPage(res.total);
+                //     self.loadTable();
+                // });
 
                 App.postJson("/api/subInfo/query/beginRate", param, function (res) {
                     if (res.success) {
@@ -1152,15 +1175,22 @@
                         // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort:"amtTotal"},
                         // {field: 'offset', title: '偏离度-%', width: 100},
                         // {field: 'fileId', title: '现场影像', width: 150, templet:'#imageDiv'},
+                        // {field: 'subName', fixed: 'left', title: '项目名称', width: 200, templet: '#subName'},
+                        {field: 'subjectName', title: '项目所在地', width: 200},
+                        {
+                            field: 'amtTotal', title: '项目建设内容（亿元）', width: 200, templet: function (d) {
+                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            }
+                        },
+                        {field: 'xmbaStatus', title: '预计开工时间', width: 160, templet: '#date'},
                           {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
-                        {field: 'xmbaStatus', title: '计划时间', width: 160, templet: '#date'},
-                        {field: 'xmbaStatus', title: '总投资', width: 245, templet: '#amtTotal'},
-                        {field: 'indusKindName', title: '所属行业', width: 115},
-                        {field: 'zjly', title: '资金来源', width: 115, templet: '#zjly'},
-                        {field: 'mainName', title: '日常责任监管单位', width: 115},
-                        {field: 'unitName', title: '项目单位', minWidth: 150},
-                        // {field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight'},
-                        // {field: 'statusName', title: '项目进度', width: 200},
+                        {field: 'remark', title: '备注', width: 245, templet: '#remark'},
+                        // {field: 'indusKindName', title: '所属行业', width: 115},
+                        // {field: 'zjly', title: '资金来源', width: 115, templet: '#zjly'},
+                        // {field: 'mainName', title: '日常责任监管单位', width: 115},
+                        // {field: 'unitName', title: '项目单位', minWidth: 150},
+                        // // {field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight'},
+                        // // {field: 'statusName', title: '项目进度', width: 200},
                  /*       {
                             field: 'isHide',
                             type: 'string',
@@ -1395,7 +1425,7 @@
                     type: 2,
                     title: '',
                     area: ['1000px', '800px'],
-                    content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
+                    content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
                 });
                 layui.layer.full(index);
             },