Browse Source

添加零件修改

liujiankang 7 years ago
parent
commit
7f63240a14

+ 3 - 3
watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsComponents.java

@@ -21,7 +21,7 @@ public class PtsComponents implements Serializable {
 
     private Integer componentsType;//零件类型:1:塑胶件;2:五金件;3:其他;
 
-    private Integer componentsCost;//零件成本(分)
+    private double componentsCost;//零件成本(分)
 
     private double componentsWeight;//零件重量(g)
 
@@ -93,11 +93,11 @@ public class PtsComponents implements Serializable {
         this.componentsType = componentsType;
     }
 
-    public Integer getComponentsCost() {
+    public double getComponentsCost() {
         return componentsCost;
     }
 
-    public void setComponentsCost(Integer componentsCost) {
+    public void setComponentsCost(double componentsCost) {
         this.componentsCost = componentsCost;
     }
 

+ 6 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_add.ftl

@@ -111,7 +111,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本(元):</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value=""  id="componentsCost" name="componentsCost" placeholder="请输入零件成本,单位为元"  oninput= 'this.value = this.value.replace(/\D+/g, "")' onblur = 'this.value = this.value.replace(/\D+/g, "")'>
+                <input type="text" class="input-text" value=""  id="componentsCost" name="componentsCost" placeholder="请输入零件成本,单位为元"  onkeyup="value=value.replace(/[^\d.]/g,'')">
             </div>
         </div>
         <div class="row cl">
@@ -261,6 +261,11 @@
                 layer.msg('零件图片不能为空!', {icon: 2, time: 2000});
                 return;
             }
+            if($("#componentsCost").val() < 0.1){
+                layer.msg('零件成本不能小于0.1元!', {icon: 2, time: 2000});
+                return;
+            }
+
 			//$(form).ajaxSubmit();
             //var index = parent.layer.getFrameIndex(window.name);
 			//parent.$('.btn-refresh').click();

+ 5 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_update.ftl

@@ -101,7 +101,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本(元):</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="${ptsComponents.componentsCost/100!''}"  id="componentsCost" name="componentsCost" placeholder="请输入零件成本,单位为元" oninput= 'this.value = this.value.replace(/\D+/g, "")' onblur = 'this.value = this.value.replace(/\D+/g, "")'>
+                <input type="text" class="input-text" value="${ptsComponents.componentsCost/100!''}"  id="componentsCost" name="componentsCost" placeholder="请输入零件成本,单位为元" onkeyup="value=value.replace(/[^\d.]/g,'')">
             </div>
         </div>
         <div class="row cl">
@@ -248,6 +248,10 @@
 		focusCleanup:true,
 		success:"valid",
 		submitHandler:function(form){
+            if($("#componentsCost").val() < 0.1){
+                layer.msg('零件成本不能小于0.1元!', {icon: 2, time: 2000});
+                return;
+            }
            var produceId = $("#produceId").val();
            var oldProduceId =   $("#oldProduceId").val();
            var componentsStatus=$('input:radio[name="componentsStatus"]:checked').val();