Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/service/SettlementService.java

@@ -35,8 +35,10 @@ public class SettlementService {
     public List<Settlement> selectSettlementService(String id,String type){
         if (type.equals("1")) {
             return SettementUtil.getSelectSettlement(settlementMapper.selectSettlement(id));
-        } else {
-          return SettementUtil.getSelectDlSettlement(settlementMapper.selectSettlement(id));
+        } else if (type.equals("2")){
+            return SettementUtil.getSelectDlSettlement(settlementMapper.selectSettlement(id));
+        }else {
+            return SettementUtil.getSelectBdzSettlement(settlementMapper.selectSettlement(id));
         }
     }
 

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -118,7 +118,7 @@ public class SettementUtil {
      * @return 《工程竣工表》/《工程项目投资表》 list集合
      */
     public static List<Settlement> getComparison(ImportExcel importExcel){
-        boolean flag = false;//判断 架空 变电站 电缆
+        boolean flag = false;//判断 是否是变电站
         Settlement settlement;
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -71,12 +71,6 @@ public class ProjectController extends BaseController {
     @RequestMapping("/save")
     public AjaxJson save(WbsProject wbsProject, Model model, RedirectAttributes redirectAttributes){
         AjaxJson j = new AjaxJson();
-        List<WbsProject> projects =  projectService.findByName(wbsProject.getProjectName());
-        if (projects!=null&&!projects.isEmpty()){
-           j.setSuccess(false);
-           j.setMsg("添加失败! 工程名称:"+wbsProject.getProjectName()+" 已存在");
-           return j;
-        }
         //数据验证
         String errMsg = beanValidator(wbsProject);
         if (StringUtils.isNotBlank(errMsg)){

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -63,12 +63,6 @@ public class ProjectTemController extends BaseController {
     @RequestMapping("/import")
     public HashMap importFile(@RequestParam(value = "file")MultipartFile[] file,String projectName,String[] itemNames,String[] itemTypes)  {
         HashMap map = new HashMap();
-        List<WbsProject> projects =  projectService.findByName(projectName);
-        if (projects!=null&&!projects.isEmpty()){
-            map.put("code",0);
-            map.put("msg","添加失败! 工程名称: "+projectName+" 已存在");
-            return map;
-        }
         WbsProject wbsProject = new WbsProject();
         wbsProject.setProjectName(projectName);
         projectService.save(wbsProject);
@@ -191,18 +185,18 @@ public class ProjectTemController extends BaseController {
         return newDate+result;
     }
 
-    @RequestMapping("/verfiy")
-    @ResponseBody
-    public HashMap getVerfiy(String projectName,String projectId){
-        HashMap map = new HashMap();
-        List<WbsItem> wbsItemList = itemService.findItemByName(projectName,projectId);
-        if (wbsItemList!=null&&!wbsItemList.isEmpty()){
-            map.put("code",1);
-            map.put("msg","导入失败! 项目名称:"+projectName+" 已存在");
-            return map;
-        }
-        map.put("msg","导入成功");
-        return map;
-    }
+//    @RequestMapping("/verfiy")
+//    @ResponseBody
+//    public HashMap getVerfiy(String projectName,String projectId){
+//        HashMap map = new HashMap();
+//        List<WbsItem> wbsItemList = itemService.findItemByName(projectName,projectId);
+//        if (wbsItemList!=null&&!wbsItemList.isEmpty()){
+//            map.put("code",1);
+//            map.put("msg","导入失败! 项目名称:"+projectName+" 已存在");
+//            return map;
+//        }
+//        map.put("msg","导入成功");
+//        return map;
+//    }
 
 }

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -163,6 +163,7 @@ public class SubstationService {
         ImportExcel gf = new ImportExcel(file,1,SubstationInfo.SHEET_GFQD);  //规费项目清单计价表
         ImportExcel qt = new ImportExcel(file,1,SubstationInfo.SHEET_QTFY);  //其他项目清单计价表
         ImportExcel fbrcg = new ImportExcel(file,1,SubstationInfo.SHEET_ZBRCGSB );   //招标人采购材料设备计价表
+        ImportExcel tbrsb = new ImportExcel(file,1,SubstationInfo.SHEET_TBRCGSB);//投标人采购设备计价表
         double jzgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_JZGC,1,2);//汇总表建筑金额
         double azgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_AZGC,1,2);//汇总表安装金额
         double texRate = ExcelUtil.getTexRate(total); //获取税率
@@ -173,11 +174,27 @@ public class SubstationService {
         double[] azgfRate = BashInfo.getAzGfRate(gf);  //获取安装规费率
         double[] qtFees = BashInfo.getQtFees(qt);  //获取其他费用
         double gcjsFee = BashInfo.getGcjsFee(total);  //获取工程结算价
+
+        //变电站 结算汇总
+        List<Settlement> settlementsBdz =  SettementUtil.getComparison(total);
+        double cbperson = ExcelUtil.getDouble(tbrsb,BashInfo.QT_HJ,0,6);//获取投标人设备表合计
+        double word1total =  ExcelUtil.getDouble(csqd1,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double word2total=ExcelUtil.getDouble(csqd2,SubstationInfo.CS_JZ,0,10);//获取措施费二表措施项目合计金额
+        double otherBdzTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
+        double feesBdzCount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
         if(jzgc !=0.00 && azgc != 0.00){
             ImportExcel jzqd = new ImportExcel(file, 1, SubstationInfo.SHEET_JZFBFXJJ);  //建筑分部分项工程量清单计价表
             ImportExcel azqd = new ImportExcel(file, 1, SubstationInfo.SHEET_AZFBFXJJ);  //安装分部分项工程量清单计价表
             ImportExcel jzhz = new ImportExcel(file, 1, SubstationInfo.SHEET_JZHZB);   //建筑工程费用汇总表
             ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB);   //安装工程费用汇总表
+            //变电站结算汇总
+            int[] comlumn2 = {12,15};//定义所要数组
+            double built1Total = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,0);//建筑分部分项工程量清单计价表合计
+            double[] builtTotal={built1Total,0.0};
+            double[] division1total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,1,comlumn2);//安装分部分项比对数据清单合计
+            double[] division = {division1total[0],division1total[1],0.00,0.00};
+            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
+            settlementService.save(settlementBdzs,id);
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
             double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费

src/main/webapp/webpage/modules/sg/free/alongst.js

@@ -9,11 +9,11 @@
     ,title: '单独调整页'
     ,id:'checktable'
     ,cols: [[
-{type: 'checkbox',width:30}
-    ,{field:'wbsys',width:100,title:'分部分项'}
-    ,{field:'wbsCode',width:120,title:'WBS识别码'}
-    ,{field:'bl',width:100,title:'比例(%)',edit: 'text'}
-    ,{field:'fee',width:100,title:'分摊金额',edit: 'text'}
+    {type: 'checkbox'}
+    ,{field:'wbsys',title:'分部分项'}
+    ,{field:'wbsCode',title:'WBS识别码'}
+    ,{field:'bl',title:'比例(%)',edit: 'text'}
+    ,{field:'fee',title:'分摊金额',edit: 'text'}
     ]]
     ,data:[
     <c:if test="${ not empty list}">

src/main/webapp/webpage/modules/sg/free/alongst.jsp

@@ -25,13 +25,13 @@
             <span id="readid2">200</span>
         </div>
         <div class="" style="margin-left: 10px;">
-            <input type="radio" name="mydiv" value="1" title="增加">
+            <input type="radio" name="mydiv" value="1" title="增加" checked="">
             <input type="radio" name="mydiv" value="2" title="减少">
         </div>
     </div>
 </form>
-<!--<div>-->
+<div style="margin-left: 7px;margin-right: 7px">
 <table class="layui-hide" id="longtable" lay-filter="longtable"></table>
-<!--</div>-->
+</div>
 </body>
 </html>

src/main/webapp/webpage/modules/sg/free/avgpage.jsp

@@ -33,8 +33,8 @@
             <%--<input type="text" value="5000" id="readid" readonly="readonly" class="layui-input" style="width:20%;border:none;">--%>
         <%--</div>--%>
         <div class="layui-input-block">
-            <input  type="radio" name="state" value="1" title="增加" checked="checked"/>
-            <input  type="radio" name="state" value="2" title="减少" checked=""/>
+            <input  type="radio" name="state" value="1" title="增加" checked=""/>
+            <input  type="radio" name="state" value="2" title="减少" />
         </div>
     </div>
     <div class="layui-form-item">

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -20,7 +20,6 @@
     treeDefaultClose: false,
     treeLinkage: false,
     elem: '#table1',
-    <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
     page: false,
     cols: [[
     {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
@@ -32,7 +31,6 @@
     {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
 
     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
-//                  {templet: '#oper-col', title: 'oper'}
     ],[
     {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
     {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
@@ -57,7 +55,6 @@
     {field:'qtf',align:'center',width:120,title:'其他费',totalRow: true},
     {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
     {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
-    // {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
     ]]
     ,data: [
     <c:if test="${ not empty map.list}">
@@ -79,9 +76,6 @@
         "cbrcg2": "${data.cbrCost}",
         "fbrcg2":"${data.fbrCost}",
         "jxf2": "${data.jxCost}",
-
-        <%--"rgf3": "${data.rgFtFee}",--%>
-                    "rgf3": "<c:if test="${ empty data.rgFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.rgFtFee}">${data.rgFtFee}</c:if> ",
         "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
         "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
         "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
@@ -108,8 +102,6 @@
 
     renderTable1();
 });
-</script>
-<script>
 layui.use(['table', 'form', 'element', 'treetable'], function () {
     var $ = layui.jquery;
     var table = layui.table;
@@ -126,15 +118,14 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
             treeIdName: 'd_id',
             treePidName: 'd_pid',
             elem: '#table2',
-        <%--url: '${ctxp}/webpage/modules/sys/free/other.json',--%>
-    page: false,
-    cols: [[
-    {type: 'numbers'},
-    {field: 'wbsys', title: 'WBS要素'},
-    {field: 'wbssbm', title: 'WBS识别码'},
-    {field: 'money', title: '金额'},
-    ]]
-    ,data: [
+            page: false,
+            cols: [[
+                {type: 'numbers'},
+                {field: 'wbsys', title: 'WBS要素'},
+                {field: 'wbssbm', title: 'WBS识别码'},
+                {field: 'money', title: '金额'},
+             ]]
+            ,data: [
                 <c:if test="${ not empty map.list}">
                     <c:forEach items="${map.list}" var="data" varStatus="index">
                         <c:if test="${data.feeType eq '0'}">
@@ -149,60 +140,54 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
                         </c:if>
                     </c:forEach>
                 </c:if>
-    ],
-        done: function () {
-            layer.closeAll('loading');
-        }
-    });
-    };
+            ],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+            };
 
-    renderTable2();
-});
-</script>
-<script>
-layui.use('table', function(){
-    var table = layui.table;
-});
-</script>
-<script>
-layui.use('table', function(){
-    var table = layui.table;
+            renderTable2();
+            });
+        layui.use('table', function(){
+            var table = layui.table;
+        });
+        layui.use('table', function(){
+            var table = layui.table;
 
-    table.render({
-        elem: '#xmmc'
-        ,title: '未标识'
-        ,cols: [[
-            {field:'xmmc', width:200,title:'项目名称'}
-            ,{field:'fyje', width:178,title:'费用金额'}
-            ,{width:178,  toolbar: '#barDemo',title:'操作'}
-        ]]
-        ,data:[
-            <c:if test="${ not empty map.list}">
-                <c:forEach items="${map.list2}" var="data" varStatus="index">
-                    {
-                        "id":"${data.id}",
-                        "xmmc": "${data.type}",
-                        "fyje": "${data.fee}"
-                    },
-                </c:forEach>
-            </c:if>
-        ]
-        ,page: false
-    });
-    //监听工具条
-    table.on('tool(freestr)', function(obj){
-        var datacount="";
-        var data = obj.data;
-        if(obj.event === 'fttz'){
-            sureradio(data);
-        } else if(obj.event === 'ddtz'){
-            sureradio2(data,'${ctx}/jkxl/getft?id='+data.id);
-        }
-        // alert(datacount);
-    });
-});
-</script>
-<script>
+            table.render({
+                elem: '#xmmc'
+                ,title: '未标识'
+                ,cols: [[
+                    {field:'xmmc', width:200,title:'项目名称'}
+                    ,{field:'fyje', width:178,title:'费用金额'}
+                    ,{width:178,  toolbar: '#barDemo',title:'操作'}
+                ]]
+                ,data:[
+                    <c:if test="${ not empty map.list}">
+                        <c:forEach items="${map.list2}" var="data" varStatus="index">
+                            {
+                                "id":"${data.id}",
+                                "xmmc": "${data.type}",
+                                "fyje": "${data.fee}"
+                            },
+                        </c:forEach>
+                    </c:if>
+                ]
+                ,page: false
+            });
+            //监听工具条
+            table.on('tool(freestr)', function(obj){
+                var datacount="";
+                var data = obj.data;
+                if(obj.event === 'fttz'){
+                    sureradio(data);
+                } else if(obj.event === 'ddtz'){
+                    sureradio2(data,'${ctx}/jkxl/getft?id='+data.id);
+                }
+                // alert(datacount);
+            });
+        });
 function sureradio2(data,url){
     var newid = data.id;
     var xmmc = data.xmmc;
@@ -219,22 +204,18 @@ function sureradio2(data,url){
             shade: 0.8,
             maxmin: true,
             shadeClose: true,
-        <%--content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'--%>
-    content: url
-    , btn: ['确定','关闭']
+            content: url
+            , btn: ['确定','关闭']
                 ,yes: function(index, layero){
                     var bodyparent = layer.getChildFrame('body', index);
                     bodyparent.find('#freenl').click();
                 }
                 ,btn2: function(index, layero){
-//		  		alert(layero);
                     layer.close(index);
                 }
             })
         })
     }
-</script>
-<script>
     function sureradio(data,target){
         var newid = data.id;
         var xmmc = data.xmmc;
@@ -272,8 +253,6 @@ function sureradio2(data,url){
             })
         })
     }
