任务书页面显示子课题各公司分配金额

src/main/resources/templates/prjproject/add.html

@@ -432,6 +432,9 @@
 
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn">
+<!--                            <button type="button" class="layui-btn" lay-filter="saveBtn6">-->
+<!--                                <i class="layui-icon layui-icon-ok"></i>保存-->
+<!--                            </button>-->
                             <button class="layui-btn" lay-filter="cancleBtn">
                                 <i class="layui-icon layui-icon-close"></i>关闭
                             </button>
@@ -544,6 +547,7 @@
     var updateflag = 0;
     var prjMember = [];
     var prjCompany = [];
+    // var prjfeescheme=[];
     var subTopic = [];
     var budgetCols = [];
     var dataBudget = new Array();
@@ -566,7 +570,6 @@
             value: new Date(),
             done:function (value,date,endDate) {
                 setTimeout(function () {
-                    console.log('进来了');
                     let qs= $('#qs').val();
                     let wc= $('#wc').val();
                     let qss = new Date(qs);
@@ -595,7 +598,6 @@
             elem: '#wc',
             done:function (value,date,endDate) {
                 setTimeout(function () {
-                    console.log('进来了wc')
                     let qs= $('#qs').val();
                     let wc= $('#wc').val();
                     console.log('qs:'+qs);
@@ -1405,8 +1407,13 @@
                 success: function (result) {
                     dataSubtopic = result.data.rows;
                     prjCompletecompanyListFy =  result.data.prjCompletecompanyListFy;
+                    if (prjCompletecompanyListFy.length>0) {
+                        for (var i = 0; i < dataCompany.length; i++) {
+                            dataBudget[0]['dw' + (i + 1)] = prjCompletecompanyListFy[i].sumjf;
+                        };
+                        setPrjBudge();
+                    }
 //年度预算总和
-
                     document.getElementById('rwsys').value = result.data.sum;
 
                     document.getElementById('rwsys2').value = result.data.sum;
@@ -1920,7 +1927,13 @@
 
                         var ysje = dw1 + dw2 + dw3 + dw4 + dw5 + dw6 + dw7 + dw8 + dw9 + dw10;
 
-
+                        if (dataCompany !=null || dataCompany.length>0) {
+                            for (var i = 0; i < dataCompany.length; i++) {
+                                dataBudget[0]['dw' + (i + 1)] = dataBudget[0]['dw' + (i + 1)] + '/' + prjCompletecompanyListFy[i].sumjf;
+                                console.log(dataBudget[0]['dw' + (i + 1)])
+                            }
+                            ;
+                        }
                         if (ysje == 0) {
                             dataBudget[j].ysje = "";
                         } else
@@ -1982,7 +1995,9 @@
                     if ( budgets[0]['dw' + (i + 1)] == null ||  budgets[0]['dw' + (i + 1)] ==''){
                         budgets[0]['dw' + (i + 1)] ==0;
                     }
-                    if (budgets[0]['dw' + (i + 1)] != prjCompletecompanyListFy[i].sumjf ){
+                    let originalValue = dataBudget[0]['dw' + (i + 1)];
+                    let valueBeforeSlash = originalValue.match(/[^\/]+/)[0];
+                    if (valueBeforeSlash != prjCompletecompanyListFy[i].sumjf ){
                         alert("保存失败,"+prjCompletecompanyListFy[i].dwmc+'在子课题单位分工中所有经费总和为:'
                             +prjCompletecompanyListFy[i].sumjf+'万元,请确保所填数据一致!!!')
                         return false
@@ -2073,9 +2088,27 @@
                     content: AjaxUtil.ctx + 'prjFeescheme/forAdd/' + xmId + '?qs=' + $("#qs").val() + '&wc=' + $("#wc").val() + '&ysjecz=' + $("#rwsys").val(),
                     end: function (index) {
                         // 重载表格
-                        if (updateflag == 1)
+                        if (updateflag == 1) {
                             freshFeescheme();
-                        updateflag = 0;
+                            updateflag = 0;
+                            // var oldData = table.cache["currentTableId6"];
+                            // var item = {
+                            //     "zb" : prjfeescheme.zb,
+                            //     "qs" : prjfeescheme.qs,
+                            //     "wc" : prjfeescheme.wc,
+                            //     "nf" : prjfeescheme.nf,
+                            //     "czdw" : prjfeescheme.czdw,
+                            //     "dwmc" : prjfeescheme.dwmc,
+                            //     "czje" : prjfeescheme.czje,
+                            //     "companys" : prjfeescheme.companys
+                            // };
+                        }
+                        // console.log(item.companys)
+                        // oldData.push(item);
+                        // table.reload('currentTableId6', {
+                        //     data: oldData
+                        // });
+
                         layer.close(index);
                     }
                 });
@@ -2730,6 +2763,14 @@
     function getZktInfo() {
         return subTopic;
     }
+    // //获取出资方案信息
+    // function setCzfa(czfa) {
+    //     prjfeescheme = czfa;
+    // }
+    //
+    // function getCzfa() {
+    //     return prjfeescheme;
+    // }
 </script>
 </body>
 </html>