大屏弹窗

projects-service/src/main/java/com/rtrh/projects/modules/projects/enums/SubInfoCbStatusEnum.java

@@ -16,8 +16,9 @@ public enum SubInfoCbStatusEnum {
     ZZMH("1", "正在谋划"),
     ZZQT("2", "正在洽谈"),
     YQY("3", "已签约"),
-    YBA("4", "已备案"),
-    YHZ("5", "已核准");
+    YBA_YHZ("4", "已备案/已核准");
+    // YBA("4", "已备案"),
+    // YHZ("5", "已核准");
 
     private final String code;
     private final String desc;

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -121,7 +121,8 @@
         s.last_update_time AS lastUpdateTime,
         s.logic_delete_flag AS logicDeleteFlag,
         s.status_lamp AS statusLamp,
-        s.kind_nature AS kindNature
+        s.kind_nature AS kindNature,
+        s.addre AS addre
         <if test="vo.status!=null and vo.status==3 and vo.month!=null and vo.month!=''">
             ,src.yearPlanAmt
         </if>
@@ -305,7 +306,8 @@
             last_update_user_name AS lastUpdateUserName,
             last_update_time AS lastUpdateTime,
             status_lamp AS statusLamp,
-            kind_nature AS kindNature
+            kind_nature AS kindNature,
+            addre
         from sub_info
         where id = #{id}
     </select>

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfoGxj.java

@@ -116,6 +116,9 @@ public class SubInfoGxj extends TableBaseColomn implements Serializable {
     // 总负责人电话
     private String telLead;
 
+    // 项目地址
+    private String addre;
+
     // 状态：1-储备 2-新建 3-在建 9-投产 【建设性质】
     private String status;
     private String statusName;

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

@@ -291,6 +291,8 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         }
         // abc类统计
         Map<String, Long> abc = list.stream().collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getAbc(), NullValueEnum.UNKNOWN_CATEGORY.getCode()), Collectors.counting()));
+        // 储备项目状态统计
+        Map<String, Long> cbStatusMap = list.stream().collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getCbStatus(), NullValueEnum.UNKNOWN_CATEGORY.getCode()), Collectors.counting()));
         // 建设地点统计
         List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);
         Map<String, String> jsddNameMap = jsddDict.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle, (v1, v2) -> v1));
@@ -328,6 +330,12 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                 .setCNum(abc.getOrDefault("C", 0L) + abc.getOrDefault("c", 0L))
                 .setDNum(abc.getOrDefault("D", 0L))
                 .setNNum(abc.getOrDefault(NullValueEnum.UNKNOWN_CATEGORY.getCode(), 0L))
+
+                .setBePlanningNum(cbStatusMap.getOrDefault(SubInfoCbStatusEnum.ZZMH.getCode(), 0L))
+                .setNegotiationNum(cbStatusMap.getOrDefault(SubInfoCbStatusEnum.ZZQT.getCode(), 0L))
+                .setSignedNum(cbStatusMap.getOrDefault(SubInfoCbStatusEnum.YQY.getCode(), 0L))
+                .setRecordAndApproveNum(cbStatusMap.getOrDefault(SubInfoCbStatusEnum.YBA_YHZ.getCode(), 0L))
+
                 .setJsddData(jsddList)
                 .setHyflData(hyflList);
 

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/StatisticsVO.java