-</script>
-<script>
     layui.use('table', function(){
         var table = layui.table;
         table.render({

src/main/webapp/webpage/modules/sg/project/management.js

@@ -64,7 +64,7 @@ layui.config({
                         return xml;
                     }}
             ]],
-            "data": [
+            data: [
                 <c:if test="${ not empty list}">
                     <c:forEach items="${list}" var="data" varStatus="index">
                         {
@@ -94,11 +94,10 @@ layui.config({
                 "type":"${items.type}",
                 "gcmc":"${items.itemName}",
                 "xmsl": "某施工单位一",
-        <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
-                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
-                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
-        "status":"3",
-            "pid": "${items.projectId}"
+                "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if>",
+                "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
+                "status":"3",
+                "pid": "${items.projectId}"
     },
     </c:forEach>
     </c:forEach>
@@ -172,7 +171,6 @@ function addProject(){
                 }
             }
         });
-
     });
 }
 function look(url) {
@@ -212,7 +210,7 @@ function update(url) {
 $(document).ready(function(e) {
 
     $("#noneBtn").click(function(e) {
-        $("#noneDiv").toggle(400);
+        $("#noneDiv").toggle();
     });
 });
 </script>

src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/vermeit.css">
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-    <%@include file="management.js"%>
+
 </head>
 <style>
     .layui-input{height: 28px;margin-top: 5px;width: 260px;}
@@ -128,4 +128,5 @@
     </div>
 </div>
 </body>
+<%@include file="management.js"%>
 </html>

src/main/webapp/webpage/modules/sg/projecttem/addItem.js

@@ -6,37 +6,22 @@
         var newText1 = parent.$('#addtext').val();
         $("#newText1").val(newText1);
     })
