Merge remote-tracking branch 'origin/master'

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

@@ -267,6 +267,8 @@ function sureradio2(data,url){
                 ,{field:'setname',title:'项目或费用名称'}
                 ,{field:'setmoney',title:'金额'}
                 ,{field:'settext', title:'备注'}
+                ,{field:'jshj',title:'计算合计'}
+                ,{field:'ce',title:'差额'}
                 ,{field:'op',align:'center',title:"数据核验", templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
@@ -286,7 +288,9 @@ function sureradio2(data,url){
                     "setmoney":doIt(${data.money}),
                     "settext":"${data.remarks}",
                     "status":"${data.status}",
-                    "reason":"${data.reason}"
+                    "reason":"${data.reason}",
+                    "jshj":"${data.totalFee}",
+                    "ce":"${data.diffenerce}"
                 },
             </c:forEach>
         </c:if>

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

@@ -63,7 +63,7 @@
                     "id":"${data1.id}",
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
-                    "sgdw": "某施工单位一",
+                    "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":"项目编号",
                     "sgdw":"施工单位"

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

@@ -82,7 +82,7 @@
                     "id":"${data1.id}",
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
-                    "sgdw": "某施工单位一",
+                    "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":"项目编号",
                     "sgdw":"施工单位"

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

@@ -76,7 +76,7 @@
                     "projectId":"${data1.projectId}",
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
-                    "sgdw": "某施工单位一",
+                    "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":"项目编号",
                     "sgdw":"施工单位"

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

@@ -89,7 +89,7 @@
                     "projectId":"${data1.projectId}",
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
-                    "sgdw": "某施工单位一",
+                    "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":"项目编号",
                     "sgdw":"施工单位"