Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/sg/project/management.jsp

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

@@ -348,18 +348,18 @@
                 , btn: ['调整','关闭']
                 ,yes: function(index, layero){
                     var body = layer.getChildFrame('body', index);
-                   var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                   var inputForm = body.find('#inputForm');
-                   var top_iframe;
-                   if(target){
-                       top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                   }else{
-                       top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                   }
-                   inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                   iframeWin.contentWindow.doSubmit();
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    iframeWin.contentWindow.doSubmit();
 
-                   layer.close(index);//关闭对话框。
+                    layer.close(index);//关闭对话框。
 
                 }
 
@@ -413,12 +413,11 @@
                     type: 1,
                     title:data.entryName,
                     // skin: 'layui-layer-rim',
-                    area: ['50%', '50%'],
+                    area: ['505', '50%'],
                     content: data.reason
                 });
             }
         });
-
     });
 
 </script>

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

@@ -193,8 +193,8 @@
                             ////对操作进行初始化
                             var xml = "";
                             if(d.status==1){
-                                xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' lay-event='look'>查看</a>"
-                                    +"<a class='layui-btn layui-btn-xs' lay-event='update'>修改</a>"
+                                xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick='look()'>查看</a>"
+                                    +"<a class='layui-btn layui-btn-xs'  onclick='update()'>修改</a>"
                                     +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>"
                                     +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''>导出</a>";
                             }
@@ -202,7 +202,7 @@
                                 xml +="<span>操作</span>";
                             }
                             if(d.status==3){
-                                xml +="<a class='layui-btn layui-btn-xs'  href=\"${ctx}/jkxl/list?id="+d.id+"\">编辑</a>";
+                                xml +="<a class='layui-btn layui-btn-xs' lay-event='update1'>编辑</a>";
                             }
 
                             return xml;
@@ -238,7 +238,7 @@
                         "gcmc":"${items.itemName}",
                         "xmsl": "某施工单位一",
                         "cjsq": "架空线路",
-                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
+                        "djr":"<fmt:formatDate value="${items.updateDate}" pattern="yyyy/MM/dd"/>",
                         "status":"3",
                         "pid": "${items.projectId}"
                     },
@@ -255,39 +255,12 @@
         table.on('tool(table1)', function(obj,target){
             var data = obj.data;
             //console.log(obj)
-            if(obj.event == 'look'){
-                layer.open({
-                    type: 2,
-                    title: '查看',
-                    area: ['90%', '90%'],
-                    shade: 0.8,
-                    shadeClose: true,
-                    content: '${ctxp}/webpage/modules/sg/project/lookItemForm.jsp'
-                    , btn: ['关闭']
-                })
-            }else if(obj.event == 'update'){
-                layer.open({
-                    type: 2,
-                    title: '修改',
-                    area: ['90%', '90%'],
-                    shade: 0.8,
-                    shadeClose: true,
-                    content: '${ctxp}/webpage/modules/sg/project/updateItemForm.jsp'
-                    , btn: ['确定','关闭']
-                    ,yes: function(index, layero){
-                        var bodyparent = layer.getChildFrame('body', index);
-                        bodyparent.find('#updatebtn').click();
-                    }
-                    ,btn2: function(index, layero){
-                        layer.close(index);
-                    }
-                })
-            }else if(obj.event == 'add'){
+            if(obj.event == 'add'){
                 $("#addtext").val(data.id);
                 layui.use(['table','layer'],function(){
                     layer.open({
                         type: 2,
-                        title: '添加项目',
+                        title: '添加工程',
                         area: ['60%', '80%'],
                         shade: 0.8,
                         shadeClose: true,
@@ -345,5 +318,36 @@
         });
     }
 </script>
+<script>
+    function look(url) {
+        layer.open({
+            type: 2,
+            title: '查看',
+            area: ['60%', '80%'],
+            shade: 0.8,
+            shadeClose: true,
+            content: 'url'
+            , btn: ['关闭']
+        })
+    }
+    function update(url) {
+        layer.open({
+            type: 2,
+            title: '修改',
+            area: ['50%', '70%'],
+            shade: 0.8,
+            shadeClose: true,
+            content: 'url'
+            , btn: ['确定','关闭']
+            ,yes: function(index, layero){
+                var bodyparent = layer.getChildFrame('body', index);
+                bodyparent.find('#updatebtn').click();
+            }
+            ,btn2: function(index, layero){
+                layer.close(index);
+            }
+        })
+    }
+</script>
 </body>
 </html>