-function doSubmit(obj){
-    if ($("#myfile").val()==null||$("#myfile").val()==""){
-        layer.msg("请选择文件",{icon: 3});
-        throw SyntaxError;
-    }
-    if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
-        layer.msg("请输入项目名称",{icon:3});
-        throw SyntaxError;
-    }
-    //获取项目名称
-    var project_name=$("#inputwrite").val();
-    //获取工程id
-    var project_id=$("#newText1").val();
-    $.ajax({
-        url: "${ctx}/project/tem/verfiy",
-        type: "post",
-        data: {"projectName":project_name,"projectId":project_id},
-        success:function (result) {
-            if (result.code == 1){
-                layer.msg(result.msg,{icon:5});
-            }else {
-                $("#inputForm").submit();
-            }
+    function doSubmit(obj){
+        if ($("#myfile").val()==null||$("#myfile").val()==""){
+            layer.msg("请选择文件",{icon: 3});
+            throw SyntaxError;
+        }
+        if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+            layer.msg("请输入项目名称",{icon:3});
+            throw SyntaxError;
         }
-    });
-}
-$("#btnxz").click(function(){
-    $("#myfile").trigger("click");
-})
-$("#myfile").bind("change",function(){
-    var solr_file= $("#myfile").val();
-    $("#view_input").val(solr_file);
-})
+        $("#inputForm").submit();
+    }
+    $("#btnxz").click(function(){
+        $("#myfile").trigger("click");
+    })
+    $("#myfile").bind("change",function(){
+        var solr_file= $("#myfile").val();
+        $("#view_input").val(solr_file);
+    })
 </script>

