储备项目库

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

@@ -182,6 +182,12 @@
             <if test="vo.endAmt!=null and vo.endAmt!=''">
                 and amt_total &lt;= #{vo.endAmt}
             </if>
+            <if test="vo.beginDate!=null and vo.beginDate!=''">
+                and begin_date >= #{vo.beginDate}
+            </if>
+            <if test="vo.endDate!=null and vo.endDate!=''">
+                and begin_date &lt;= #{vo.endDate}
+            </if>
             <if test="vo.sbdw!=null and vo.sbdw!=''">
                 and unit_desc = #{vo.sbdw}
             </if>

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

@@ -405,4 +405,6 @@ public interface SubInfoService {
 	void subInfoToSubFix(SubInfoToSubFixVo subInfoToSubFixVo,String userId);
 
 	void updateFixeCat(String subInfoId, String cat);
+
+	boolean rg(MoveDbParamVo vo);
 }

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

@@ -13,6 +13,7 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 import com.rtrh.projects.modules.projects.dao.*;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
@@ -179,20 +180,21 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         }
         List<SubInfoGxj> data = subInfoMapper.queryPage(queryVO);
 
-
         PageInfo<SubInfoGxj> pageInfo = new PageInfo<>(data);
         page.setList(data);
         List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
         if (CollectionUtil.isNotEmpty(data)) {
             for (SubInfoGxj e : data) {
-                String hql = "FROM RptCont WHERE logicDeleteFlag = 0 AND subId = :subId AND kind = :kind AND content IS NOT NULL ORDER BY kjMonth DESC";
-                Query query = rptContDao.createQuery(hql);
-                query.setParameter("subId", e.getSubId());
-                query.setParameter("kind", RptContKindEnum.MONTH.getCode());
-                query.setMaxResults(1);
-                Object result = query.uniqueResult();
-                Optional.ofNullable(result).map(o -> (RptCont) o).ifPresent(o -> e.setProgress(o.getContent()));
-
+                // 查询月报中的建设进度
+                if (!Lists.newArrayList("1","2").contains(e.getStatus())){
+                    String hql = "FROM RptCont WHERE logicDeleteFlag = 0 AND subId = :subId AND kind = :kind AND content IS NOT NULL ORDER BY kjMonth DESC";
+                    Query query = rptContDao.createQuery(hql);
+                    query.setParameter("subId", e.getSubId());
+                    query.setParameter("kind", RptContKindEnum.MONTH.getCode());
+                    query.setMaxResults(1);
+                    Object result = query.uniqueResult();
+                    Optional.ofNullable(result).map(o -> (RptCont) o).ifPresent(o -> e.setProgress(o.getContent()));
+                }
                 byKind.stream()
                         .filter(k -> e.getSubjectId().equals(k.getCode()))
                         .findFirst()

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

@@ -4744,12 +4744,20 @@ public class SubInfoServiceImpl implements SubInfoService {
                 .findFirst().ifPresent(e-> subInfo.setSubjectName(e.getTitle()));
         return subInfo;
     }
-
+    @Override
+    public boolean rg(MoveDbParamVo vo){
+        return subInfoDao.updateBySql(
+                "update sub_info set rg_date = ? where id = ?",
+                vo.getRgDate(),
+                vo.getId()
+        ) > 0;
+    }
     @Override
     public boolean moveDb(MoveDbParamVo vo) {
         SubInfo subinfo = subInfoDao.findById(vo.getId());
         if (StringUtils.isNotBlank(subinfo.getStatus())){
-            if (Integer.parseInt(vo.getStatus()) < Integer.parseInt(vo.getStatus())){
+            // todo 移库时间
+            if (Integer.parseInt(vo.getStatus()) > Integer.parseInt(subinfo.getStatus())){
                 int i = subInfoDao.updateBySql("update sub_info set status='" + vo.getStatus() + "' where id='" + vo.getId() + "'");
                 return i > 0;
             }else {

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

@@ -1,10 +1,16 @@
 package com.rtrh.projects.vo.subject;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class MoveDbParamVo {
     private String id;
 
     private String status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+    private Date rgDate;
 }

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

@@ -1235,6 +1235,23 @@ public class SubInfoApiController extends BaseController {
         return message;
     }
 
+    // 入规
+    @PostMapping(value = "/rg")
+    public Message rg(@RequestBody MoveDbParamVo vo) {
+        Message message = new Message();
+        try {
+            Assert.notBlank(vo.getId(), "项目ID不能为空");
+            Assert.notNull(vo.getRgDate(), "入规日期不能为空");
+            boolean isSuccess = subInfoService.rg(vo);
+            message.add(isSuccess ? "移入成功" : "移入失败");
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("移入失败");
+        }
+
+        return message;
+    }
+
 
     /**
      * 项目前期按部门查询

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

@@ -439,93 +439,9 @@
         <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
         <span title="移入" lay-event="move" class="no-wrap">移入</span>
-        <%--<span title="项目信息" lay-event="toDetail" class="no-wrap">项目信息</span>
-        <c:if test="${isHydw}">
-            <span title="项目大事迹" lay-event="leaderSupervise" class="no-wrap">项目大事迹</span>
-            &lt;%&ndash;      <span title="问题督办" lay-event="problem" class="no-wrap">&nbsp;问题督办</span>&ndash;%&gt;
-        </c:if>
-        {{# if(d.unitId == "${currUnitId}") { }}
-        <span title="原因录入" lay-event="setSubReason" class="no-wrap">&nbsp;原因录入</span>
-        {{#}}}
-
-        {{# if("${currUser.edit}" == 'true'||( d.propKind == '3' && "${currUser.id}" == d.create_user_id )) { }}
-        <span title="信息修改" lay-event="toEditSubInfo" class="no-wrap">&nbsp;信息修改</span>
-        {{#} }}
-        <span title="退回" lay-event="toBack" class="no-wrap">&nbsp;退回</span>
-        &lt;%&ndash;	{{# if("${currUser.edit}" == 'true') { }}&ndash;%&gt;
-        &lt;%&ndash;	{{# if(d.status != '0' && d.status != '6' && d.status != '7' && d.status != '8' && d.status != '9' && d.status != 'A') { }}&ndash;%&gt;
-        &lt;%&ndash;		<span title="退回暂存" lay-event="toTh">&nbsp;退回暂存</span>&ndash;%&gt;
-        &lt;%&ndash;	{{#}}}&ndash;%&gt;
-        &lt;%&ndash;	{{#} }}&ndash;%&gt;
-        <span title="手续办理" lay-event="preNew" class="no-wrap">&nbsp;手续办理</span>
-        <c:if test="${admin || isSfgw}">
-            &lt;%&ndash;        {{# if(d.isHide == "1") { }}
-                    <span title="取消在建库" lay-event="isNoHide" class="no-wrap">&nbsp;取消在建库</span>
-                    {{#} else { }}&ndash;%&gt;
-            <span title="移入在建库" lay-event="isHide" class="no-wrap">&nbsp;移入在建库</span>
-            &lt;%&ndash;           {{#} }}&ndash;%&gt;
-            <span title="移入新建库" lay-event="setIsNew" class="no-wrap">&nbsp;移入新建库</span>
-        </c:if>
---%>
     </div>
 </script>
 
-
-<script type="text/html" id="preInfo">
-    <div title="" lay-event="preNew" style="cursor: pointer">
-        <%--        <div class="line"><span class="qianse">总的手续：</span> <span class="shense">{{d.preTotal}}</span>个--%>
-
-        <%--        </div>--%>
-        <div class="line"><span class="qianse">办理中：</span> <span class="shense">{{d.preProceNum}}</span>个
-
-        </div>
-        <div class="line"><span class="qianse">已办理：</span> <span class="shense">{{d.preEndNum}}</span>个
-
-        </div>
-        <div class="line"><span class="qianse">无需办理：</span> <span class="shense">{{d.preNoNum}}</span>个
-
-        </div>
-        <%--		{{# if(d.xmbaIs == '' || d.xmbaIs == null ) { }}--%>
-        <%--			<span class="qianse">项目备案：</span> <span class="shense">未办理</span>  <br/>--%>
-        <%--		{{#} else if(d.xmbaIs == '2' ) { }}--%>
-        <%--			<span class="qianse">项目备案：</span> <span class="shense">无需办理</span> <br/>--%>
-
-        <%--		{{#} else { }}--%>
-
-        <%--			{{# if(d.xmbaStatus == '' || d.xmbaStatus == null ) { }}--%>
-        <%--						<span class="qianse">项目备案：</span> <span class="shense">未办理</span>	 <br/>--%>
-        <%--			{{#} else if(d.xmbaStatus == '0') { }}--%>
-        <%--					<span class="qianse">项目备案：</span> <span class="shense">未办理</span>	 <br/>--%>
-        <%--			{{#} else if(d.xmbaStatus == '1') { }}--%>
-        <%--					<span class="qianse">项目备案：</span> <span class="shense">开始办理</span>	 <br/>--%>
-        <%--			{{#} else if(d.xmbaStatus == '2') { }}--%>
-        <%--					<span class="qianse">项目备案：</span> <span class="shense">已办理</span>	 <br/>--%>
-        <%--			{{#} }}--%>
-
-        <%--		{{#} }}--%>
-
-
-        <%--		{{# if(d.yjbgIs == '' || d.yjbgIs == null ) { }}--%>
-        <%--			可行性研究报告：未办理 <br/>--%>
-        <%--		{{#} else if(d.yjbgIs == '2' ) { }}--%>
-        <%--			可行性研究报告：无需办理 <br/>--%>
-        <%--		{{#} else { }}--%>
-        <%--			{{# if(d.yjbgStatus == '' || d.yjbgStatus == null ) { }}--%>
-        <%--							可行性研究报告：未办理 <br/>--%>
-        <%--			{{#} else if(d.yjbgStatus == '0') { }}--%>
-        <%--						可行性研究报告：未办理 <br/>--%>
-        <%--			{{#} else if(d.yjbgStatus == '1') { }}--%>
-        <%--						可行性研究报告：开始办理 <br/>--%>
-        <%--			{{#} else if(d.yjbgStatus == '2') { }}--%>
-        <%--						可行性研究报告：已办理 <br/>--%>
-        <%--			{{#} }}--%>
-
-        <%--		{{#} }}--%>
-
-    </>
-
-</script>
-
 <script type="text/html" id="imageDiv">
     <div style="width:50px;height:50px" onclick="showImage(this)">
         {{# if(d.fileId != null && d.fileId != '') { }}
@@ -624,7 +540,6 @@
             },
             confirmMove: function () {
                 let param = this.moveDbParam
-                console.log(param,"==============")
                 App.postJson("/api/subject/subInfo/moveDb",param, (res)=>{
                     App.msg.success(res.msg);
                 })
@@ -633,6 +548,7 @@
             init: function () {
                 let self = this;
                 layui.form.on("select(moveStatus)", function (data) {
+                    console.log(data.value,"===========")
                     self.moveDbParam.status = data.value;
                 });
 

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

@@ -424,20 +424,20 @@
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
 
-                    <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
+                    <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
                     </label>
-                    <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
+                    <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
                 <div style="margin-bottom: 3px">
                     <label class="juli"
-                           @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
+                           @click="levelList('indusKinds',item.name?item.name:item.code,item.split(',')[3])"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -686,12 +686,11 @@
         {{# 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="rg" class="no-wrap">入规</span>
+        <span title="入规" lay-event="rg" class="no-wrap">入规</span>
     </div>
 </script>
 <script>
-    new Vue({
+    let vm = new Vue({
         el: "#app",
         template: "#template",
         data: {
@@ -709,13 +708,67 @@
             sort: {field: "amtTotal", type: "desc"},
             pageSize: 10,
             endData:'',
-            showExport: false
+            showExport: false,
+            rgParam:{
+                rgDate: "",
+                id: ""
+            }
         },
         mounted: function () {
             this.init()
         },
         methods: {
+            closeAllLayers() {
+                layui.layer.closeAll();
+            },
+
+            confirmMove: function() {
+                let rgDate = document.getElementById('rgDate').value;
+                if (!rgDate) {
+                    App.msg.error('请选择入规日期');
+                }
+                let param = {rgDate:rgDate,id:this.rgParam.id}
+                App.postJson("/api/subject/subInfo/rg",param, (res)=>{
+                    App.msg.success(res.msg);
+                })
+                this.closeAllLayers();
+            },
+            // confirmMove: function () {
+            //     let param = this.rgParam
+            //     console.log(param,"=====")
+            //     App.postJson("/api/subject/subInfo/moveDb",param, (res)=>{
+            //         App.msg.success(res.msg);
+            //     })
+            //     this.closeAllLayers();
+            // },
+            rg (obj) {
+                this.rgParam.id = obj.data.id
+                layer.open({
+                    type: 1,
+                    title: '入规',
+                    content: '<div class="layui-form" style="padding: 20px;">' +
+                        '<div class="layui-form-item">' +
+                            '<label class="layui-form-label">入规日期：</label>' +
+                            '<input class="layui-form-label" type="date" id="rgDate">' +
+                        '</div>' +
+                        '<div class="layui-form-item" style="text-align: center;margin-top: 50px">' +
+                            '<button type="button" class="layui-btn moveConfirm" onclick="vm.confirmMove()">确认</button>' +
+                            '<button type="button" class="layui-btn layui-btn-primary layui-border" onclick="vm.closeAllLayers()">返回</button>' +
+                        '</div>' +
+                    '</div>',
+                    area: ['350px', '300px'],
+                    success: function(layero, index){
+                        layui.form.render();
+                    }
+                });
+            },
             init: function () {
+                layui.form.on("select(rgDate)", function (data) {
+                    console.log(data,data.value)
+                    console.log("=========")
+
+                    self.rgParam.rgDate = data.value;
+                });
                 this.winH = document.body.clientHeight;
                 var nowdate = new Date();
                 nowdate.setMonth(nowdate.getMonth() + 1);
@@ -866,7 +919,6 @@
                 param.status = 9;
                 App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
-                    console.log(res.rows,"============")
                     self.loadPage(res.total);
                     self.loadTable();
                 });

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

@@ -133,45 +133,6 @@
                                         </div>
                                     </div>
                                 </div>
-                               <%-- <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required" style="width: 100px;">金额(万元)</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="startAmt" name="startAmt"
-                                                   placeholder="请输入最小金额"
-                                                   autocomplete="off" class="layui-input" value="${minAmt}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                   autocomplete="off" class="layui-input" value="${maxAmt}">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设性质</label>
-                                        <div class="layui-input-block">
-                                            <select name="propKind">
-                                                <option value="">请选择</option>
-                                                <option value="1">新建</option>
-                                                <option value="2">续建</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">ABC</label>
-                                        <div class="layui-input-block">
-                                            <select name="abc">
-                                                <option value="">请选择</option>
-                                                <option value="A">A</option>
-                                                <option value="B">B</option>
-                                                <option value="C">C</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>--%>
 
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
@@ -207,192 +168,21 @@
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label required label-longers" style="width: 100px;">预计开工日期</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="number" name="startAmt" placeholder="请输入最小金额"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                            <span class="split_txt"> - </span>
-                                            <input type="number" name="endAmt" placeholder="请输入最大金额" autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <%--                           <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                                               <div class="layui-form-item">
-                                                                   <label class="layui-form-label label-longers">所属行业</label>
-                                                                   <div class="layui-input-block">
-                                                                       <div name="indusKind">
-                                                                       </div>
-                                                                   </div>
-                                                               </div>
-                                                           </div>--%>
-
-
-                                <%--<div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label queryTimeType label-longers"
-                                               style="width: 130px;">
-                                            <select name="queryTimeType">
-                                                <option value="">建设日期</option>
-                                                <option value="1">计划开工日期</option>
-                                                <option value="2">计划结束日期</option>
-                                                <option value="3">创建日期</option>
-                                            </select>
-                                        </label>
                                         <div class="layui-input-block time_box" style="margin-left:120px">
-                                            <input type="text" id="startTime" name="rangeDate"
-                                                   placeholder="请选择时间段"
-                                                   autocomplete="off" class="layui-input" value="${rangeDate}"
-                                                   style="margin-left: 20px;">
+                                            <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>--%>
                                     </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">投资类型</label>
-                                        <div class="layui-input-block">
-                                            <select name="kindNature">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${TZXZ }" var="hy">
-                                                    <option value="${hy.code }">${hy.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目状态</label>
-                                        <div class="layui-input-block">
-                                            <select name="status">
-                                                <option value="">请选择</option>
-                                                <option value="1">项目前期</option>
-                                                <option value="6">待开工</option>
-                                                <option value="7">施工中</option>
-                                                <option value="8">暂停施工</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-            &lt;%&ndash;                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">项目单位名称</label>
-                                        <div class="layui-input-block">
-                                            <input name="sbdw" class="layui-input" value="${unitName }">
-                                        </div>
-                                    </div>
-                                </div>&ndash;%&gt;
-                                <c:if test="${currUser.statusProj == 1 }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers required">行业单位</label>
-                                            <div class="layui-input-block">
-                                                <select name="hydw" lay-search>
-                                                    <option value="">--请选择--</option>
-                                                    <c:forEach items="${HYDW }" var="hy">
-                                                        <option value="${ hy.id}">${hy.title }</option>
-                                                    </c:forEach>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers"
-                                               style="width: 100px;">完成比例(%)</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="number" name="endBl" placeholder="请填写最小完成比例"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                            <span class="split_txt">至</span>
-                                            <input type="number" name="endBlPlus" placeholder="请填写最大完成比例"
-                                                   autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">资金来源</label>
-                                        <div class="layui-input-block">
-                                            <select name="zjly" lay-search="">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${ZJLY }" var="zj">
-                                                    <option value="${zj.id }">${zj.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <c:if test="${isHydw }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers ">是否分管</label>
-                                            <div class="layui-input-block">
-                                                <select name="blSub">
-                                                    <option value="false">所有项目</option>
-                                                    <option value="true">是</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <c:if test="${admin }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label required label-longers">是否在建库</label>
-                                            <div class="layui-input-block">
-                                                <select name="isHide">
-                                                    <option value="">所有</option>
-                                                    <option value="1">是</option>
-                                                    <option value="0" selected="selected">否</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">年份</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" id="year" readonly="readonly" name="year"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label required label-longers">月份</label>
-                                        <div class="layui-input-block">
-                                            <select id="month" name="month">
-                                                <option value="">请选择</option>
-                                                <option value="1">1月</option>
-                                                <option value="2">2月</option>
-                                                <option value="3">3月</option>
-                                                <option value="4">4月</option>
-                                                <option value="5">5月</option>
-                                                <option value="6">6月</option>
-                                                <option value="7">7月</option>
-                                                <option value="8">8月</option>
-                                                <option value="9">9月</option>
-                                                <option value="10">10月</option>
-                                                <option value="11">11月</option>
-                                                <option value="12">12月</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目单位</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label"></label>
@@ -835,7 +625,7 @@
     layui.use('element', function () {
         let element = layui.element;
     });
-    new Vue({
+    let vm = new Vue({
         el: "#app",
         template: "#template",
         data: {
@@ -871,6 +661,7 @@
                     App.msg.success(res.msg);
                 })
                 this.closeAllLayers();
+                this.getData()
             },
             move (obj) {
                 this.moveDbParam.id = obj.data.id
@@ -882,7 +673,7 @@
                         '<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">' +
+                        '<input type="text" name="currentState" value="新建库" disabled class="layui-input">' +
                         '</div>' +
                         '</div>' +
                         '<div class="layui-form-item">' +
@@ -890,7 +681,6 @@
                         '<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>' +
@@ -908,6 +698,10 @@
                 });
             },
             init: function () {
+                let self = this;
+                layui.form.on("select(moveStatus)", function (data) {
+                    self.moveDbParam.status = data.value;
+                });
                 this.winH = document.body.clientHeight;
                 var nowdate = new Date();
                 nowdate.setMonth(nowdate.getMonth() + 1);
@@ -1120,7 +914,6 @@
                 param.orderBy = this.sort.field;
                 param.orderType = this.sort.type || "asc";
 
-
                 param.status = 2;
                 App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
@@ -1381,7 +1174,6 @@
                         //首次不执行
                         if (!first) {
                             self.pageNo = obj.curr;
-                            self.getData();
                         }
                     }
                 });