lvhao 3 недель назад
Родитель
Сommit
5fa7db9a47

+ 22 - 0
core/CoreApp/controllers/Express.php

@@ -193,6 +193,17 @@ class Express extends Start_Controller {
 				    $post['describecode'] = $post['describecode'].$ddata['id']."|";
 			    }
 			}
+
+			if($post['sbjz_min']*1 > $post['sbjz']*1){
+				echo json_encode(array('msg'=>'最低申报价不能大于最高申报价!!!','success'=>false));exit;
+			}
+			if($post['shouldmoney_min']*1 > $post['shouldmoney']*1){
+				echo json_encode(array('msg'=>'最低订单金额不能大于最高订单金额!!!','success'=>false));exit;
+			}
+			if($post['weight_limit_min']*1 > $post['weight_limit']*1){
+				echo json_encode(array('msg'=>'最低快递限重不能大于最高快递限重!!!','success'=>false));exit;
+			}
+
 			if($this->express->insert($post))
         	{
          		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
@@ -277,6 +288,17 @@ class Express extends Start_Controller {
 				    $describecodemoon = $describecodemoon.$ddata['id']."|";
 			    }
 			}
+
+			if($post['sbjz_min']*1 > $post['sbjz']*1){
+				echo json_encode(array('msg'=>'最低申报价不能大于最高申报价!!!','success'=>false));exit;
+			}
+			if($post['shouldmoney_min']*1 > $post['shouldmoney']*1){
+				echo json_encode(array('msg'=>'最低订单金额不能大于最高订单金额!!!','success'=>false));exit;
+			}
+			if($post['weight_limit_min']*1 > $post['weight_limit']*1){
+				echo json_encode(array('msg'=>'最低快递限重不能大于最高快递限重!!!','success'=>false));exit;
+			}
+
 			$post['packing'] = $express['packing'].$packingmoon;
 			$post['describecode'] = $express['describecode'].$describecodemoon;
 			if($this->express->save($post,$id))

+ 14 - 9
template/erp/express_add.html

@@ -105,18 +105,23 @@
 </select>
 </li>
 <li>
-    <em>快递限重:</em>
-    <input  value="0" name="weight_limit" type="text" >(kg) 0不限
+    <em>最低快递限重:</em>
+    <input  value="0" name="weight_limit_min" type="text" >(kg) 
 </li>
 <li>
-<em>申报品名:</em>
-<select name="sbpm" class="select class">
-<option value="">请选择</option>
-{loop customsdeclaration(50) as $val}
-<option value="{$val['ename']}" >{$val['ename']}</option>
-{/loop}
-</select>
+    <em>申报品名:</em>
+    <select name="sbpm" class="select class">
+    <option value="">请选择</option>
+    {loop customsdeclaration(50) as $val}
+    <option value="{$val['ename']}" >{$val['ename']}</option>
+    {/loop}
+    </select>
 </li>
+<li>
+    <em>最大快递限重:</em>
+    <input  value="0" name="weight_limit" type="text" >(kg) 0不限
+</li>
+
 <li class="length">
 <em>官方网址:</em>
 <input value="" name="url" type="text" >

+ 8 - 3
template/erp/express_edit.html

@@ -101,10 +101,9 @@
 </select>
 </li>
 <li>
-    <em>快递限重:</em>
-    <input  value="{$express['weight_limit']}" name="weight_limit" type="text" >(kg) 0不限
+    <em>最低快递限重:</em>
+    <input  value="0" name="weight_limit_min" type="text" >(kg) 
 </li>
-
 <li>
     <em>申报品名:</em>
     <select name="sbpm" class="select class">
@@ -114,6 +113,12 @@
     {/loop}
     </select>
 </li>
+<li>
+    <em>最大快递限重:</em>
+    <input  value="{$express['weight_limit']}" name="weight_limit" type="text" >(kg) 0不限
+</li>
+
+
 <li class="length">
 <em>官方网址:</em>
 <input value="{$express['url']}" name="url" type="text" >

+ 2 - 2
template/erp/js/express-addedit.js

@@ -415,7 +415,7 @@ $(".describecode .expsc").click(function() {
     if (ab > 0) {
         $(".ts p").text("红框为必填项");
         $(".ts").show();
-        setTimeout('$(".ts").fadeOut()', 600);
+        setTimeout('$(".ts").fadeOut()', 1600);
         return false;
     }
     $.ajax({
@@ -431,7 +431,7 @@ $(".describecode .expsc").click(function() {
             } else {
                 $(".ts p").html(a.msg);
                 $(".ts").fadeIn();
-                setTimeout('$(".ts").fadeOut()', 400);
+                setTimeout('$(".ts").fadeOut()', 2400);
             }
         }
     });