src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -7,12 +7,14 @@
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
-    <link rel="stylesheet" href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
-    <%--<script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>--%>
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/bootstrap.min.css">
     <style>
-        .layui-input{ height: 28px;margin-top: 6px;}
-        .layui_td{text-align: center;font-size: 14px;margin-top: 20px}
-    </style>
+
+        .layui-input{ height: 28px;}
+        td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
+        .layui_td_1{text-align: center;font-size: 14px;}
+        .modal-body{padding: 10px}
+</style>
 </head>
 <body>
 <form id="inputForm"class="layui-form" action="${ctx}/project/tem/importfile" method="post" enctype="multipart/form-data">
@@ -22,12 +24,14 @@
         <%--</fieldset>--%>
         <table class="table table-bordered table-striped"  width="800px">
             <tr>
-                <td class="layui_td"><input type="button" class="layui-btn layui-btn-normal" value="选择结算文件" id="btnxz"/></td>
-                <td><input id="view_input" readonly="readonly" class="form-control" placeholder="*结算书文件为博微导出xls/xlsx格式文件">  </td>
+                <td class="layui_td_1"><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
+                <td>
+                    <input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke">
+                </td>
             </tr>
             <tr>
-                <td class="layui_td">*项目划分</td>
-                <td style="color: #555;font-size: 14px"><select name="type" lay-verify="required" lay-search="">
+                <td class="layui_td_1">*项目划分</td>
+                <td ><select name="type" lay-verify="required" lay-search="">
                     <option value="">请选择</option>
                     <option value="1">架空线路工程</option>
                     <option value="2">电缆工程</option>
