2019-09-05 13：38

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

@@ -32,7 +32,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},
@@ -79,9 +78,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>",
@@ -124,7 +120,6 @@ 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'},
@@ -211,7 +206,6 @@ function sureradio2(data,url){
             shade: 0.8,
             maxmin: true,
             shadeClose: true,
-        {/*<%--content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'--%>*/}
             content: url
             , btn: ['确定','关闭']
                 ,yes: function(index, layero){
@@ -219,7 +213,6 @@ function sureradio2(data,url){
                     bodyparent.find('#freenl').click();
                 }
                 ,btn2: function(index, layero){
-//		  		alert(layero);
                     layer.close(index);
                 }
             })

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

@@ -31,6 +31,7 @@ function doSubmit(obj){
     //         }
     //     }
     // });
+        $("#inputForm").submit();
 }
 $("#btnxz").click(function(){
     $("#myfile").trigger("click");

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)
@@ -106,8 +106,6 @@
     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">