Browse Source

2019-09-23 19632

xs 5 năm trước cách đây
mục cha
commit
bdaa40050d

+ 2 - 2
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>

+ 7 - 5
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');
         }
     });

+ 4 - 1
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">

+ 3 - 3
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>

+ 2 - 2
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>

+ 2 - 2
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>