蔡德晨 5 lat temu
rodzic
commit
eaad31de85

+ 5 - 5
src/main/java/com/jeeplus/modules/sg/entity/TzData.java

@@ -8,15 +8,15 @@ public class TzData {
     private Double fee;
     private String state;
     private String wbsCode;
-    private List<JkxlData> jkxlData;
+    private String data1;
 
 
-    public List<JkxlData> getJkxlData() {
-        return jkxlData;
+    public String getData1() {
+        return data1;
     }
 
-    public void setJkxlData(List<JkxlData> jkxlData) {
-        this.jkxlData = jkxlData;
+    public void setData1(String data1) {
+        this.data1 = data1;
     }
 
     public String getState() {

+ 7 - 5
src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.web;
 
+import com.alibaba.fastjson.JSONArray;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
@@ -337,17 +338,18 @@ public class JkxlController extends BaseController {
   }
 
   @RequestMapping("/ddtz")
-  public String ddtz(@RequestBody TzData tzData, Model model, RedirectAttributes redirectAttributes){
+  public String ddtz(TzData tzData, Model model, RedirectAttributes redirectAttributes){
     String id = tzData.getId();
     String type = tzData.getType();
     double fee = tzData.getFee();
-    List<JkxlData> list = tzData.getJkxlData();
+    String data1 = tzData.getData1();
+    List<TzData> ts = (List<TzData>) JSONArray.parseArray(data1, TzData.class);
     List<JkxlData> lists = jkxlService.getList(id);
 
     try {
-      for (JkxlData jkxlData: list){
-
-      }
+//      for (JkxlData jkxlData: list){
+//
+//      }
 
     }catch (Exception e){
       addMessage(redirectAttributes, "调整失败");

+ 49 - 20
src/main/webapp/webpage/modules/sg/free/alongst.jsp

@@ -6,6 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
     <title>单独调整</title>
@@ -51,31 +52,52 @@
             ,cols: [[
                 {type: 'checkbox'}
                 ,{field:'wbsys',width:100,title:'分布分项'}
-                ,{field:'wbssbm',width:120,title:'WBS识别码'}
+                ,{field:'wbsCode',width:120,title:'WBS识别码'}
                 ,{field:'bl',width:100,title:'比例',edit: 'text'}
-                ,{field:'ftje',width:100,title:'分摊金额',edit: 'text'}
+                ,{field:'fee',width:100,title:'分摊金额',edit: 'text'}
             ]]
             ,data:[
                 {
                     "id":"1",
-                    "wbsys": "",
-                    "wbssbm": "",
+                    "wbsys": "基础工程",
+                    "wbsCode": "39100000",
                     "bl":'',
-                    "ftje":''
+                    "fee":''
                 },
                 {
                     "id":"2",
-                    "wbsys": "",
-                    "wbssbm": "",
+                    "wbsys": "杆塔工程",
+                    "wbsCode": "39200000",
                     "bl":'',
-                    "ftje":''
+                    "fee":''
                 },
                 {
                     "id":"3",
-                    "wbsys": "",
-                    "wbssbm": "",
+                    "wbsys": "接地工程",
+                    "wbsCode": "39300000",
                     "bl":'',
-                    "ftje":''
+                    "fee":''
+                },
+                {
+                    "id":"4",
+                    "wbsys": "架线工程",
+                    "wbsCode": "39400000",
+                    "bl":'',
+                    "fee":''
+                },
+                {
+                    "id":"5",
+                    "wbsys": "附件安装工程",
+                    "wbsCode": "39500000",
+                    "bl":'',
+                    "fee":''
+                },
+                {
+                    "id":"6",
+                    "wbsys": "辅助工程",
+                    "wbsCode": "39600000",
+                    "bl":'',
+                    "fee":''
                 }
             ]
             ,page: false
@@ -92,7 +114,7 @@
                 if(value==''){
                     $(this).html(value);
                     var w = $(this).closest("tr").find("td").eq("4").html();
-                    data.ftje="";
+                    data.fee="";
                     return false;
                 }
                 if(isNaN(blvalue)||ofvalue!="%"){
@@ -102,7 +124,7 @@
                 var bfb = changeTwoDecimal((blvalue/100)* moneycount);
                 $(this).html(value);
                 var w = $(this).closest("tr").find("td").eq("4").html(bfb);
-                data.ftje=bfb;
+                data.fee=bfb;
             }else{
                 var value = obj.value;
                 var data = obj.data;
@@ -135,22 +157,29 @@
                     return false;
                 }
                 var jsondata=JSON.stringify(data);
-//		     var e= jsondata.stringify(jsondata);
+		     // var e= jsondata.stringify(jsondata);
                 var objdata = JSON.parse(jsondata);
+             //    var objdata = JSON.stringify(jsondata);
+
                 var blcount = 0;
-                var ftjecount = 0;
+                var feecount = 0;
                 for (var i = 0;i<objdata.length;i++) {
                     blcount=Number(blcount)+Number(parseFloat(objdata[i].bl.substring(0,objdata[i].bl.length-1)).toFixed(2));
-                    ftjecount=Number(ftjecount)+Number(parseFloat(objdata[i].ftje).toFixed(2));
+                    feecount=Number(feecount)+Number(parseFloat(objdata[i].fee).toFixed(2));
                 }
-                if(blcount!=100||ftjecount!=moneycount2){
+                if(blcount!=100||feecount!=moneycount2){
                     layer.msg('比例/金额分配不正确!');
                     return false;
                 }
+                var newid2 = parent.$('#newid').val();
+                var xmmc2 = parent.$('#xmmc1').val();
+                var fyje2 = parent.$('#fyje1').val();
+
                 $.ajax({
-                    type:"get",
-                    url:"",
-//		    	async:true
+                    type:"post",
+                    url:"${ctx}/jkxl/ddtz",
+                    // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
+                    data:{id:newid2,type:xmmc2,fee:fyje2,data1:jsondata },
                     success:function(result){
                         parent.location.reload();
                     }

+ 2 - 2
src/main/webapp/webpage/modules/sg/free/avgpage.jsp

@@ -30,7 +30,7 @@
         <div class="" style="margin-left: 30px;margin-top: 10px;">
             <span id="mylable">项目调整</span>
             <span>:</span>
-            <span id="readid2">200</span>
+            <span id="readid2"></span>
         </div>
         <%--<label class="layui-form-label" id="mylable"></label>--%>
         <%--<div class="layui-input-block">--%>
@@ -96,7 +96,7 @@
         $("#xmmc2").val(xmmc2);
         $("#fyje2").val(fyje2);
         $("#mylable").text(xmmc2);
-        $("#readid").text(fyje2);
+        $("#readid2").text(fyje2);
     });
 
     function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。

+ 2 - 2
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -28,7 +28,7 @@
 
      .layui-table-view .layui-table {width:100%}
 </style>
-<body style="background-color: white">
+<body style="background-color: white;height: 100%">
     <sys:message content="${message}"/>
     <!-----------本体部分--------->
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
@@ -283,7 +283,7 @@
             layer.open({
                 type: 2,
                 title: '单独调整',
-                area: ['700px', '500px'],
+                area: ['700px', '400px'],
                 shade: 0.8,
 //		  closeBtn: 0,
 //      fixed: true, //不固定