@@ -17,8 +17,25 @@ public class StatisticsVO {
      */
     private Long cbNum;
 
+    /**
+     * 项目总数
+     */
     private Long num;
 
+    // 正在谋划
+    private Long bePlanningNum;
+    // 正在洽谈
+    private Long negotiationNum;
+    // 已签约
+    private Long signedNum;
+    // 已备案、已核准
+    private Long recordAndApproveNum;
+
+    // // 已备案
+    // private Long recordNum;
+    // // 已核准
+    // private Long approveNum;
+
     /**
      * A类数量
      */

projects/src/main/java/com/rtrh/projects/web/controller/statics/AnalysisScreenController.java

@@ -80,7 +80,7 @@ public class AnalysisScreenController extends BaseController {
 	 * @param model
 	 * @return
 	 */
-	@Log("用户点击了大屏")
+	@Log("页面：【智慧分析大屏】,执行操作：查询")
 	@GetMapping(value = "/analysisScreenTwo")
 	public ModelAndView analysisScreenTwo(ModelMap model) {
 		List<TSystable> XMLX = tSysTableService.getByKind(SysTableKind.XMLX);
@@ -97,6 +97,27 @@ public class AnalysisScreenController extends BaseController {
 		return new ModelAndView("/vmodules/statics/analysisScreen_four.jsp");
 	}
 
+	@GetMapping("subjectNew")
+	public ModelAndView subjectNew(ModelMap model,String status,String subjectId,String startAmt,String endAmt) {
+		String kindUnit= getCurUser().getKindUnit();
+		boolean isHydw = false;
+		if(StringUtil.isNotEmpty(kindUnit)) {
+			if("1".equals(kindUnit)) {
+				isHydw=true;
+			}
+		}
+		model.put("isHydw", isHydw);
+		String currUserUnitId = getCurUser().getUnitId();
+		model.put("currUser", getCurUser().getLoginUser());
+		model.put("currUnitId", currUserUnitId);
+		model.put("status", status);
+		model.put("subjectId", subjectId);
+		model.put("startAmt", startAmt);
+		model.put("endAmt", endAmt);
+
+		return new ModelAndView("/vmodules/statics/layer/projInfo_new.jsp");
+	}
+
 	/**
 	 * 大屏2
 	 * @param model

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -16,8 +16,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.rtrh.projects.modules.projects.dao.SubMajorMonthDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
-import com.rtrh.projects.modules.projects.po.SubInfo;
-import com.rtrh.projects.modules.projects.po.SubSource;
+import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.rolemeun.po.SecRole;
 import com.rtrh.projects.modules.rolemeun.servicel.SecRoleservice;
 import com.rtrh.projects.modules.system.dao.TSystableDao;
@@ -43,8 +42,6 @@ import com.rtrh.core.repository.Page;
 import com.rtrh.projects.modules.projects.dao.SubAmtPlanDao;
 import com.rtrh.projects.modules.projects.enums.ProjectStatusEnum;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
-import com.rtrh.projects.modules.projects.po.RptCont;
-import com.rtrh.projects.modules.projects.po.SubAmtPlan;
 import com.rtrh.projects.modules.projects.service.SubInfoService;
 import com.rtrh.projects.modules.projects.service.SubPreNewService;
 import com.rtrh.projects.modules.projects.service.SubRptContService;
@@ -222,7 +219,7 @@ public class SubInfoController extends BaseController {
      * @return
      */
     @GetMapping(value = "/projTz")
-    public ModelAndView projTz(ModelMap model, String type) {
+    public ModelAndView projTz(ModelMap model, String type,String boolScreen) {
         if (StringUtil.isEmpty(type)) {
             //默认为重点项目台账
             type = "1";
@@ -271,6 +268,7 @@ public class SubInfoController extends BaseController {
         if (table != null) {
             model.put("curYear", table.getCode());
         }
+        model.put("boolScreen", boolScreen);
         model.put("currUser", getCurUser().getLoginUser());
         model.put("currUnitId", currUserUnitId);
         model.put("isSfgw", isSfgw);
@@ -1961,16 +1959,17 @@ public class SubInfoController extends BaseController {
 
     @GetMapping("bigScreenView")
     public ModelAndView bigScreenView(Model model, String subId, String lastUrl, Boolean layer, String queryYear, Boolean isCt) {
-        Map<String, Object> subInfo = subInfoService.getSubInfoById(subId, queryYear);
+        // Map<String, Object> subInfo = subInfoService.getSubInfoById(subId, queryYear);
 
+        SubInfoGxj subInfo = subInfoService.findById(subId);
 
         //判断是否  是项目单位， 并且项目处于 项目前期过程中。 能直接进入项目前期
-        String status = String.valueOf(subInfo.get("status"));
-        if (ProjectStatusEnum.PRE.getKey().equals(status) && "2".equals(getCurUser().getKindUnit())) {
-            subInfo.put("preCheck", true);
-        }
+        // String status = String.valueOf(subInfo.get("status"));
+        // if (ProjectStatusEnum.PRE.getKey().equals(status) && "2".equals(getCurUser().getKindUnit())) {
+        //     subInfo.put("preCheck", true);
+        // }
         //判断是否项目已经竣工
-        model.addAttribute("completeCheck", ProjectStatusEnum.END.getKey().equals(status));
+        // model.addAttribute("completeCheck", ProjectStatusEnum.END.getKey().equals(status));
 
         model.addAttribute("sunInfo", subInfo);
 

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

@@ -735,7 +735,7 @@ public class SubInfoQueryApiController extends BaseController {
     @PostMapping("statistics")
     @Log("统计")
     public Message statistics(@RequestBody SubInfoQueryTzVO queryVO) {
-        WebLogAspect.content.set(String.format("用户点击项目四库管理%s分页查询统计数据", StringUtils.isBlank(queryVO.getStatus()) ? "项目总库" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
+        WebLogAspect.content.set(String.format("页面：【项目四库管理-%s库】,执行操作：查询统计数据", StringUtils.isBlank(queryVO.getStatus()) ? "项目总" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
         queryVO.setSubjectAuthIds(getSubjectIds());
         Message message = new Message();
         queryVO.setSubjectAuthIds(getSubjectIds());

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -63,14 +63,6 @@
                     txt: '智慧分析大屏',
                     url: 'statics/analysisScreenTwo'
                 },
-                {
-                    icon: 'icon_work_bench_active',
-                    activeIcon: 'icon_work_bench_active',
-                    code: '201',
-                    txt: '互动工作台',
-                    url: 'workBench/zrWorkBench',
-                    kind: ["1", "4"]
-                },
                 {
                     icon: 'icon_project_active',
                     activeIcon: 'icon_project_active',
@@ -121,6 +113,14 @@
                         }
                     ]
                 },
+                {
+                    icon: 'icon_work_bench_active',
+                    activeIcon: 'icon_work_bench_active',
+                    code: '201',
+                    txt: '互动工作台',
+                    url: 'workBench/zrWorkBench',
+                    kind: ["1", "4"]
+                },
                 {
                     icon: 'icon_organ_manage_active',
                     activeIcon: 'icon_organ_manage_active',

projects/src/main/webapp/vmodules/project/projInfo_yb.jsp

@@ -254,8 +254,6 @@
          style="padding: 0 20px;flex-direction: row;justify-content: space-between">
         <input type="hidden" id="subId" value="${subId }"/>
         <!-- 内容区域 -->
-
-
         <div class="process-content">
             <div class="year-big">
                 <form class="layui-form" lay-filter="formData2" action=""
@@ -266,27 +264,6 @@
                         </button>
                     </div>
                     <div class="year-choose-box">
-                        <%-- <div class="jihuazj">
-                             <div class="year-choose-intro">年初计划累计</div>
-                             <div class="year-choose-value">
-                                 {{planAmt}}
-                                 <span class="year-choose-unit">(万元)</span>
-                             </div>
-                         </div>
-                         <div class="jihuazj">
-                             <div class="year-choose-intro">月度计划累计</div>
-                             <div class="year-choose-value">
-                                 {{amtYear}}
-                                 <span class="year-choose-unit">(万元)</span>
-                             </div>
-                         </div>
-                         <div class="jihuazj">
-                             <div class="year-choose-intro">月实际累计</div>
-                             <div class="year-choose-value">
-                                 {{amtRt}}
-                                 <span class="year-choose-unit">(万元)</span>
-                             </div>
-                         </div>--%>
                     </div>
                     <div class="layui-colla-content layui-show" style="height: auto;padding: 0">
                         <div class="table_progress" style="padding-top: 0;">
@@ -296,105 +273,6 @@
                 </form>
             </div>
         </div>
-<%--        <div class="process-content-right">
-&lt;%&ndash;            <div class="year-choose">
-                <button type="button" class="button-item" :class="item.id==reportItem?'button-active':''"
-                        v-for="(item,index) in reportArray" :key="index" @click="clickReport(item)">{{item.label}}
-                </button>
-            </div>&ndash;%&gt;
-    &lt;%&ndash;        <div class="table-box" id="divWeek" style="margin-top: 20px">
-                <div id="popInfo">
-                    <div class="pop_con_form" style="width:100%;padding:0 40px;box-sizing:border-box;">
-                        <form class="layui-form">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label" style="width:95px;">请选择周</label>
-                                <div class="layui-input-block">
-                                    <select name="week" id="week" lay-filter="week">
-                                        <option value="">--请选择--</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label" style="width:95px;">项目进展情况</label>
-                                <div class="layui-input-block">
-                                    {{weekInfo.content}}
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <div class="table_box">
-                                    <div class="layui-form-label required" style="width:95px;">附件信息</div>
-                                    <ul class="img_ls">
-                                        <li v-for="(item, index) in images" :key="index">
-                                            <div class="img" :title="showTitle(item)">
-                                                &lt;%&ndash;									//:layer-src="picShow1(item.fileAddre)"&ndash;%&gt;
-                                                <img :id="item.fileAddre" :src="picShow(item.fileAddre,item.fileType)"
-                                                     @click="showImage(item.fileAddre,item.fileType, item.createTime)"
-                                                     :alt="item.fileName"/>
-                                                <div class="download_icon"
-                                                     @click="download(item.fileAddre,item.fileName)"></div>
-                                            </div>
-                                            {{item.fileName}}
-                                        </li>
-                                        &lt;%&ndash;           <li class="add" id="addPic">
-                                                       <div class="bg"><i class="layui-icon layui-icon-add-circle"></i></div>
-                                                   </li>&ndash;%&gt;
-                                    </ul>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>&ndash;%&gt;
-
-            &lt;%&ndash;<div class="table-box" id="divMonth" style="margin-top: 20px;display: none">
-                <div>
-                    <div class="pop_con_form" style="width:100%;padding:0 40px;box-sizing:border-box;">
-                        <form class="layui-form">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label" style="width:95px;">请选择月</label>
-                                <div class="layui-input-block">
-                                    &lt;%&ndash;   <input class="layui-input" readonly="readonly" id="year">&ndash;%&gt;
-                                    <select name="month" id="month" lay-filter="month">
-                                        <option value="">--请选择--</option>
-                                        &lt;%&ndash;                 <template v-for="(item, index) in weekData">
-                                                             <option value="item.kjMonth">{{item.kjMonth}}</option>
-                                                         </template>&ndash;%&gt;
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label" style="width:95px;">项目进展情况</label>
-                                <div class="layui-input-block">
-                                    {{monthInfo.content}}
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <div class="table_box">
-                                    <div class="layui-form-label required" style="width:95px;">附件信息</div>
-                                    <ul class="img_ls">
-                                        <li v-for="(item, index) in monthImages" :key="index">
-                                            <div class="img" id="attachDiv" :title="showTitle(item)">
-                                                &lt;%&ndash;									//:layer-src="picShow1(item.fileAddre)"&ndash;%&gt;
-                                                <img :id="item.fileAddre" :src="picShow(item.fileAddre,item.fileType)"
-                                                     @click="showImage(item.fileAddre,item.fileType, item.createTime)"
-                                                     :alt="item.fileName"/>
-                                                <div class="download_icon"
-                                                     @click="download(item.fileAddre,item.fileName)"></div>
-                                            </div>
-                                            {{item.fileName}}
-                                        </li>
-                                        &lt;%&ndash;           <li class="add" id="addPic">
-                                                       <div class="bg"><i class="layui-icon layui-icon-add-circle"></i></div>
-                                                   </li>&ndash;%&gt;
-                                    </ul>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>&ndash;%&gt;
-
-        </div>--%>
     </div>
 </template>
 <script>

projects/src/main/webapp/vmodules/project/projectInfo.jsp

@@ -143,6 +143,8 @@
                     <td style="display: none">${sunInfo.kindName }</td>--%>
                     <td class="label">项目所在地</td>
                     <td>${sunInfo.subjectName }</td>
+                    <td class="label">项目地址</td>
+                    <td>${sunInfo.addre }</td>
                 </tr>
                 <tr>
                     <td class="label">建设内容及规模</td>

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -88,7 +88,7 @@
                         <img src="${WebSite.asset}/images/static/left1.png" class="img" alt="">
                     </div>
                     <div class="left-content-bottom">
-                        <div class="left-content-bottom-data">
+                        <div class="left-content-bottom-data" onclick="projDetailNew(1,'','','')">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/ico.png" alt="">
                                 <p>储备</p>
@@ -108,7 +108,7 @@
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
                             </div>
                         </div>
-                        <div class="left-content-bottom-data">
+                        <div class="left-content-bottom-data" onclick="projDetailNew(2,'','','')">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/ico.png" alt="">
                                 <p>新建</p>
@@ -128,7 +128,7 @@
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
                             </div>
                         </div>
-                        <div class="left-content-bottom-data">
+                        <div class="left-content-bottom-data" onclick="projDetailNew(3,'','','')">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/ico.png" alt="">
                                 <p>在建</p>
@@ -148,7 +148,7 @@
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
                             </div>
                         </div>
-                        <div class="left-content-bottom-data">
+                        <div class="left-content-bottom-data" onclick="projDetailNew(9,'','','')">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/ico.png" alt="">
                                 <p>投产</p>
@@ -188,7 +188,7 @@
                 </div>
 
                 <div class="main-center-bottom">
-                    <div class="main-detail-container">
+                    <div class="main-detail-container" onclick="projDetailNew('','2','','')">
                         <div class="main-detail-top">
                             <p>伊州区</p>
                             <img src="${WebSite.asset}/images/static/main-img1.png" alt="">
@@ -228,7 +228,7 @@
                             <img class="bgc-img" src="${WebSite.asset}/images/static/main-img2.png" alt="">
                         </div>
                     </div>
-                    <div class="main-detail-container">
+                    <div class="main-detail-container" onclick="projDetailNew('','3','','')">
                         <div class="main-detail-top">
                             <p>巴里坤县</p>
                             <img src="${WebSite.asset}/images/static/main-img1.png" alt="">
@@ -268,7 +268,7 @@
                             <img class="bgc-img" src="${WebSite.asset}/images/static/main-img2.png" alt="">
                         </div>
                     </div>
-                    <div class="main-detail-container">
+                    <div class="main-detail-container" onclick="projDetailNew('','4','','')">
                         <div class="main-detail-top">
                             <p>伊吾县</p>
                             <img src="${WebSite.asset}/images/static/main-img1.png" alt="">
@@ -308,7 +308,7 @@
                             <img class="bgc-img" src="${WebSite.asset}/images/static/main-img2.png" alt="">
                         </div>
                     </div>
-                    <div class="main-detail-container">
+                    <div class="main-detail-container" onclick="projDetailNew('','5','','')">
                         <div class="main-detail-top">
                             <p>高新区</p>
                             <img src="${WebSite.asset}/images/static/main-img1.png" alt="">
@@ -363,7 +363,7 @@
                     <img src="${WebSite.asset}/images/static/right-img2.png" alt="">
                 </div>
                 <div class="main-right-bottom">
-                    <div class="right-content-bottom">
+                    <div class="right-content-bottom" onclick="projDetailNew('','','100','');">
                         <div class="right-content-bottom-data">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/1.png" alt="">
@@ -383,7 +383,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="right-content-bottom">
+                    <div class="right-content-bottom" onclick="projDetailNew('','','50','100');">
                         <div class="right-content-bottom-data">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/1.png" alt="">
@@ -403,7 +403,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="right-content-bottom">
+                    <div class="right-content-bottom" onclick="projDetailNew('','','10','50');">
                         <div class="right-content-bottom-data">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/1.png" alt="">
@@ -423,7 +423,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="right-content-bottom">
+                    <div class="right-content-bottom" onclick="projDetailNew('','','0','10');">
                         <div class="right-content-bottom-data">
                             <div class="data-left">
                                 <img src="${WebSite.asset}/images/static/1.png" alt="">
@@ -617,6 +617,31 @@
     var workRate=0;   //投产率
     var stockRate=0;  //入规率
     var hyData=[]// 行业数据
+
+    function projDetailNew(status,subjectId,startAmt,endAmt) {
+        // if (this.c) {
+        //     return;
+        // }
+        // var projTz = "/subject/subInfo/projTz?type=3&boolScreen=1"
+
+        var projTz = "/statics/subjectNew"
+            + "?status=" + status
+            + "&subjectId=" + subjectId
+            + "&startAmt=" + startAmt
+            + "&endAmt=" + endAmt
+        var flag = !screenfull.isFullscreen;
+        var opt = {
+            title: "项目台账",
+            width: window.screen.availWidth - (flag ? 0 : 200),
+            heigt: window.screen.availHeight - (flag ? 50 : 150),
+            content: App.getUrl(projTz),
+            maxmin: false,
+            skin: "bigScreenDialog",
+            full: true,
+            topmost: flag,
+        }
+        App.openLayer(opt)
+    }
     function loadDpGxjGmData() {
         App.postJson('/api/statics/dp_gxj_gm', {
             varlx: '0',

projects/src/main/webapp/vmodules/statics/layer/projInfo_new.jsp

@@ -0,0 +1,518 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <jsp:include page="../../common/common-meta-include.jsp"></jsp:include>
+    <jsp:include page="../../common/common-js-include.jsp"></jsp:include>
+    <jsp:include page="../../common/common-css-include.jsp"></jsp:include>
+    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/bigDialog.css" media="all">
+    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/contentIframe.css" media="all">
+    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/bigTable.css" media="all">
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style type="text/css">
+        .layui-layer-content,
+        .layui-layer-iframe iframe,
+        .layui-layer-iframe{
+            height: 100% !important;
+        }
+        .big-dialog .table_box .table_step th .layui-table-cell,
+        .table_box .table_step .layui-table-cell{
+            color: #ffffff;
+        }
+
+        body::-webkit-scrollbar {
+            display: none;
+        }
+
+        .toolBar {
+            display: flow-root;
+        }
+
+        .table_box .table_process .layui-table-cell {
+            display: flex;
+            flex-direction: column;
+            /*justify-content: center;*/
+        }
+
+        .layui-table-col-special .layui-table-cell {
+            display: flex;
+            flex-direction: row !important;
+            justify-content: space-between !important;
+        }
+
+        .layui-table-col-special .layui-table-cell .step_red {
+            background-color: red;
+        }
+
+        .table_box .table_process .step_red:before {
+            border: 2px solid red;
+        }
+
+        .layui-table-col-special .layui-table-cell .step_yellow {
+            background-color: yellow;
+        }
+
+        .table_box .table_process .step_yellow:before {
+            border: 2px solid yellow;
+        }
+
+        .layui-table-col-special .layui-table-cell .step_green {
+            background-color: green;
+        }
+
+        .table_box .table_process .step_green:before {
+            border: 2px solid green;
+        }
+
+        .queryTimeType {
+            margin-top: -9px;
+            position: absolute;
+        }
+
+        .hiddenParam {
+            display: none;
+        }
+
+        .morePan {
+            margin-top: 4px;
+            position: absolute;
+            margin-left: 11px;
+        }
+
+        .morePan a {
+            color: #2C6EC6;
+        }
+
+
+
+        .border_line {
+            width: 100%;
+            height: 4px;
+            background: linear-gradient(90deg, #00BCFA 0%, rgba(0, 188, 250, 0) 100%);
+            margin-bottom: 14px;
+        }
+
+        .layui-layer-setwin .layui-layer-close {
+            display: none;
+            background: url(${domain}/asset/css/images/icon-close.png);
+            background-size: 100% 100%;
+        }
+
+        .table_box {
+            margin: 0 0 20px 0;
+            padding: 0;
+        }
+
+        /*.layui-table-view .layui-table td > div {*/
+        /*    height: 80px !important;*/
+        /*}*/
+        .layui-table-body::-webkit-scrollbar {
+            width: 0px;
+            /*height: 10px;*/
+        }
+
+        .layui-table-box tbody tr:nth-child(2n) {
+            background-color: #0E356A;
+        }
+
+        .layui-table-box tbody tr:nth-child(2n-1) {
+            background-color: #0B2F60;
+        }
+
+        .layui-table-box tbody tr:hover{
+            background-color: #0E356A !important;
+        }
+        .layui-layout-admin{
+            padding: 0 !important;
+        }
+        .bigDialogInfo{
+            overflow: auto;
+        }
+        .bigDialogInfo::-webkit-scrollbar{
+            width: 0 !important;
+        }
+        .layui-table-body .layui-table-cell{
+            padding: 5px !important;
+        }
+        .layui-table-header .layui-table-cell{
+            height: 42px !important;
+        }
+
+        .layui-table-cell .cut {
+            display: -webkit-box; /* 使用旧版的弹性盒子布局 */
+            -webkit-box-orient: vertical; /* 设置为垂直方向排列 */
+            overflow: hidden; /* 隐藏溢出内容 */
+            text-overflow: ellipsis; /* 使用省略号表示溢出内容 */
+            -webkit-line-clamp: 2; /* 显示的行数 */
+        }
+
+    </style>
+</head>
+<body style="z-index: 99999;position: relative">
+<div id="app"></div>
+<template id="template">
+    <div class="layui-layout layui-layout-admin big-dialog" style="padding:0">
+        <!-- 内容区域 -->
+        <div class="right_title" style="display: none;">
+            <span class="txt">项目信息台账</span>
+            <div class="layui-collapse">
+                <div class="layui-colla-item">
+                    <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+                    <div class="layui-colla-content layui-show">
+                        <form class="layui-form" lay-filter="searchForm">
+                            <input name="neTemp" type="hidden" value="${neTemp }"/>
+                            <input name="isZj" type="hidden" value="${isZj}"/>
+                            <input name="kind" type="hidden" value="${kind }"/>
+                            <input name="otherStatus" type="hidden" value="${projStatus }"/>
+                            <input name="rangeDate" type="hidden" value="${rangeDate }"/>
+<%--                            <input name="startAmt" type="hidden" value="${minAmt }"/>--%>
+<%--                            <input name="endAmt" type="hidden" value="${maxAmt }"/>--%>
+                            <input name="startAmt" type="hidden" value="${startAmt }"/>
+                            <input name="endAmt" type="hidden" value="${endAmt }"/>
+                            <input name="propKind" type="hidden" value="${propKind }"/>
+                            <input name="isFix" type="hidden" value="${isFix}"/>
+                            <input name="fixCat" type="hidden" value="${fixCat}"/>
+                            <input name="code" type="hidden" value="${code}"/>
+                            <input name="type" type="hidden" value="${type}"/>
+                            <input name="indusKind" type="hidden" value="${indusKind }"/>
+                            <input name="subjectId" type="hidden" value="${subjectId }"/>
+                            <input name="status" type="hidden" value="${projStatus }"/>
+                            <input name="blSub" type="hidden" value="${blSub }"/>
+                            <input name="sbdw" type="hidden" value="${unitName }"/>
+                            <input name="light" type="hidden" value="${light}"/>
+                            <input name="isYq" type="hidden" value="${isYq}"/>
+                            <input name="zjly" type="hidden" value="${zjly}"/>
+                            <input name="year" type="hidden" value="${year}"/>
+                            <input name="abc" type="hidden" value="${abc}"/>
+                            <input name="isCb" type="hidden" value="${isCb}"/>
+                            <input name="status" type="hidden" value="${status}"/>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="table_box">
+            <div class="table_process" style="position: relative">
+                <div class="export" style="background: transparent;top: 60px;">
+                    <div class="export" style="right: 0;top: 0;" @click="exportExcel">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                </div>
+                <table id="table1" lay-filter="test"></table>
+                <div id="pagination" class="pagination"></div>
+            </div>
+        </div>
+    </div>
+</template>
+<script type="text/html" id="subName">
+    <span title="{{d.subName}}">{{d.subName}}</span>
+</script>
+<script type="text/html" id="amt">
+    {{# var computedPer = function(total, now){
+    return (total == 0) ? 0 : parseInt(now * 100 / total +0.5);
+    };
+    }}
+    <span title="">总投资：{{d.amtTotal}}万元 <br/>
+		年度计划投资：{{d.yearPlanAmt}}万元 <br/>
+					年度完成投资：{{d.yearEndAmt}}万元( {{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %)</span>
+</script>
+<script type="text/html" id="date">
+    <div class="line">{{d.endDate?d.endDate:"--"}}
+
+    </div>
+<%--    <div title="">--%>
+<%--        <div class="line">计划开工：{{d.beginDate}}--%>
+
+<%--        </div>--%>
+<%--        <div class="line">计划竣工：{{d.endDate}}--%>
+
+<%--        </div>--%>
+<%--    </div>--%>
+</script>
+<%--<script type="text/html" id="headerToolbar">--%>
+<%--    <div class="toolBar">--%>
+<%--        <span style="color:#FFDD00;" lay-event="exportExcel">导出</span>--%>
+<%--    </div>--%>
+<%--</script>--%>
+<script type="text/html" id="toolBar">
+    <div class="toolBar">
+        <span style="color:#FFDD00;" lay-event="toDetail">项目信息</span>
+    </div>
+</script>
+<script>
+    new Vue({
+        el: "#app",
+        template: "#template",
+        data: {
+            winH: 0,
+            dataList: [],
+            startDate: "",
+            endDate: "",
+            tableName: 'test',
+            pageNo: 1,
+            kind: {},
+            light: null,
+            sort: {field: "amtTotal", type: ""},
+            pageSize: 10
+        },
+        mounted: function () {
+            this.init()
+        },
+        methods: {
+            init: function () {
+                this.winH = document.body.clientHeight
+                this.getData();
+                window.toDetail = this.toDetail;
+            },
+            getSearchParams: function () {
+                var param = layui.form.getValue("searchForm");
+
+                if (param.rangeDate) {
+                    param.beginDate = param.rangeDate.split(" ~ ")[0];
+                    param.endDate = param.rangeDate.split(" ~ ")[1];
+                    param.rangeDate = null;
+                    param.year = param.beginDate.substring(0, 4);
+                }
+                param.pageNo = this.pageNo;
+                param.pageSize = this.pageSize;
+                param.orderBy = this.sort.field;
+                param.orderType = this.sort.type || null;
+                return param;
+            },
+            getData: function () {
+                var self = this;
+                var param = this.getSearchParams();
+                App.postJson("/api/subInfo/query/queryPage", param, function (res) {
+                    self.dataList = res.rows;
+
+                    self.loadPage(res.total);
+                    self.loadTable(param);
+                });
+            },
+            exportExcel: function () {
+                var param = this.getSearchParams();
+
+                var url = App.getUrl("/subInfoExport/exportDetailExcel");
+                console.log(url);
+                App.common.utils.downFile(url, "POST", param, "项目台账.xlsx", "导出失败");
+                //App.common.utils.downFile(App.getUrl("/subInfoExport/exportCtTz"), "POST", param, "项目台账.xlsx", "导出失败");
+
+            },
+            loadTable: function (param) {
+                let self = this;
+
+                let columns = [];
+                switch (param.status){
+                    case '1':
+                        columns = [[ // 设置表头
+                            {field: 'mock1', type: 'numbers', fixed: 'left', align: 'center', title: '序号',width:44},
+                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 300, templet: '#subName'},
+                            {field: 'subjectName', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目建设内容', minWidth: 300,
+                                templet: function (row) {
+                                    return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
+                                }
+                            },
+                            {field: 'amtTotal', title: '计划总投资（亿元）', minWidth: 250, templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"},
+                            {field: 'progress', title: '进展情况', minWidth: 300,
+                                templet: function (row) {
+                                    return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
+                                }},
+                            {field: 'remark', title: '备注', width: 200},
+                            {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
+                        ]];
+                        break;
+                    case '2':
+                        columns = [[ // 设置表头
+                            {type: 'numbers',  align: 'center', width: 44, title: '序号',fixed: 'left'},
+                            {field: 'subName',  title: '项目名称', minWidth: 200, templet: '#subName',fixed: 'left'},
+                            {field: 'subjectName', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目建设内容', minWidth: 300,
+                                templet: function (row) {
+                                    return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
+                                }},
+                            {
+                                field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                    return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                                }
+                            },
+                            // {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
+                            {field: 'xmbaStatus', title: '前期手续办理情况', minWidth: 160, templet: '#preInfo'},
+                            {field: 'remark', title: '备注', minWidth: 245, templet: '#remark'},
+                            {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
+                        ]]
+                        break;
+                    case '3':
+                        columns = [[ // 设置表头
+                            {
+                                type: 'numbers',
+                                fixed: 'left',
+                                align: 'center',
+                                title: '序号',
+                                width: 50,
+                                templet: function (row) {
+                                    if (row < 10) {
+                                        return '0' + row;
+                                    } else {
+                                        return row;
+                                    }
+                                }
+                            },
+                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
+                            {field: 'subjectName', title: '项目所在地', width: 100},
+                            {field: 'content', title: '项目建设内容', width: 300,
+                                templet: function (row) {
+                                    return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
+                                }},
+                            {
+                                field: 'amtTotal',  title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                    return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                                }
+                            },
+                            {field: 'endDate',  title: '建成投产时间', width: 100,templet: '#date'},
+                            {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100},
+                            {field: 'progress',  title: '进展情况', width: 300,
+                                templet: function (row) {
+                                    return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
+                                }},
+                            {field: 'remark', title: '备注', width: 200},
+                            {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
+                        ]]
+                        break;
+                    case '4':
+                        columns = [[ // 设置表头
+                            {type: 'numbers', fixed: 'left', align: 'center', title: '序号', width: 44},
+                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
+                            {field: 'subjectName', title: '项目所在地', width: 100},
+                            {field: 'content', title: '项目基本情况', minWidth: 300,
+                                templet: function (row) {
+                                    return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
+                                }},
+                            {field: 'rtDate', title: '升规入统时间', minWidth: 160,templet: '#date'},
+                            {field: 'progress', title: '进展情况', minWidth: 300,
+                                templet: function (row) {
+                                    return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
+                                }},
+                            {field: 'remark', title: '备注', minWidth: 150},
+                            {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
+                        ]]
+                        break;
+                    default:
+                        columns = [[
+                            {type: 'numbers', align: 'center', width: 44, title: '序号',fixed: 'left'},
+                            {field: 'subName', title: '项目名称', minWidth: 200, templet: '#subName',fixed: 'left'},
+                            {field: 'subjectName', title: '项目所在地', width: 100},
+                            {field: 'content', title: '建设内容', minWidth: 300,
+                                templet: function (row) {
+                                    return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
+                                }},
+                            {
+                                field: 'amtTotal',
+                                title: '总投资',
+                                width: 100,
+                                templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
+                            },
+                            {field: 'statusName', title: '状态', width: 160},
+                            {field: 'beginDate', title: '计划开工日期', minWidth: 160},
+                            {field: 'endDate', title: '计划完工日期', minWidth: 160},
+                            {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
+                        ]]
+                        break;
+                }
+                layui.table.render({
+                    elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
+                    even: true,
+                    autoSort: false,
+                    toolbar: '#headerToolbar',
+                    defaultToolbar: [],
+                    initSort: self.sort,
+                    cols: columns,
+                    data: self.dataList,
+                    fixed: true,
+                    heigt: window.screen.availHeight - 250,
+                    done: function (res, curr, count) {
+                        res.data.forEach(function (item, index) {
+                            if (index % 2 == 0) {
+                                var tr = $('.layui-table-view').find(".layui-table-box tbody tr[data-index='" + index + "']").eq(0).css("background-color", "#0B2F60");
+                                var tr = $('.layui-table-view').find(".layui-table-box tbody tr[data-index='" + index + "']").eq(1).css("background-color", "#123D77");
+                            } else {
+                                var tr = $('.layui-table-view').find(".layui-table-box tbody tr[data-index='" + index + "']").eq(0).css("background-color", "#0E356A");
+                                var tr = $('.layui-table-view').find(".layui-table-box tbody tr[data-index='" + index + "']").eq(1).css("background-color", "#14427F");
+                            }
+                            // $(".layui-table-main tr").each(function (index, val) {
+                            //     $($(".layui-table-fixed .layui-table-body tbody tr")[index]).height($(val).height());
+                            // });
+                            $(".layui-table-body  tr").resize(function () {
+                                $(".layui-table-body  tr").each(function (index, val) {
+                                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height());
+                                });
+                            });
+                            //初始化高度，使得冻结行表体高度一致
+                            $(".layui-table-body  tr").each(function (index, val) {
+                                $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height());
+                            });
+
+                        });
+                    }
+                });
+                layui.table.on('toolbar(' + this.tableName + ')', function (obj) {
+                    var event = obj.event;
+                    self[event].call(this, obj);
+                });
+                layui.table.on('tool(' + this.tableName + ')', function (obj) {
+                    var event = obj.event;
+                    self[event].call(this, obj);
+                });
+                layui.table.on('sort(' + this.tableName + ')', function (obj) {
+                    self.sort = obj;
+                    self.getData();
+                    return;
+                })
+            },
+            loadPage: function (totalCount) {
+                var self = this;
+                layui.laypage.render({
+                    elem: 'pagination',
+                    count: totalCount,
+                    curr: self.pageNo,
+                    limit: self.pageSize,
+                    layout: ['count', 'prev', 'page', 'next', 'skip'],
+                    jump: function (obj, first) {
+                        //首次不执行
+                        if (!first) {
+                            self.pageNo = obj.curr;
+                            self.getData();
+                        }
+                    }
+                });
+            },
+            toDetail: function (obj) {
+                //详情
+                var index = top.layer.open({
+                    type: 2,
+                    title: '',
+                    closeBtn: 0,
+                    area: ['1000px', '1000px'],
+                    content: App.getUrl("/subject/subInfo/bigScreenView?isCt=true&layer=true&subId=" + obj.data.id + "&queryYear=" + obj.data.year + "&lastUrl=" + window.location.href),
+                    skin: "bigDialogInfo"
+                });
+                top.layui.layer.full(index);
+            },
+            search: function () {
+                var param = layui.form.getValue("searchForm");
+                window.localStorage.setItem(this.cacheName, JSON.stringify(param));
+                this.pageNo = 1;
+                this.getData();
+            }
+        }
+    });
+</script>
+</body>
+</html>

projects/src/main/webapp/vmodules/statics/layer/subInfo/projInfo_yb.jsp

@@ -178,22 +178,22 @@
 							v-for="(item,index) in yearsArray" :key="index" @click="clickYear(item)">{{item}}年度
 					</button>
 				</div>
-				<div class="year-choose-box">
-					<div class="jihuazj">
-						<div class="year-choose-intro">计划</div>
-						<div class="year-choose-value">
-							<%--                                {{plan.planAmtYear}}--%>
-							<span class="year-choose-unit">(万元)</span>
-						</div>
-					</div>
-					<div class="jihuazj">
-						<div class="year-choose-intro">实际</div>
-						<div class="year-choose-value">
-							<%--                            {{plan.planAmtYear}}--%>
-							<span class="year-choose-unit">(万元)</span>
-						</div>
-					</div>
-				</div>
+<%--				<div class="year-choose-box">--%>
+<%--					<div class="jihuazj">--%>
+<%--						<div class="year-choose-intro">计划</div>--%>
+<%--						<div class="year-choose-value">--%>
+<%--							&lt;%&ndash;                                {{plan.planAmtYear}}&ndash;%&gt;--%>
+<%--							<span class="year-choose-unit">(万元)</span>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--					<div class="jihuazj">--%>
+<%--						<div class="year-choose-intro">实际</div>--%>
+<%--						<div class="year-choose-value">--%>
+<%--							&lt;%&ndash;                            {{plan.planAmtYear}}&ndash;%&gt;--%>
+<%--							<span class="year-choose-unit">(万元)</span>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-colla-content layui-show" style="height: auto;padding: 0">
 					<div class="table_progress" style="padding-top: 0;">
 						<table id="table1" lay-filter="test"></table>
@@ -202,20 +202,20 @@
 			</form>
 		</div>
 	</div>
-	<div class="process-content">
-		<div class="layui-row">
-			<div class="layui-col-xs3 layui-col-sm3">
-				<div class="layui-form-item">
-					<div class="layui-input-block" style="height: 30px">
-						<input class="layui-input" readonly="readonly" id="year">
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="table_box" style="padding-top: 0;margin: 0;">
-			<table id="table_zb" lay-filter="test"></table>
-		</div>
-	</div>
+<%--	<div class="process-content">--%>
+<%--		<div class="layui-row">--%>
+<%--			<div class="layui-col-xs3 layui-col-sm3">--%>
+<%--				<div class="layui-form-item">--%>
+<%--					<div class="layui-input-block" style="height: 30px">--%>
+<%--						<input class="layui-input" readonly="readonly" id="year">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--		<div class="table_box" style="padding-top: 0;margin: 0;">--%>
+<%--			<table id="table_zb" lay-filter="test"></table>--%>
+<%--		</div>--%>
+<%--	</div>--%>
 
 </div>
 	</div>
@@ -258,42 +258,46 @@ new Vue({
 				even: true,
 				limit:data.length,
 				cols: [[ // 设置表头
-					{field: 'kjMonth', title: '月报期间', align:'center',type:'string', width: '20%'},
-					{
-                        field: 'amtPlan', title: '本月实际投资', width: '20%', templet: function (row) {
-                            if (row.amtPlan != null && row.amtPlan != 'undefined') {
-                                return "<span>" + row.amtPlan + "万元</span>";
-                            } else {
-                                return "";
-                            }
-                        }
-                    },
-					{field: 'amt', title: '本月实际投资', align:'center',type:'string', width: '20%', templet: function(row){
-						if(row.amt){
-							return "<span>"+row.amt+"万元</span>";
-						}else{
-							return "";
-						}
-					}},
-					{field: 'amt', title: '本月固投金额', align:'center',type:'string', width: '20%', templet: function(row){
-							if(row.amt_rt){
-								return "<span>"+row.amt_rt+"万元</span>";
-							}else{
-								return "";
-							}
-						}},
-					{field: 'amt', title: '差额', align:'center',type:'string', width: '20%', templet: function(row){
-							if(row.amt_rt != null && row.amt_rt+'' != ''){
-								return '<span>'+(parseInt(row.amt||0)-parseInt(row.amt_rt))+'万元</span>';
-							}else{
-								if(row.amt != null && row.amt+'' != ''){
-									return '<span>'+(row.amt||0)+'万元</span>';
-								}else{
-									return "";
-								}
-							}
-						}},
-					{field: 'content', title: '项目进展情况', align:'center',type:'string', width: '60%'}
+					{type: 'numbers', title: '序号', width: '50'},
+					{field: 'kjMonth', title: '月份', width: '80', totalRowText: '合计'},
+					{field: 'numBl', title: '进度比例-%', width: '200'},
+					{field: 'content', title: '进度说明', width: '200'},
+					// {field: 'kjMonth', title: '月报期间', align:'center',type:'string', width: '20%'},
+					// {
+                    //     field: 'amtPlan', title: '本月实际投资', width: '20%', templet: function (row) {
+                    //         if (row.amtPlan != null && row.amtPlan != 'undefined') {
+                    //             return "<span>" + row.amtPlan + "万元</span>";
+                    //         } else {
+                    //             return "";
+                    //         }
+                    //     }
+                    // },
+					// {field: 'amt', title: '本月实际投资', align:'center',type:'string', width: '20%', templet: function(row){
+					// 	if(row.amt){
+					// 		return "<span>"+row.amt+"万元</span>";
+					// 	}else{
+					// 		return "";
+					// 	}
+					// }},
+					// {field: 'amt', title: '本月固投金额', align:'center',type:'string', width: '20%', templet: function(row){
+					// 		if(row.amt_rt){
+					// 			return "<span>"+row.amt_rt+"万元</span>";
+					// 		}else{
+					// 			return "";
+					// 		}
+					// 	}},
+					// {field: 'amt', title: '差额', align:'center',type:'string', width: '20%', templet: function(row){
+					// 		if(row.amt_rt != null && row.amt_rt+'' != ''){
+					// 			return '<span>'+(parseInt(row.amt||0)-parseInt(row.amt_rt))+'万元</span>';
+					// 		}else{
+					// 			if(row.amt != null && row.amt+'' != ''){
+					// 				return '<span>'+(row.amt||0)+'万元</span>';
+					// 			}else{
+					// 				return "";
+					// 			}
+					// 		}
+					// 	}},
+					// {field: 'content', title: '项目进展情况', align:'center',type:'string', width: '60%'}
 				]],
 				data:data,
 				done: function(res, curr, count){
@@ -358,7 +362,7 @@ new Vue({
 					for (let i = 0; i < datas.length; i++) {
 						datas[i].kjMonth = datas[i].beginDate + "至" + datas[i].endDate
 					}
-					self.loadTable_weekReport(datas);
+					// self.loadTable_weekReport(datas);
 				}
 			});
 		},

projects/src/main/webapp/vmodules/statics/layer/subInfo/projectInfo.jsp

@@ -44,8 +44,8 @@ body::-webkit-scrollbar{
 <template id="template">
 	<div class="layui-layout layui-layout-admin big-dialog" style="padding-bottom: 60px;">
 		<input type="hidden" id="subId" value="${sunInfo.id }"/>
-		<input type="hidden" id="projectName" value="${sunInfo.sub_name }"/>
-		<input type="hidden" id="unitName" value="${sunInfo.unitName }"/>
+		<input type="hidden" id="projectName" value="${sunInfo.subName }"/>
+		<input type="hidden" id="unitName" value="${sunInfo.unitDesc }"/>
 		<!-- 内容区域 -->
 			<div class="right_title">
 				<ul class="dialog-tabs">
@@ -66,135 +66,229 @@ body::-webkit-scrollbar{
 				</ul>
 				<div class="layui-collapse" @click="backHis()"></div>
 			</div>
-			<div class="table_box">
-				<div class="table_title">
-					<div class="left" style="margin-bottom:21px;">
-						<div class="h1 title_h1">${sunInfo.sub_name }</div>
-						<c:if test="${sunInfo.status == '7' || sunInfo.status == 'A' || sunInfo.status == '9'}">
-							<div class="txt txt1 title_h1"><div class="icon icon1"><i class="layui-icon layui-icon-ok"></i></div>计划开工</div>
-						</c:if>
-						<c:if test="${sunInfo.status != '7' && sunInfo.status != 'A' && sunInfo.status != '9'}">
-							<div class="txt txt2 title_h1"><div class="icon icon2">-</div>计划开工</div>
-						</c:if>
-						<c:if test="${sunInfo.status == '9' || sunInfo.status == 'A'}">
-							<div class="txt txt1 title_h1"><div class="icon icon1"><i class="layui-icon layui-icon-ok"></i></div>计划竣工</div>
-						</c:if>
-						<c:if test="${sunInfo.status != '9' && sunInfo.status != 'A'}">
-							<div class="txt txt2 title_h1"><div class="icon icon2">-</div>计划竣工</div>
-						</c:if>
-					</div>
-				</div>
-				<div class="table_title">
-					<div class="left item-title-box">
-						<div class="item-title-border"></div>
-						<div class="item-title">项目基本情况</div>
-					</div>
-				</div>
-				<table class="table1" >
-					<tr>
-						<td class="label" style="width: 10%">项目代码</td>
-						<td style="width:40%">${sunInfo.sub_code }</td>
-						<td class="label" style="width: 10%">项目名称</td>
-						<td style="width:40%">${sunInfo.sub_name }</td>
-					</tr>
-					<tr>
-						<td class="label">建设性质</td>
-						<td>${sunInfo.propKindName }</td>
-						<td class="label">所属行业</td>
-						<td>${sunInfo.indusName }</td>
-					</tr>
-					<tr>
-						<td class="label">项目类型</td>
-						<td>${sunInfo.kindName }</td>
-						<td class="label">建设地点</td>
-						<td>${sunInfo.subjectName }</td>
-					</tr>
-					<tr>
-						<td class="label">建设内容及规模</td>
-						<td>${sunInfo.content }</td>
-						<td class="label">备注</td>
-						<td>${sunInfo.remark }</td>
-					</tr>
-					<tr>
-						<td class="label">监管单位</td>
-						<td>${sunInfo.mainName }</td>
-						<td class="label">项目单位</td>
-						<td>
-							<a href="https://www.qcc.com/search?key=${sunInfo.unitName}" target="_blank" title="点击查看企业信息">
-								${sunInfo.unitName }
-							</a>
-						</td>
-					</tr>
-					<tr>
-						<td class="label">创建时间</td>
-						<td colspan="3"><fmt:formatDate value="${sunInfo.create_time }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					</tr>
-				</table>
-				<div class="table_title">
-					<div class="left item-title-box">
-						<div class="item-title-border"></div>
-						<div class="item-title">资金信息</div>
-					</div>
-				</div>
-				<table class="table1">
-					<tr>
-						<td class="label">投资类型</td>
-						<td>${sunInfo.kindNature }</td>
-						<td class="label" style="width: 10%">总投资金额</td>
-						<td style="width: 40%">${sunInfo.amt_total }万元</td>
-					</tr>
-					<tr>
-						<td class="label" rowspan="${rowNum }">资金来源</td>
-						<c:if test="${rowNum == 1 }">
-						<td colspan="3"></td>
-						</c:if>
-					</tr>
-					<c:forEach items="${subSource}" var="source">
-					<tr>
-						<td class="label">${source.sourceName }</td>
-						<td colspan="1">${source.amt }万元</td>
-						<td colspan="1">到位${source.amtSj?source.amtSj:0 }万元</td>
-					</tr>
-					</c:forEach>
-					<tr>
-						<td class="label" style="width: 10%;">年度计划投资（发改委）</td>
-						<td style="width: 40%;">${sunInfo.amt_year }万元</td>
-						<td class="label" style="width: 10%;">${currYear}年度计划月累计金额</td>
-						<td style="width: 40%;">${currYearAmtPlan }万元</td>
-					</tr>
-					<tr>
-						<td class="label" style="width: 10%">到位资金</td>
-						<td style="width: 40%" colspan="3">${sunInfo.amt_comptotal }万元</td>
-					</tr>
-				</table>
-				<div class="table_title">
-					<div class="left item-title-box">
-						<div class="item-title-border"></div>
-						<div class="item-title">项目进度</div>
-					</div>
-				</div>
-				<table class="table1" width="100%">
-					<tr>
-						<td class="label" style="width: 10%">计划开工时间</td>
-						<td style="width: 40%">${sunInfo.begin_date }</td>
-						<td class="label" style="width: 10%">计划竣工时间</td>
-						<td style="width: 40%">${sunInfo.end_date }</td>
-					</tr>
-					<tr>
-						<td class="label">平台联系人</td>
-						<td>${sunInfo.name_zrr }</td>
-						<td class="label">平台联系人电话</td>
-						<td>${sunInfo.tel }</td>
-					</tr>
+		<div class="table_box">
+			<table class="table1 page-table">
+				<tr>
+					<td class="label" style="width: 10%">项目代码</td>
+					<td style="width: 40%">${sunInfo.subCode }</td>
+					<td class="label" style="width: 10%">项目名称</td>
+					<td style="width: 40%">${sunInfo.subName }</td>
+				</tr>
+				<tr>
+					<td class="label" style="width: 10%">建设性质</td>
+					<td style="width: 40%">${sunInfo.statusName }</td>
+					<td class="label" style="width: 10%">所属行业</td>
+					<td style="width: 40%">${sunInfo.indusName }</td>
+				</tr>
+				<tr>
+					<%--<td class="label" style="display: none">项目类型</td>
+                    <td style="display: none">${sunInfo.kindName }</td>--%>
+					<td class="label">项目所在地</td>
+					<td>${sunInfo.subjectName }</td>
+				</tr>
+				<tr>
+					<td class="label">建设内容及规模</td>
+					<td>${sunInfo.content }</td>
+					<td class="label">备注</td>
+					<td>${sunInfo.remark }</td>
+				</tr>
+				<tr>
+					<td class="label">项目单位</td>
+					<td>${sunInfo.unitDesc }</td>
+				</tr>
+				<tr>
+					<td class="label">创建用户</td>
+					<td>${sunInfo.createUserName }</td>
+					<td class="label">创建时间</td>
+					<td><fmt:formatDate value="${sunInfo.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+				</tr>
+			</table>
 
-					<tr>
-						<td class="label">项目总负责人</td>
-						<td>${sunInfo.name_lead }</td>
-						<td class="label">项目总负责人电话</td>
-						<td>${sunInfo.tel_lead }</td>
-					</tr>
-				</table>
-			</div>
+			<div class="table-title">资金信息</div>
+			<table class="table1 page-table">
+				<tr>
+					<td class="label" style="width:20%">总投资金额</td>
+					<td style="width: 40%">${sunInfo.amtTotal }万元</td>
+				</tr>
+				<%--					<tr>
+                                        <td class="label" rowspan="${rowNum }">资金来源</td>
+                                        <c:if test="${rowNum == 1 }">
+                                        <td colspan="3"></td>
+                                        </c:if>
+                                    </tr>
+                                    <c:forEach items="${subSource}" var="source">
+                                    <tr>
+                                        <td class="label">${source.sourceName }</td>
+                                        <td colspan="1">投资：${source.amt }万元</td>
+                                        <td colspan="1">到位：${source.amtSj}万元</td>
+                                    </tr>
+                                    </c:forEach>
+                                    <tr>
+                                        <td class="label" style="width: 10%;">年度计划投资（发改委）</td>
+                                        <td style="width: 40%;">${sunInfo.amt_year }万元</td>
+                                        <td class="label" >到位资金</td>
+                                        <td style="width: 40%">${sunInfo.amt_comptotal }万元</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="label" style="width: 10%;">${currYear}年度计划月累计金额</td>
+                                        <td style="width: 40%;">${currYearAmtPlan }万元</td>
+                                        <td class="label" >实际完成资金</td>
+                                        <td style="width: 40%">${sunInfo.yearAmtSj }万元</td>
+                                    </tr>--%>
+			</table>
+
+			<div class="table-title">项目进度</div>
+			<table class="table1 page-table">
+				<tr>
+					<td class="label">计划开工时间</td>
+					<td><fmt:formatDate value="${sunInfo.beginDate }" pattern="yyyy-MM-dd"/></td>
+					<td class="label">计划竣工时间</td>
+					<td><fmt:formatDate value="${sunInfo.endDate }" pattern="yyyy-MM-dd"/></td>
+				</tr>
+				<tr>
+					<td class="label">平台联系人</td>
+					<td>${sunInfo.nameZrr }</td>
+					<td class="label">平台联系人电话</td>
+					<td>${sunInfo.tel }</td>
+				</tr>
+
+				<tr>
+					<td class="label">项目总负责人</td>
+					<td>${sunInfo.nameLead }</td>
+					<td class="label">项目总负责人电话</td>
+					<td>${sunInfo.telLead }</td>
+				</tr>
+			</table>
+		</div>
+<%--			<div class="table_box">--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left" style="margin-bottom:21px;">--%>
+<%--						<div class="h1 title_h1">${sunInfo.sub_name }</div>--%>
+<%--						<c:if test="${sunInfo.status == '7' || sunInfo.status == 'A' || sunInfo.status == '9'}">--%>
+<%--							<div class="txt txt1 title_h1"><div class="icon icon1"><i class="layui-icon layui-icon-ok"></i></div>计划开工</div>--%>
+<%--						</c:if>--%>
+<%--						<c:if test="${sunInfo.status != '7' && sunInfo.status != 'A' && sunInfo.status != '9'}">--%>
+<%--							<div class="txt txt2 title_h1"><div class="icon icon2">-</div>计划开工</div>--%>
+<%--						</c:if>--%>
+<%--						<c:if test="${sunInfo.status == '9' || sunInfo.status == 'A'}">--%>
+<%--							<div class="txt txt1 title_h1"><div class="icon icon1"><i class="layui-icon layui-icon-ok"></i></div>计划竣工</div>--%>
+<%--						</c:if>--%>
+<%--						<c:if test="${sunInfo.status != '9' && sunInfo.status != 'A'}">--%>
+<%--							<div class="txt txt2 title_h1"><div class="icon icon2">-</div>计划竣工</div>--%>
+<%--						</c:if>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left item-title-box">--%>
+<%--						<div class="item-title-border"></div>--%>
+<%--						<div class="item-title">项目基本情况</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<table class="table1" >--%>
+<%--					<tr>--%>
+<%--						<td class="label" style="width: 10%">项目代码</td>--%>
+<%--						<td style="width:40%">${sunInfo.sub_code }</td>--%>
+<%--						<td class="label" style="width: 10%">项目名称</td>--%>
+<%--						<td style="width:40%">${sunInfo.sub_name }</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">建设性质</td>--%>
+<%--						<td>${sunInfo.propKindName }</td>--%>
+<%--						<td class="label">所属行业</td>--%>
+<%--						<td>${sunInfo.indusName }</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">项目类型</td>--%>
+<%--						<td>${sunInfo.kindName }</td>--%>
+<%--						<td class="label">建设地点</td>--%>
+<%--						<td>${sunInfo.subjectName }</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">建设内容及规模</td>--%>
+<%--						<td>${sunInfo.content }</td>--%>
+<%--						<td class="label">备注</td>--%>
+<%--						<td>${sunInfo.remark }</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">监管单位</td>--%>
+<%--						<td>${sunInfo.mainName }</td>--%>
+<%--						<td class="label">项目单位</td>--%>
+<%--						<td>--%>
+<%--							<a href="https://www.qcc.com/search?key=${sunInfo.unitName}" target="_blank" title="点击查看企业信息">--%>
+<%--								${sunInfo.unitName }--%>
+<%--							</a>--%>
+<%--						</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">创建时间</td>--%>
+<%--						<td colspan="3"><fmt:formatDate value="${sunInfo.create_time }" pattern="yyyy-MM-dd HH:mm:ss"/></td>--%>
+<%--					</tr>--%>
+<%--				</table>--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left item-title-box">--%>
+<%--						<div class="item-title-border"></div>--%>
+<%--						<div class="item-title">资金信息</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<table class="table1">--%>
+<%--					<tr>--%>
+<%--						<td class="label">投资类型</td>--%>
+<%--						<td>${sunInfo.kindNature }</td>--%>
+<%--						<td class="label" style="width: 10%">总投资金额</td>--%>
+<%--						<td style="width: 40%">${sunInfo.amt_total }万元</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label" rowspan="${rowNum }">资金来源</td>--%>
+<%--						<c:if test="${rowNum == 1 }">--%>
+<%--						<td colspan="3"></td>--%>
+<%--						</c:if>--%>
+<%--					</tr>--%>
+<%--					<c:forEach items="${subSource}" var="source">--%>
+<%--					<tr>--%>
+<%--						<td class="label">${source.sourceName }</td>--%>
+<%--						<td colspan="1">${source.amt }万元</td>--%>
+<%--						<td colspan="1">到位${source.amtSj?source.amtSj:0 }万元</td>--%>
+<%--					</tr>--%>
+<%--					</c:forEach>--%>
+<%--					<tr>--%>
+<%--						<td class="label" style="width: 10%;">年度计划投资（发改委）</td>--%>
+<%--						<td style="width: 40%;">${sunInfo.amt_year }万元</td>--%>
+<%--						<td class="label" style="width: 10%;">${currYear}年度计划月累计金额</td>--%>
+<%--						<td style="width: 40%;">${currYearAmtPlan }万元</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label" style="width: 10%">到位资金</td>--%>
+<%--						<td style="width: 40%" colspan="3">${sunInfo.amt_comptotal }万元</td>--%>
+<%--					</tr>--%>
+<%--				</table>--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left item-title-box">--%>
+<%--						<div class="item-title-border"></div>--%>
+<%--						<div class="item-title">项目进度</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<table class="table1" width="100%">--%>
+<%--					<tr>--%>
+<%--						<td class="label" style="width: 10%">计划开工时间</td>--%>
+<%--						<td style="width: 40%">${sunInfo.begin_date }</td>--%>
+<%--						<td class="label" style="width: 10%">计划竣工时间</td>--%>
+<%--						<td style="width: 40%">${sunInfo.end_date }</td>--%>
+<%--					</tr>--%>
+<%--					<tr>--%>
+<%--						<td class="label">平台联系人</td>--%>
+<%--						<td>${sunInfo.name_zrr }</td>--%>
+<%--						<td class="label">平台联系人电话</td>--%>
+<%--						<td>${sunInfo.tel }</td>--%>
+<%--					</tr>--%>
+
+<%--					<tr>--%>
+<%--						<td class="label">项目总负责人</td>--%>
+<%--						<td>${sunInfo.name_lead }</td>--%>
+<%--						<td class="label">项目总负责人电话</td>--%>
+<%--						<td>${sunInfo.tel_lead }</td>--%>
+<%--					</tr>--%>
+<%--				</table>--%>
+<%--			</div>--%>
 <%--			<div class="table_box" style="margin-bottom:60px;width:100%">--%>
 <%--				<div class="table_title">--%>
 <%--					<div class="left item-title-box">--%>
@@ -212,40 +306,40 @@ body::-webkit-scrollbar{
 <%--					</div>--%>
 <%--				</div>--%>
 <%--			</div>--%>
-			<div class="table_box" style="margin-bottom:60px;width:100%">
-				<div class="table_title">
-					<div class="left item-title-box">
-						<div class="item-title-border"></div>
-						<div class="item-title">监管单位</div>
-					</div>
-				</div>
-				<div class="table_process">
-					<table id="jgdw" lay-filter="jgdw"></table>
-					<div class="no-info-div" v-if="jgdw.length==0">
-						<div class="no-info-box">
-							<img src="${WebSite.asset}/css/images/noinfo.svg">
-							<div class="no-info-description">抱歉，暂无获取到相关数据！</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="table_box" style="margin-bottom:60px;width:100%">
-				<div class="table_title">
-					<div class="left item-title-box">
-						<div class="item-title-border"></div>
-						<div class="item-title">审核过程</div>
-					</div>
-				</div>
-				<div class="table_process">
-					<table id="shgc" lay-filter="shgc"></table>
-					<div class="no-info-div" v-if="shgc.length==0">
-						<div class="no-info-box">
-							<img src="${WebSite.asset}/css/images/noinfo.svg">
-							<div class="no-info-description">抱歉，暂无获取到相关数据！</div>
-						</div>
-					</div>
-				</div>
-			</div>
+<%--			<div class="table_box" style="margin-bottom:60px;width:100%">--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left item-title-box">--%>
+<%--						<div class="item-title-border"></div>--%>
+<%--						<div class="item-title">监管单位</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="table_process">--%>
+<%--					<table id="jgdw" lay-filter="jgdw"></table>--%>
+<%--					<div class="no-info-div" v-if="jgdw.length==0">--%>
+<%--						<div class="no-info-box">--%>
+<%--							<img src="${WebSite.asset}/css/images/noinfo.svg">--%>
+<%--							<div class="no-info-description">抱歉，暂无获取到相关数据！</div>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--			<div class="table_box" style="margin-bottom:60px;width:100%">--%>
+<%--				<div class="table_title">--%>
+<%--					<div class="left item-title-box">--%>
+<%--						<div class="item-title-border"></div>--%>
+<%--						<div class="item-title">审核过程</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="table_process">--%>
+<%--					<table id="shgc" lay-filter="shgc"></table>--%>
+<%--					<div class="no-info-div" v-if="shgc.length==0">--%>
+<%--						<div class="no-info-box">--%>
+<%--							<img src="${WebSite.asset}/css/images/noinfo.svg">--%>
+<%--							<div class="no-info-description">抱歉，暂无获取到相关数据！</div>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 	</div>
 </template>
 <script type="text/html" id="imageDiv">

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

@@ -195,6 +195,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">
+                                    <input type="text" required lay-verify="required" placeholder="请输入项目地址"
+                                           autocomplete="off" class="layui-input" v-model="subInfo.addre">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="layui-row">
                         <div class="layui-col-xs12 layui-col-sm12">
                             <div class="layui-form-item">
@@ -434,8 +446,7 @@
                                         <option value="1">正在谋划</option>
                                         <option value="2">正在洽谈</option>
                                         <option value="3">已签约</option>
-                                        <option value="4">已备案</option>
-                                        <option value="5">已核准</option>
+                                        <option value="4">已备案/已核准</option>
                                     </select>
                                 </div>
                             </div>

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

@@ -200,36 +200,58 @@
         </div>
         <div>
             <div class="layui-row class_ls">
+<%--                <div style="display: flex;margin-bottom: 3px">--%>
+<%--                    <label class="juli">--%>
+<%--                        储备项目总数--%>
+<%--                        <span class="info-icon" title="A类项目：成熟类项目，可研或初设已编制并完成初审，达到项目等资金的进度"></span>--%>
+<%--                        <span class="lanse-first">{{beginRate.num}}</span>--%>
+<%--                    </label>--%>
+<%--                    <label class="juli" onclick="levelList('abcs','A类','A')">--%>
+<%--                        A类项目数--%>
+<%--                        <span class="info-icon" title="A类项目：成熟类项目，可研或初设已编制并完成初审，达到项目等资金的进度"></span>--%>
+<%--                        <span class="lanse-first">{{beginRate.anum}}</span>--%>
+<%--                    </label>--%>
+<%--                    <label class="juli">--%>
+<%--                        B类项目数--%>
+<%--                        <span class="info-icon" title="B类项目：推进类项目，正在抓紧推进前期手续，预计6-12个月可开工项目"></span>--%>
+<%--                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.bnum}}</span>--%>
+<%--                    </label>--%>
+<%--                    <label class="juli" onclick="levelList('abcs','C类','C')">--%>
+<%--                        C类项目数--%>
+<%--                        <span class="info-icon" title="C类项目：意向类项目，还处于谋划论证阶段项目"></span>--%>
+<%--                        <span class="lanse-first" style="color: #E0534E">{{beginRate.cnum}}</span>--%>
+<%--                    </label>--%>
+<%--                    <label class="juli" onclick="levelList('abcs','D类','D')">--%>
+<%--                        D类项目数--%>
+<%--                        <span class="info-icon" title="D类项目"></span>--%>
+<%--                        <span class="lanse-first" style="color: #405dee">{{beginRate.dnum}}</span>--%>
+<%--                    </label>--%>
+<%--                    <label class="juli" onclick="levelList('abcs','其它类','UNKNOWN_CATEGORY')">--%>
+<%--                        其它项目数--%>
+<%--                        <span class="info-icon" title="其它类项目"></span>--%>
+<%--                        <span class="lanse-first" style="color: #ba22ec">{{beginRate.nnum}}</span>--%>
+<%--                    </label>--%>
+<%--                </div>--%>
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli">
-                        储备项目总数
-                        <span class="info-icon" title="A类项目：成熟类项目，可研或初设已编制并完成初审，达到项目等资金的进度">?</span>
-                        <span class="lanse-first">{{beginRate.num}}</span>
+                        正在谋划
+                        <span class="info-icon" title="正在谋划"></span>
+                        <span class="lanse-first">{{beginRate.bePlanningNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','A类','A')">
-                        A类项目数
-                        <span class="info-icon" title="A类项目：成熟类项目，可研或初设已编制并完成初审，达到项目等资金的进度">?</span>
-                        <span class="lanse-first">{{beginRate.anum}}</span>
+                        正在洽谈
+                        <span class="info-icon" title="正在洽谈"></span>
+                        <span class="lanse-first">{{beginRate.negotiationNum}}</span>
                     </label>
                     <label class="juli">
-                        B类项目数
-                        <span class="info-icon" title="B类项目：推进类项目，正在抓紧推进前期手续，预计6-12个月可开工项目">?</span>
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.bnum}}</span>
+                        已签约
+                        <span class="info-icon" title="已签约"></span>
+                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','C类','C')">
-                        C类项目数
-                        <span class="info-icon" title="C类项目：意向类项目，还处于谋划论证阶段项目">?</span>
-                        <span class="lanse-first" style="color: #E0534E">{{beginRate.cnum}}</span>
-                    </label>
-                    <label class="juli" onclick="levelList('abcs','D类','D')">
-                        D类项目数
-                        <span class="info-icon" title="D类项目">?</span>
-                        <span class="lanse-first" style="color: #405dee">{{beginRate.dnum}}</span>
-                    </label>
-                    <label class="juli" onclick="levelList('abcs','其它类','UNKNOWN_CATEGORY')">
-                        其它项目数
-                        <span class="info-icon" title="其它类项目">?</span>
-                        <span class="lanse-first" style="color: #ba22ec">{{beginRate.nnum}}</span>
+                        已备案/已核准
+                        <span class="info-icon" title="已备案/已核准"></span>
+                        <span class="lanse-first" style="color: #E0534E">{{beginRate.recordAndApproveNum}}</span>
                     </label>
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
@@ -306,7 +328,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 
@@ -319,7 +341,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -333,7 +355,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -380,7 +402,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -392,13 +414,13 @@
                 param.statusName = statusMap[param.status] || "未知状态";
                 let self = this;
                 self.closeAllLayers();
-                App.msg.confirm(`是否移入` + param.statusName + `库？`, () => {
+                App.msg.confirm(`是否转入` + param.statusName + `库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", {id: param.id, status: param.status}, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -574,7 +596,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 200},
-                        {title: '操作', width: 225, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: $(window).height() - $('#table1').offset().top - 50,
@@ -603,7 +625,7 @@
                 const formTemplate = document.getElementById('moveForm').innerHTML;
                 layer.open({
                     type: 1,
-                    title: '移入',
+                    title: '转库',
                     content: formTemplate,
                     area: ['350px', '300px'],
                     success: function (layero, index) {

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

@@ -643,7 +643,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 
@@ -735,7 +735,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -749,7 +749,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -792,7 +792,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -804,13 +804,13 @@
                 const statusName = statusMap[param.status] || "未知状态";
 
                 this.closeAllLayers();
-                App.msg.confirm(`是否移入`+statusName+`库？`, () => {
+                App.msg.confirm(`是否转入`+statusName+`库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", { id: param.id, status: param.status }, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -1123,7 +1123,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark',  title: '备注', minWidth: 200},
-                        {title: '操作', width: 225, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 450,

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

@@ -896,7 +896,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 150},
-                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,

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

@@ -932,7 +932,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 200},
-                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,

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

@@ -695,7 +695,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 <script type="text/html" id="moveForm">
@@ -707,7 +707,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -721,7 +721,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -766,7 +766,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -778,13 +778,13 @@
                 const statusName = statusMap[param.status] || "未知状态";
 
                 this.closeAllLayers();
-                App.msg.confirm(`是否移入`+statusName+`库？`, () => {
+                App.msg.confirm(`是否转入`+statusName+`库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", { id: param.id, status: param.status }, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -795,7 +795,7 @@
                 const formTemplate = document.getElementById('moveForm').innerHTML;
                 layer.open({
                     type: 1,
-                    title: '移入',
+                    title: '转库',
                     content: formTemplate,
                     area: ['350px', '300px'],
                     success: function(layero, index){
@@ -1165,7 +1165,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', width: 200},
-                        {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,

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

@@ -687,7 +687,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 <script type="text/html" id="moveForm">
@@ -699,7 +699,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -713,7 +713,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -758,7 +758,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -770,13 +770,13 @@
                 const statusName = statusMap[param.status] || "未知状态";
 
                 this.closeAllLayers();
-                App.msg.confirm(`是否移入`+statusName+`库？`, () => {
+                App.msg.confirm(`是否转入`+statusName+`库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", { id: param.id, status: param.status }, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -1148,7 +1148,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 160},
-                        {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,

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

@@ -182,24 +182,24 @@
                                         </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" style="margin-left:120px">
-                                            <input type="text" id="startTime" name="rangeDate" placeholder="请选择时间段"
-                                                   autocomplete="off" class="layui-input" style="margin-left: 20px;">
-                                        </div>
-<%--                                        --%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <input type="date" name="kgMixDate" placeholder="请输入最小日期"--%>
-<%--                                                   autocomplete="off"--%>
-<%--                                                   class="layui-input">--%>
-<%--                                            <span class="split_txt"> - </span>--%>
-<%--                                            <input type="date" name="kgMaxDate" placeholder="请输入最大日期" autocomplete="off"--%>
-<%--                                                   class="layui-input">--%>
+<%--                                <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" style="margin-left:120px">--%>
+<%--                                            <input type="text" id="startTime" name="rangeDate" placeholder="请选择时间段"--%>
+<%--                                                   autocomplete="off" class="layui-input" style="margin-left: 20px;">--%>
 <%--                                        </div>--%>
-                                    </div>
-                                </div>
+<%--&lt;%&ndash;                                        &ndash;%&gt;--%>
+<%--&lt;%&ndash;                                        <div class="layui-input-block time_box">&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                            <input type="date" name="kgMixDate" placeholder="请输入最小日期"&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                                   autocomplete="off"&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                                   class="layui-input">&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                            <span class="split_txt"> - </span>&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                            <input type="date" name="kgMaxDate" placeholder="请输入最大日期" autocomplete="off"&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                                   class="layui-input">&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                        </div>&ndash;%&gt;--%>
+<%--                                    </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>
@@ -472,7 +472,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 
@@ -564,7 +564,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -578,7 +578,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -622,7 +622,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -634,13 +634,13 @@
                 const statusName = statusMap[param.status] || "未知状态";
 
                 this.closeAllLayers();
-                App.msg.confirm(`是否移入`+statusName+`库？`, () => {
+                App.msg.confirm(`是否转入`+statusName+`库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", { id: param.id, status: param.status }, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -650,7 +650,7 @@
                 const formTemplate = document.getElementById('moveForm').innerHTML;
                 layer.open({
                     type: 1,
-                    title: '移入',
+                    title: '转库',
                     content: formTemplate,
                     area: ['350px', '300px'],
                     success: function(layero, index){
@@ -997,10 +997,10 @@
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },
-                        {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
+                        // {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
                           {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
-                        {title: '操作', minwidth: 225, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 450,

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

@@ -610,7 +610,7 @@
         {{# 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="move" class="no-wrap">移入</span>
+        <span title="转库" lay-event="move" class="no-wrap">转库</span>
     </div>
 </script>
 
@@ -701,7 +701,7 @@
             </div>
         </div>
         <div class="layui-form-item" style="display: flex; align-items: center;">
-            <label class="layui-form-label" style="text-align: right; width: 90px;">移入到：</label>
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
                 <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
                     <option value="">请选择</option>
@@ -715,7 +715,7 @@
             <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
             <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
-                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
             </div>
         </div>
     </div>
@@ -759,7 +759,7 @@
                 let param = this.moveDbParam
                 // 数据验证
                 if (!param || !param.status) {
-                    App.msg.error("请选择移入状态");
+                    App.msg.error("请选择转库状态");
                     return;
                 }
                 const statusMap = {
@@ -771,13 +771,13 @@
                 const statusName = statusMap[param.status] || "未知状态";
 
                 this.closeAllLayers();
-                App.msg.confirm(`是否移入`+statusName+`库？`, () => {
+                App.msg.confirm(`是否转入`+statusName+`库？`, () => {
                     App.postJson("/api/subject/subInfo/moveDb", { id: param.id, status: param.status }, (res) => {
                         if (res.success) {
-                            App.msg.success("移入成功");
+                            App.msg.success("转库成功");
                             self.getData()
                         } else {
-                            App.msg.error(res.message || "移入失败，请重试");
+                            App.msg.error(res.message || "转库失败，请重试");
                         }
                     })
                 });
@@ -1140,7 +1140,7 @@
                         {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
                         {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
-                        {title: '操作', width: 225, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
                         // {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         // {field: 'xmbaStatus', title: '计划时间', width: 160, templet: '#date'},
                         // {field: 'xmbaStatus', title: '总投资', width: 245, templet: '#amtTotal'},

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

@@ -90,6 +90,12 @@
             height: 230px;
         }
 
+        /* 针对特定 select 的样式 */
+        .custom-select + .layui-form-select dl {
+            height: auto; /* 恢复默认高度 */
+            max-height: 150px; /* 设置一个合适的高度 */
+        }
+
         .layui-table-cell .cut {
             display: -webkit-box; /* 使用旧版的弹性盒子布局 */
             -webkit-box-orient: vertical; /* 设置为垂直方向排列 */
@@ -397,9 +403,14 @@
     {{#} }}
 </script>
 <%-- table操作按钮 --%>
+<%-- table操作按钮 --%>
 <script type="text/html" id="toolBar">
     <div class="toolBar">
         <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="move" class="no-wrap">转库</span>
     </div>
 </script>
 
@@ -462,7 +473,35 @@
                                        src="${WebSite.asset}/css/images/bigScreen/light-red.png"></image></span>
     {{#}}}
 </script>
-
+<script type="text/html" id="moveForm">
+    <div class="layui-form" style="padding: 20px;">
+        <div class="layui-form-item" style="display: flex; align-items: center;">
+            <label class="layui-form-label" style="text-align: right; width: 90px;">当前状态：</label>
+            <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
+                <input type="text" name="currentState" value="储备库" disabled class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="display: flex; align-items: center;">
+            <label class="layui-form-label" style="text-align: right; width: 90px;">转库到：</label>
+            <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px);">
+                <select class="custom-select" lay-filter="moveStatus" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1">储备</option>
+                    <option value="2">新建</option>
+                    <option value="3">在建</option>
+                    <option value="9">投产</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="display: flex; align-items: center;">
+            <label class="layui-form-label" style="text-align: right; width: 90px;"></label>
+            <div class="layui-input-block" style="flex: 1; max-width: calc(100% - 120px); text-align: right;">
+                <button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>
+                <button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认转库</button>
+            </div>
+        </div>
+    </div>
+</script>
 
 <script>
     layui.use('element', function () {
@@ -501,10 +540,43 @@
             },
             confirmMove: function () {
                 let param = this.moveDbParam
-                App.postJson("/api/subject/subInfo/moveDb",param, (res)=>{
-                    App.msg.success(res.msg);
-                })
-                this.closeAllLayers();
+                // 数据验证
+                if (!param || !param.status) {
+                    App.msg.error("请选择转库状态");
+                    return;
+                }
+                const statusMap = {
+                    1: "储备",
+                    2: "新建",
+                    3: "在建",
+                    9: "投产"
+                };
+                param.statusName = statusMap[param.status] || "未知状态";
+                let self = this;
+                self.closeAllLayers();
+                App.msg.confirm(`是否转入` + param.statusName + `库？`, () => {
+                    App.postJson("/api/subject/subInfo/moveDb", {id: param.id, status: param.status}, (res) => {
+                        if (res.success) {
+                            App.msg.success("转库成功");
+                            self.getData()
+                        } else {
+                            App.msg.error(res.message || "转库失败，请重试");
+                        }
+                    })
+                });
+            },
+            move(obj) {
+                this.moveDbParam.id = obj.data.id
+                const formTemplate = document.getElementById('moveForm').innerHTML;
+                layer.open({
+                    type: 1,
+                    title: '转库',
+                    content: formTemplate,
+                    area: ['350px', '300px'],
+                    success: function (layero, index) {
+                        layui.form.render();
+                    }
+                });
             },
             init: function () {
                 let self = this;
@@ -856,10 +928,10 @@
                             width: 100,
                             templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
                         },
-                        {field: 'statusName', title: '状态', width: 160},
-                        {field: 'beginDate', title: '计划开工日期', minWidth: 160},
-                        {field: 'endDate', title: '计划完工日期', minWidth: 160},
-                        {title: '操作', minWidth: 225, toolbar: '#toolBar', fixed: 'right'},
+                        {field: 'statusName', title: '状态', width: 60},
+                        {field: 'beginDate', title: '计划开工日期', minWidth: 100},
+                        {field: 'endDate', title: '计划完工日期', minWidth: 100},
+                        {title: '操作', minWidth: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: $(window).height() - $('#table1').offset().top - 50,
@@ -929,42 +1001,6 @@
                     });
                 });
             },
-
-            move (obj) {
-                this.moveDbParam.id = obj.data.id
-                this.moveDbParam.status = obj.data.cbStatus
-                layer.open({
-                    type: 1,
-                    title: '标题',
-                    content: '<div class="layui-form" style="padding: 20px;">' +
-                                '<div class="layui-form-item">' +
-                                    '<label class="layui-form-label">当前状态：</label>' +
-                                    '<div class="layui-input-block">' +
-                                        '<input type="text" name="currentState" value="储备库" disabled class="layui-input">' +
-                                    '</div>' +
-                                '</div>' +
-                                '<div class="layui-form-item">' +
-                                    '<label class="layui-form-label">移入到：</label>' +
-                                    '<div class="layui-input-block">' +
-                                        '<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>' +
-                                         '</select>' +
-                                    '</div>' +
-                                '</div>' +
-                                    '<div class="layui-form-item" style="text-align: right;">' +
-                                        '<button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">取消</button>' +
-                                        '<button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认移入</button>' +
-                                    '</div>' +
-                                '</div>',
-                    area: ['350px', '300px'],
-                    success: function(layero, index){
-                        layui.form.render();
-                    }
-                });
-            },
             isHide: function (obj) {
                 var self = this;
                 App.msg.confirm("是否移入在建库？", function () {