@@ -35,14 +39,14 @@
                 </select></td>
             </tr>
             <tr>
-                <td class="layui_td">*项目名称</td>
-                <td class="layui_td">
+                <td class="layui_td_1">*项目名称</td>
+                <td>
                     <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
                 </td>
             </tr>
             <tr>
-                <td class="layui_td">项目编号</td>
-                <td class="layui_td">
+                <td class="layui_td_1">项目编号</td>
+                <td>
                     <input type="text" name="" autocomplete="off" class="layui-input">
                 </td>
             </tr>

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -5,17 +5,15 @@ layui.use('upload', function(){
     var $ = layui.jquery
         ,upload = layui.upload;
     //多文件列表示例
-    var demoListView = $('#demoList')
+    var tbodyListView = $('#tbody_List')
         ,uploadListIns = upload.render({
-        elem: '#testList'
-        // ,url: '/upload/'
+         elem: '#add_List'
         ,accept: 'file'
         ,exts:'xls|xlsx'
         ,multiple: true
         ,auto: false
-        // ,bindAction: '#testListAction'
         ,choose: function(obj){
-            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
+            // var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
             //读取本地文件
             obj.preview(function(index, file, result){
                 arrayFile.push(index);
@@ -23,7 +21,7 @@ layui.use('upload', function(){
                 var tr = $(['<tr id='+index+'>'
                     ,'<td hidden><div class="td_id">'+index+'</div></td>'
                     ,'<td>'+ file.name +'</td>'
-                    ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称"></div></td>'
+                    ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称">'+file.name.split(".")[0]+'</div></td>'
                     ,'<td>'
                     ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option><option value="3">变电站工程</option></select>'
                     ,'<td style="text-align: center">'
@@ -32,12 +30,12 @@ layui.use('upload', function(){
                     ,'</tr>'].join(''));
                 //删除
                 tr.find('.demo-delete').on('click', function(){
-                    delete files[index]; //删除对应的文件
+                    // delete files[index]; //删除对应的文件
                     tr.remove();
-                    uploadListIns.config.elem.next()[0].value = '';
+                    // uploadListIns.config.elem.next()[0].value = '';
                 });
 
-                demoListView.append(tr);
+                tbodyListView.append(tr);
             });
         }
     });

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.jsp

@@ -43,17 +43,17 @@
                                 <legend style="font-size: 15px;">添加项目</legend>
                             </fieldset>
                             <div class="layui-upload">
-                                <button type="button" class="layui-btn layui-btn-normal" id="testList">添加文件</button>
+                                <button type="button" class="layui-btn layui-btn-normal" id="add_List">添加文件</button>
                                 <div class="layui-upload-list">
                                         <table class="layui-table" id="mytable">
                                         <thead>
                                         <tr>
                                             <th width="35%">文件名</th>
-                                            <th width="20%">项目名称</th>
-                                            <th width="20%">项目类型</th>
+                                            <th width="35%">项目名称</th>
+                                            <th width="15%">项目类型</th>
                                             <th width="15%" style="text-align: center">操作</th>
                                         </tr></thead>
-                                        <tbody id="demoList">
+                                        <tbody id="tbody_List">
 
                                         </tbody>
                                     </table>

src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -21,11 +21,11 @@
     treeLinkage: false,
     elem: '#table1',
     cols: [[
-{field: 'gcmc',width:200,title: '工程名称'},
-{field:'xmsl',width:180,title:"项目数量"},
-{field:'cjsq',width:200,title: '创建时期'},
-{field:'djr',width:200,title:'登记人'},
-{field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
+        {field: 'gcmc',width:200,title: '工程名称'},
+        {field:'xmsl',width:180,title:"项目数量"},
+        {field:'cjsq',width:200,title: '创建时期'},
+        {field:'djr',width:200,title:'登记人'},
+        {field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
     ////对操作进行初始化
     var xml = "";
     if(d.status==1){
@@ -73,9 +73,8 @@
     "type":"${items.type}",
     "gcmc":"${items.itemName}",
     "xmsl": "某施工单位一",
-    <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
-                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
-                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
+    "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if>",
+    "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
     "status":"3",
     "pid": "${items.projectId}"
 },
@@ -90,7 +89,8 @@
 });
 };
     renderTable1();
-    treetable.foldAll('#table1');
+    //表格下拉关闭
+    // treetable.foldAll('#table1');
     table.on('tool(table1)', function(obj,target){
     var data = obj.data;
     //console.log(obj)
@@ -99,15 +99,13 @@
     layui.use(['table','layer'],function(){
     layer.open({
     type: 2,
-    title: '添加工程',
+    title: '添加项目',
     area: ['60%', '80%'],
     shade: 0.8,
     shadeClose: true,
     content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
     , btn: ['确定','关闭']
     ,yes: function(index, layero){
-    // var bodyparent = layer.getChildFrame('body', index);
-    // bodyparent.find('#newProject').click();
     var body = layer.getChildFrame('body', index);
     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
     var inputForm = body.find('#inputForm');
@@ -200,11 +198,5 @@ function update(url) {
         }
     })
 }
-$(document).ready(function(e) {
-
-    $("#noneBtn").click(function(e) {
-        $("#noneDiv").toggle(400);
-    })
-});
 </script>
 

src/main/webapp/webpage/modules/sys/office/officeList.jsp

@@ -12,7 +12,6 @@
 			<div class="panel-heading">
 				<h3 class="panel-title">机构列表</h3>
 			</div>
-			
 			<div class="panel-body">
 			<!-- 工具栏 -->
 			<div class="row">