2019-09-23 15:19

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -106,12 +106,11 @@ public class SettementUtil {
        工程结算
     */
     public static final String RESON_GCJS="《工程项目竣工结算汇总表》,工程结算价,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS1="《工程项目竣工结算汇总表》,竣工结算家合计,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS2="《工程项目竣工结算汇总表》,补增值税税率调整差额,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS3="《工程项目竣工结算汇总表》,扣减甲供材超供材料费,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS4="&nbsp;,小计,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String[] DLBDZ_FBFX2 = {RESON_FBFX1,BDZ_FBFX1,BDZ_FBFX2,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
-    public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
+    public static final String RESON_GCJS1=",竣工结算价合计,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS2=",补增值税税率调整差额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS3=",扣减甲供材超供材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String[] DLBDZ_FBFX2 = {RESON_FBFX1,BDZ_FBFX1,BDZ_FBFX2,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
+    public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
     /*
         设置转换参数
      */
@@ -543,16 +542,6 @@ public class SettementUtil {
             doubles[0] = doubles[0]+ minus - addcount;
         }
         return doubles[0];
-
-//        if (opinion){
-//            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-minus+addcount;
-//        }else {
-//            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-minus+addcount;
-//        }
-//        if (flag){
-//            doubles[0]= doubles[0]+minus-addcount;
-//        }
-//        return doubles[0];
     }
 
     /**
@@ -1050,7 +1039,7 @@ public class SettementUtil {
         reason=s.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +s1.replace("xxx",amout[1])
                 +s2.replace("xxx",amout[2])
-                +RESON_GCJS4.replace("xxx",amout[0]);
+                +RESON_JGJS8.replace("xxx",amout[0]);
         if (status.equals("0")){
             reason+=SettementUtil.RESON_TRUE;
         }else {
@@ -1109,7 +1098,7 @@ public class SettementUtil {
         if (booleans[10]) {
             reason +=RESON_GCJS3.replace("xxx", amout[3]);
         }
-        reason+=RESON_GCJS4.replace("xxx",amout[0]);
+        reason+=RESON_JGJS8.replace("xxx",amout[0]);
         if (settlement.getStatus().equals("0")){
             reason+=SettementUtil.RESON_TRUE;
         }else {

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -216,7 +216,7 @@ public class ProjectController extends BaseController {
     public AjaxJson delete(WbsProject wbsProject) {
         AjaxJson j = new AjaxJson();
         projectService.delete(wbsProject);
-        j.setMsg("删除项目成功");
+        j.setMsg("删除结算书成功");
         return j;
     }
 

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -226,7 +226,7 @@ public class ProjectTemController extends BaseController {
         HashMap map = new HashMap();
         List<WbsItem> wbsItemList = itemService.findItemByName(projectName,projectId);
         if (wbsItemList!=null&&!wbsItemList.isEmpty()){
-            map.put("msg","导入失败! 项目名称:"+projectName+" 已存在");
+            map.put("msg","导入失败! 结算书名称:"+projectName+" 已存在");
             return map;
         }
         map.put("code",1);

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

@@ -26,13 +26,13 @@
     <div style="margin-top: 20px">
      <c:forEach items="${map.list1}" var="data1" varStatus="index">
     <div style="margin-left: 30px;float: left;font-size: 15px">
-        <label>当前工程：${data1.itemName}</label>
+        <label>当前工程：</label>&nbsp;&nbsp;
+        <label>工程编号：${data1.itemNo}</label>
         <div style="height: 5px"></div>
-        <label>结算书编号：${data1.itemNo}</label>&nbsp;&nbsp;
         <label>当前结算书：${data1.itemName}</label>
-        <div style="height: 6px"></div>
+        <div style="height: 7px"></div>
     </div>
-    <div class="" style="margin-right: 30px;float: right;margin-top: 17px">
+    <div class="" style="margin-right: 30px;float: right;margin-top: 19px">
         <div class="layui-btn-group">
                <input id="type" hidden value="${data1.type}">
                <c:if test="${empty data1.projectId}">

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

@@ -23,10 +23,10 @@
             layer.msg("请输入结算书名称",{icon:3});
             throw SyntaxError;
         }
-        if($("#inputNumber").val()==null||$("#inputNumber").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()==""){
             layer.msg("请输入供应商",{icon:3});
             throw SyntaxError;

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

@@ -43,14 +43,14 @@
                     <input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
                 </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="itemNo" autocomplete="off" class="layui-input" id="inputNumber">
-                </td>
-            </tr>
-            <tr>
-                <td>*供应商</td>
+                <td>*供应商名称</td>
                 <td>
                     <input type="text" name="unit" autocomplete="off" class="layui-input" id="inputUnit">
                 </td>

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

@@ -41,19 +41,20 @@ layui.config({
             treeLinkage: true,
             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:210,title: '工程名称'},
+                {field:'xmsl',width:190,title:"结算书数量"},
+                {field:'cjsq',width:170,title: '创建时期'},
+                {field:'djr',width:160,title:'登记人'},
+                {field:'op',title:"操作",minWidth:400,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
                         if(d.status==1){ //工程按钮
-                            xml += "<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>";
+                                +"<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>";
                         }
                         if(d.status==2){ //项目表头操作
                             xml +="<span class='myspan'>操作</span>";

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

@@ -19,10 +19,10 @@ function doSubmit(obj){ // 添加项目提交方法
        layer.msg("请输入结算书名称",{icon:3});
        throw SyntaxError;
    }
-    if($("#inputNumber").val()==null||$("#inputNumber").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()==""){
         layer.msg("请输入供应商",{icon:3});
         throw SyntaxError;

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

@@ -35,11 +35,11 @@
             <tr>
                 <td>*结算书名称</td><td><input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite"></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="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" name="unit" autocomplete="off" class="layui-input" id="inputUnit"></td>
             </tr>
             </tbody>
         </table>