Quellcode durchsuchen

上报调整:工程结算审核下的合同价不可等于审定价 功能撤回

徐滕 vor 2 Wochen
Ursprung
Commit
33f0db65eb

+ 0 - 33
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -212,11 +212,6 @@
                             return false;
                         }
 
-                        if(parseFloat(HeTongJia) == parseFloat(ShenDingJia)){
-                            parent.layer.msg("合同价与审定价不可相同!", {icon: 5});
-                            return false;
-                        }
-
                         var SongShenJia = $("#SongShenJia").val();
                         var SongShenJiaTotal =  parseFloat(SongShenJia);
                         // 检查解析后的值是否为0
@@ -1180,34 +1175,6 @@
             obj.value = obj.value.replace(/\.{2,}/g, "."); // 只保留第一个".",清除多余的
             obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); // 确保只存在一个小数点
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d{4}).*$/, '$1$2.$3'); // 只能输入小数点后 4 位
-            var projectType = $("#ProjectType").val();
-            if(projectType == 10) {
-                if (obj.id === "HeTongJia") {
-                    console.log(obj.value)
-                    console.log($("#ShenDingJia").val())
-                    var heTongJia = obj.value;
-                    var shenDingJia = $("#ShenDingJia").val();
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                } else if (obj.id === "ShenDingJia") {
-                    console.log($("#HeTongJia").val())
-                    console.log(obj.value)
-                    var heTongJia = $("#HeTongJia").val();
-                    var shenDingJia = obj.value;
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                }
-            }
         }
 
         function onblurNum(obj){

+ 0 - 33
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -216,11 +216,6 @@
                         return false;
                     }
 
-                    if(parseFloat(HeTongJia) == parseFloat(ShenDingJia)){
-                        parent.layer.msg("合同价与审定价不可相同!", {icon: 5});
-                        return false;
-                    }
-
                     var SongShenJia = $("#SongShenJia").val();
                     var SongShenJiaTotal =  parseFloat(SongShenJia);
                     // 检查解析后的值是否为0
@@ -1173,34 +1168,6 @@
             obj.value = obj.value.replace(/\.{2,}/g, "."); // 只保留第一个".",清除多余的
             obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); // 确保只存在一个小数点
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d{4}).*$/, '$1$2.$3'); // 只能输入小数点后 4 位
-            var projectType = $("#ProjectType").val();
-            if(projectType == 10) {
-                if (obj.id === "HeTongJia") {
-                    console.log(obj.value)
-                    console.log($("#ShenDingJia").val())
-                    var heTongJia = obj.value;
-                    var shenDingJia = $("#ShenDingJia").val();
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                } else if (obj.id === "ShenDingJia") {
-                    console.log($("#HeTongJia").val())
-                    console.log(obj.value)
-                    var heTongJia = $("#HeTongJia").val();
-                    var shenDingJia = obj.value;
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                }
-            }
         }
 
         function numGCGN(obj){

+ 0 - 33
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -217,11 +217,6 @@
                         return false;
                     }
 
-                    if(parseFloat(HeTongJia) == parseFloat(ShenDingJia)){
-                        parent.layer.msg("合同价与审定价不可相同!", {icon: 5});
-                        return false;
-                    }
-
                     var SongShenJia = $("#SongShenJia").val();
                     var SongShenJiaTotal =  parseFloat(SongShenJia);
                     // 检查解析后的值是否为0
@@ -1166,34 +1161,6 @@
             obj.value = obj.value.replace(/\.{2,}/g, "."); // 只保留第一个".",清除多余的
             obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); // 确保只存在一个小数点
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d{4}).*$/, '$1$2.$3'); // 只能输入小数点后 4 位
-            var projectType = $("#ProjectType").val();
-            if(projectType == 10) {
-                if (obj.id === "HeTongJia") {
-                    console.log(obj.value)
-                    console.log($("#ShenDingJia").val())
-                    var heTongJia = obj.value;
-                    var shenDingJia = $("#ShenDingJia").val();
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                } else if (obj.id === "ShenDingJia") {
-                    console.log($("#HeTongJia").val())
-                    console.log(obj.value)
-                    var heTongJia = $("#HeTongJia").val();
-                    var shenDingJia = obj.value;
-
-                    if (heTongJia || shenDingJia) {
-                        if (parseFloat(heTongJia) == parseFloat(shenDingJia)) {
-                            parent.layer.msg("合同价不可和审定价相同!", {icon: 5});
-                            return false;
-                        }
-                    }
-                }
-            }
         }
         function numGCGN(obj){
             var GCGMValue = $("#GCGMValue").val();