Merge remote-tracking branch 'origin/master'

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

@@ -15,27 +15,43 @@
         $("#newText1").val(newText1);
     })
     function doSubmit(obj){
+        var div1_value =  $("#mydiv1").text();
+        var div2_value =  $("#mydiv2").text();
         if ($("#myfile").val()==null||$("#myfile").val()==""){
             layer.msg("请选择结算书",{icon: 3});
             throw SyntaxError;
         }
-        if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+        if (div1_value==null||div1_value==""){
             layer.msg("请输入结算书名称",{icon:3});
             throw SyntaxError;
         }
+        // if ($("#myfile").val()==null||$("#myfile").val()==""){
+        //     layer.msg("请选择结算书",{icon: 3});
+        //     throw SyntaxError;
+        // }
+        //     if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+        //     layer.msg("请输入结算书名称",{icon:3});
+        //     throw SyntaxError;
+        // }
+        // if($("#inputUnit").val()==null||$("#inputUnit").val()==""){
+        //     layer.msg("请输入供应商",{icon:3});
+        //     throw SyntaxError;
+        // }
         // if($("#inputNumber").val()==null||$("#inputNumber").val()==""){
         //     layer.msg("请输入结算书编号",{icon:3});
         //     throw SyntaxError;
         // }
-        if($("#inputUnit").val()==null||$("#inputUnit").val()==""){
+        if(div2_value==null||div2_value==""){
             layer.msg("请输入供应商",{icon:3});
             throw SyntaxError;
         }
+    $("#inputwrite").val(div1_value);
+    $("#inputUnit").val(div2_value);
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01
         ,time:false
-        ,offset:['35%','36%']
+        ,offset:['37%','37%']
     });
     $.ajax({
         type: "post",

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

@@ -11,7 +11,9 @@
     <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>
     <style>
-
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
+        .mydiv:focus:before{content:none;text-align: left}
         .layui-input{ height: 28px;}
         td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
         .layui-form{padding: 4px}
@@ -24,7 +26,7 @@
             <tbody>
             <tr>
                 <td><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>
+                <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>*项目划分</td>--%>
@@ -40,19 +42,21 @@
             <tr>
                 <td>*结算书名称</td>
                 <td>
-                    <input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
+                    <input type="text" name="itemName" style="display: none" hidden="hidden" autocomplete="off" class="layui-input" id="inputwrite">
+                    <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入结算书名称"></div>
                 </td>
             </tr>
             <%--<tr>--%>
                 <%--<td>*结算书编号</td>--%>
                 <%--<td>--%>
-                    <%--<input type="text" name="itemNo" autocomplete="off" class="layui-input" id="inputNumber">--%>
+                    <%--<div contenteditable="true" class="mydiv3 mydiv" placeholder="请输入供应商"></div>--%>
                 <%--</td>--%>
             <%--</tr>--%>
             <tr>
                 <td>*供应商名称</td>
                 <td>
-                    <input type="text" name="unit" autocomplete="off" class="layui-input" id="inputUnit">
+                    <input type="text" name="unit" style="display: none" autocomplete="off" class="layui-input" id="inputUnit">
+                    <div contenteditable="true" id="mydiv2" class=" mydiv" placeholder="请输入供应商名称"></div>
                 </td>
             </tr>
             </tbody>

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

@@ -0,0 +1,81 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<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>
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<html>
+<head>
+    <title>添加结算书</title>
+    <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>
+    <style>
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
+        .mydiv:focus:before{content:none;text-align: left}
+        .layui-input{ height: 28px;}
+        td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
+        .layui-form{padding: 4px}
+    </style>
+</head>
+<body>
+<button style="display: none" id="btnSub" onclick="addPro();"></button>
+<form id="inputForm"class="layui-form" action="#" method="post" enctype="multipart/form-data">
+    <div class="layui-form">
+        <table class="layui-table">
+            <tbody>
+            <tr>
+                <td width="35%">*工程名称</td>
+                <td>
+                    <%--<input type="text" name="projectName" style="display: none" hidden="hidden" autocomplete="off" class="layui-input" id="inputwrite">--%>
+                    <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入工程名称"></div>
+                </td>
+            </tr>
+            <tr>
+                <td width="35%">*工程编号</td>
+                <td>
+                    <div contenteditable="true" id="mydiv2" class="mydiv" placeholder="请输入工程编号"></div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</form>
+</body>
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<script type="text/javascript">
+    layui.use(['form', 'layedit', 'laydate'], function(){
+        var form = layui.form;
+        form.render();
+    });
+    function addPro(){
+        var div1_value =  $("#mydiv1").text();
+        var div2_value =  $("#mydiv2").text();
+        if (div1_value==null||div1_value==""){
+            layer.msg("请输入工程名称",{icon:3});
+            throw SyntaxError;
+        }
+        if(div2_value==null||div2_value==""){
+            layer.msg("请输入工程编号",{icon:3});
+            throw SyntaxError;
+        }
+        $.ajax({
+            type: "post",
+            url: "${ctx}/project/save",
+            data:{projectName:div1_value},
+            dataType: "json",
+            success: function(data){
+                if(data.success){
+                    layer.msg(data.msg, {icon: 1,offset:['38%','38%']},function () {
+                        parent.location.reload();
+                    });
+                }else{
+                    layer.msg(data.msg, {icon: 5});
+                }
+            }
+        });
+    }
+
+</script>
+</html>

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

@@ -49,7 +49,7 @@
                 {field:'xmmc',title:'结算书名称'}
                 ,{field:'sgdw',title:'供应商'}
                 ,{field:'xmlx',title:'结算书类型'}
-                ,{field:'xmbh',title:'结算书编号'}
+                // ,{field:'xmbh',title:'结算书编号'}
                 ,{field:'op',align:'center',title:"操作",templet:function(d){
                      //对操作进行初始化
                      var xml = "<a class='layui-btn layui-btn-xs' style='margin-top: 3px' onclick=\"view( '" + d.id + "','" + d.type + "')\">编辑</a>";
@@ -65,7 +65,7 @@
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
-                    "xmbh":"${data1.itemNo}"
+                    <%--"xmbh":"${data1.itemNo}"--%>
                 },
                 </c:forEach>
                 </c:if>

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

@@ -45,16 +45,18 @@ layui.config({
                 {field:'xmsl',width:190,title:"结算书数量"},
                 {field:'cjsq',width:170,title: '创建时期'},
                 {field:'djr',width:160,title:'登记人'},
-                {field:'op',title:"操作",minWidth:400,templet:function(d){
+                {field:'op',align:'center',title:"操作",minWidth:500,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
                         if(d.status==1){ //工程按钮
-                            xml += "<div><a style='margin-top: 3px;' class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
+                            xml +="<div><a style='margin-top: 3px;' class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加结算书</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>"
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteProject('"+d.id+"')\">删除</a>"
+                                // +"<br>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">单体工程导出</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteProject('"+d.id+"')\">删除</a><div>";
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a><div>";
+
                         }
                         if(d.status==2){ //项目表头操作
                             xml +="<span class='myspan'>操作</span>";
@@ -105,9 +107,9 @@ layui.config({
     </c:forEach>
     </c:forEach>
     ],
-
         done: function () {
             $(".myspan").closest("tr").css('background-color','#f2f2f2');
+            // $("#br_div").closest("tr").css('height','break-word');
             layer.closeAll('loading');
         }
     });
@@ -158,22 +160,24 @@ function refresh(){ //刷新
     $("#fromSumbit").submit();
 }
 function addProject(){ //添加工程
-    layer.prompt({title: '请输入工程名称', formType: 3,offset:['35%','37%']}, function(text, index){
-        layer.close(index);
-        $.ajax({
-            type: "post",
-            url: "${ctx}/project/save",
-            data:{projectName:text},
-            dataType: "json",
-            success: function(data){
-                if(data.success){
-                    layer.msg(data.msg, {icon: 6});
-                    window.location.reload();
-                }else{
-                    layer.msg(data.msg, {icon: 5});
-                }
+    layui.use(['table','layer'],function(){
+        layer.open({
+            type: 2,
+            title: '添加工程',
+            offset:['7%','20%'],
+            area: ['60%', '90%'],
+            shade: 0.8,
+            shadeClose: true,
+            content: '${ctxp}/webpage/modules/sg/project/addprojectForm.jsp'
+            , btn: ['确定','关闭']
+            ,yes: function(index, layero){
+                var bodyparent = layer.getChildFrame('body', index); //当前页面 获取子类（弹出层body）的属性
+                bodyparent.find('#btnSub').click();  //获取子类页面的按钮,点击事件。
             }
-        });
+            ,btn2: function(index, layero){
+                layer.close(index);
+            }
+        })
     })
 }
 function look(url) { //工程 查看

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

@@ -21,6 +21,9 @@
     .layui-table-view .layui-table {width:100%}
     .layui-table-tips-main{display:none}
     .layui-table-tips-c{display:none}
+    .layui-table-cell {
+        height: inherit;
+    }
 </style>
 <body style="height: 100%">
 <input style="display: none;" id="addtext" value=""/>
@@ -36,7 +39,7 @@
                            <input id="pageNo" name="pageNo" type="hidden" value=""/>
                            <input id="pageSize" name="pageSize" type="hidden" value=""/>
                            <div class="layui-form-item">
-                               <div class="layui-inline">
+                               <div class="layui-inline" style="background-color: #FFE136">
                                    <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
                                    <label class="layui-font-style">工程名称:</label>
                                        <input type="text" name="projectName"  autocomplete="off" class="layui-input">
@@ -115,7 +118,7 @@
                 <div class="layui-card-body">
                     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
                         <div class="layui-btn-group">
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-meself" onclick="addProject()"><i class="layui-icon"></i>新建</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-meself"  onclick="addProject()"><i class="layui-icon"></i>新建</button>
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-meself"  onclick="refresh()"><img class="layui-meself-img1" src="${ctxp}/icon/refush.png" alt="">&nbsp;刷新</button>
                         </div>
                         <div class="layui-btn-group" style="float: right;margin-right: 10px;border: 1px solid rgb(204,204,204)">

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

@@ -67,8 +67,8 @@
                 {field:'xmmc',title:'结算书名称'}
                 ,{field:'sgdw',title:'供应商'}
                 ,{field:'xmlx',title:'结算书类型'}
-                ,{field:'xmbh',title:'结算书编号'}
-                ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
+                // ,{field:'xmbh',title:'结算书编号'}
+                ,{field:'op',align:'center',title:"操作",templet:function(d){
                         ////对操作进行初始化
                         var xml = "<a  class='layui-btn layui-btn-xs' style='margin-top: 3px' onclick=\"view( '" + d.id +" ','" + d.type + "')\">编辑</a>";
                         return xml;
@@ -83,7 +83,7 @@
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
-                    "xmbh":"${data1.itemNo}"
+                    <%--"xmbh":"${data1.itemNo}"--%>
                 },
                 </c:forEach>
                 </c:if>

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

@@ -9,13 +9,15 @@ layui.use(['form', 'layedit', 'laydate'], function(){
 })
 
 function doSubmit(obj){ // 添加项目提交方法
+    var div1_value =  $("#mydiv1").text();
+    var div2_value =  $("#mydiv2").text();
     //判断是否选择文件
    if ($("#myfile").val()==null||$("#myfile").val()==""){
        layer.msg("请选择结算书",{icon: 3});
        throw SyntaxError;
    }
    //判断项目名称是否存在
-   if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+   if (div1_value==null||div1_value==""){
        layer.msg("请输入结算书名称",{icon:3});
        throw SyntaxError;
    }
@@ -23,10 +25,12 @@ function doSubmit(obj){ // 添加项目提交方法
     //     layer.msg("请输入结算书编号",{icon:3});
     //     throw SyntaxError;
     // }
-    if($("#inputUnit").val()==null||$("#inputUnit").val()==""){
+    if(div2_value==null||div2_value==""){
         layer.msg("请输入供应商",{icon:3});
         throw SyntaxError;
     }
+    $("#inputwrite").val(div1_value);
+    $("#inputUnit").val(div2_value);
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01

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

@@ -7,6 +7,9 @@
     <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>
     <style>
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
+        .mydiv:focus:before{content:none;text-align: left}
         .layui-input{ height: 28px;}
          td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
         .layui-form{padding: 4px}
@@ -21,25 +24,20 @@
                 <td><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>*项目划分</td>--%>
-                <%--<td>--%>
-                    <%--<select name="type" lay-verify="required" lay-search="">--%>
-                        <%--<option value="">请选择</option>--%>
-                        <%--<option value="1">架空线路工程</option>--%>
-                        <%--<option value="2">电缆工程</option>--%>
-                        <%--<option value="3">变电站工程</option>--%>
-                    <%--</select>--%>
-                <%--</td>--%>
-            <%--</tr>--%>
             <tr>
-                <td>*结算书名称</td><td><input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite"></td>
+                <td>*结算书名称</td>
+                <td>
+                    <input type="text" style="display: none" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
+                    <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入结算书名称"></div>
+                </td>
             </tr>
-            <%--<tr>--%>
-                <%--<td>*结算书编号</td><td><input type="text" name="itemNo" autocomplete="off" class="layui-input" id="inputNumber"></td>--%>
-            <%--</tr>--%>
             <tr>
-                <td>*供应商名称</td><td><input type="text" name="unit" autocomplete="off" class="layui-input" id="inputUnit"></td>
+
+                <td>*供应商名称</td>
+                <td>
+                    <input type="text" style="display: none" name="unit" autocomplete="off" class="layui-input" id="inputUnit">
+                    <div contenteditable="true" id="mydiv2" class="mydiv" placeholder="请输入供应商名称"></div>
+                </td>
             </tr>
             </tbody>
         </table>

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

@@ -49,7 +49,7 @@
                 {field:'xmmc',title:'结算书名称'}
                 ,{field:'sgdw',title:'供应商'}
                 ,{field:'xmlx',title:'结算书类型'}
-                ,{field:'xmbh',title:'结算书编号'}
+                // ,{field:'xmbh',title:'结算书编号'}
                 ,{field:'op',align:'center',title:"操作",templet:function(d){
                     ////对操作进行初始化
                     var xml = "<a class='layui-btn layui-btn-xs' style='margin-top: 3px' onclick=\"view( '" + d.id + "','" + d.type + "','" + d.projectId + "')\">编辑</a>";
@@ -66,7 +66,7 @@
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
-                    "xmbh":"${data1.itemNo}"
+                    <%--"xmbh":"${data1.itemNo}"--%>
                 },
                 </c:forEach>
                 </c:if>

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

@@ -62,7 +62,7 @@
                 {field:'xmmc',title:'结算书名称'}
                 ,{field:'sgdw',title:'供应商'}
                 ,{field:'xmlx',title:'结算书类型'}
-                ,{field:'xmbh',title:'结算书编号'}
+                // ,{field:'xmbh',title:'结算书编号'}
                 ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
                    ////对操作进行初始化
                    var xml = "<a  class='layui-btn layui-btn-xs' style='margin-top: 3px'  onclick=\"view( '" + d.id +" ','" + d.type + "','" + d.projectId + "')\">编辑</a>";
@@ -79,7 +79,7 @@
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程s"</c:if>,
-                    "xmbh":"${data1.itemNo}"
+                    <%--"xmbh":"${data1.itemNo}"--%>
                 },
                 </c:forEach>
                 </c:if>