Selaa lähdekoodia

税金,甲供

Enford 5 vuotta sitten
vanhempi
commit
cb674f8973

+ 4 - 4
src/main/webapp/webpage/modules/sg/project/management.js

@@ -45,7 +45,7 @@ layui.config({
                 {field:'xmsl',width:145,title:"结算书数量"},
                 {field:'cjsq',width:145,title: '创建时期'},
                 {field:'djr',width:130,title:'登记人'},
-                {field:'op',align:'center',title:"操作",minWidth:600,maxWidth:800,templet:function(d){
+                {field:'op',align:'center',title:"操作",minWidth:500,maxWidth:700,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
                         if(d.status==1){ //工程按钮
@@ -55,9 +55,9 @@ layui.config({
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' id=delPro"+d.id+" onclick=\"deleteProject('"+d.id+"')\">删除</a>"
                                 // +"<br>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/exportone?id=" + d.id+"\">导出wbs工程</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-normal layui-btn-xs'onclick=\"withhold( '${ctx}/project/withholdform?id=" + d.id + "&tabId=1')\">诚信扣款</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"materialOffset( '${ctx}/project/materialOffsetForm?id=" + d.id + "&tabId=1')\">甲供材抵扣</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"taxDeductions( '${ctx}/project/taxDeductionsForm?id=" + d.id + "&tabId=1')\">税额扣减</a></div>";
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-normal layui-btn-xs'onclick=\"withhold( '${ctx}/project/withholdform?id=" + d.id + "&tabId=1')\">诚信扣款</a></div>";
+                                // +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"materialOffset( '${ctx}/project/materialOffsetForm?id=" + d.id + "&tabId=1')\">甲供材抵扣</a>"
+                                // +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"taxDeductions( '${ctx}/project/taxDeductionsForm?id=" + d.id + "&tabId=1')\">税额扣减</a></div>";
 
                         }
                         if(d.status==2){ //项目表头操作

+ 38 - 2
src/main/webapp/webpage/modules/sg/project/withholdForm.js

@@ -14,6 +14,8 @@
             {field:'itemName',title:'项目名称'}
             ,{field:'unitType',title:'单位工程',edit: 'text'}
             ,{field:'integrityFee',title:'诚信扣款'}
+            ,{field:'materialoffset',title:'扣抵工程款'}
+            ,{field:'taxdeductions',title:'税额扣减'}
 
         ]]
         ,data:[ //数据导入
@@ -23,7 +25,9 @@
             "id":"${data.id}",
             "unitType": "${data.unitType}",
             "integrityFee": "${data.integrityFee}",
-            "itemName": "${data.itemName}"
+            "itemName": "${data.itemName}",
+            "materialoffset":"",
+            "taxdeductions":""
         },
         </c:forEach>
         </c:if>
@@ -35,6 +39,8 @@
                      }
                  $('table tr').each(function () {
                       var unitType = $(this).find('td:eq(1)').text()
+                        $(this).find('td:eq(3)').attr("data-edit","text")
+                        $(this).find('td:eq(4)').attr("data-edit","text")
                       if(unitType != null && unitType != ''){
                          $(this).find('td:eq(2)').attr("data-edit","text")
                       }
@@ -85,14 +91,32 @@
                  return false;
            }
         }
+        if(field === 'materialoffset'){
+            var value = obj.value;
+            if(isNaN(value)){ //判断输入是否是数字
+                layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
+                return false;
+            }
+        }
+        if(field === 'taxdeductions'){
+            var value = obj.value;
+            if(isNaN(value)){ //判断输入是否是数字
+                layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
+                return false;
+            }
+        }
     });
     });
     function updateProject(){
         var nameString = "";
         var nameString1 = "";
+        var materialString = "";
+        var taxString = "";
         $('table tr').each(function () {
             var unitType = $(this).find('td:eq(1)').text();
             var fee = $(this).find('td:eq(2)').text();
+            var materialOffset = $(this).find('td:eq(3)').text();
+            var taxDeductions = $(this).find('td:eq(4)').text();
             if(unitType == ''){
                unitType = null
             }else{
@@ -104,16 +128,28 @@
             if(fee == ''){
                 fee = null
             }
+            if(materialOffset == ''){
+                materialOffset = null;
+            }
+            if(taxDeductions == ''){
+                taxDeductions = null;
+            }
             nameString += unitType+",";
             nameString1 += fee+",";
+            materialString += materialOffset+",";
+            taxString+=taxDeductions+",";
         })
         var unitTypes = nameString.substring(5,nameString.length);
         var fees = nameString1.substring(5,nameString1.length);
+        var materialStrings = materialString.substring(5,materialString.length);
+        var taxStrings= taxString.substring(5,taxString.length);
         var ids = str.substring(0,str.length-1);
+        alert(taxStrings);
+        throw SyntaxError;
         $.ajax({
         type:"post",
         url:"${ctx}/project/withhold",
-        data:{'ids':ids,'fees':fees,'unitTypes':unitTypes},
+        data:{'ids':ids,'fees':fees,'unitTypes':unitTypes,'materialoffset':materialStrings,'taxdeductions':taxStrings},
         success:function(result){
            layer.msg(result.msg, {icon: 6,offset:['38%','38%']},function () {
             parent.location.reload();

+ 4 - 4
src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -25,16 +25,16 @@
         {field:'xmsl',width:180,title:"结算书数量"},
         {field:'cjsq',width:200,title: '创建时期'},
         {field:'djr',width:200,title:'登记人'},
-        {field:'op',align:'center',title:"操作",minWidth:500,templet:function(d){
+        {field:'op',align:'center',title:"操作",minWidth:330,templet:function(d){
     ////对操作进行初始化
     var xml = "";
     if(d.status==1){ //工程 表头
     xml += "<div><a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/tem/form?id=" + d.id + "&tabId=1')\">查看</a>"
         +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/tem/form?id=" + d.id + "&tabId=2')\">修改</a>"
         +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加结算书</a>"
-        +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"withhold( '${ctx}/project/withholdform?id=" + d.id + "&tabId=1')\">诚信扣款</a>"
-        +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"materialOffset( '${ctx}/project/materialOffsetForm?id=" + d.id + "&tabId=1')\">甲供材抵扣</a>"
-        +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"taxDeductions( '${ctx}/project/taxDeductionsForm?id=" + d.id + "&tabId=1')\">税额扣减</a></div>";
+        +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"withhold( '${ctx}/project/withholdform?id=" + d.id + "&tabId=1')\">诚信扣款</a></div>";
+        // +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"materialOffset( '${ctx}/project/materialOffsetForm?id=" + d.id + "&tabId=1')\">甲供材抵扣</a>"
+        // +"<a  class='layui-btn layui-btn-warm layui-btn-xs'onclick=\"taxDeductions( '${ctx}/project/taxDeductionsForm?id=" + d.id + "&tabId=1')\">税额扣减</a>";
     }
     if(d.status==2){
         xml +="<span class='myspan'>操作</span>";