1

core/CoreApp/controllers/Returns.php

@@ -276,6 +276,16 @@ class Returns extends Start_Controller {
 			$post['edittime'] = time();
 			$post['number'] = trim($post['number']);
 			$post['u9_sku'] = trim($post['u9_sku'],";");
+			$post['region'] = trim($post['region'],',');
+			$post['cwjs'] = trim($post['cwjs'],',');
+			if(!empty($post['stime'])){
+				if(empty($post['ftime'])){
+					echo json_encode(array('msg'=>'请选择发货时间','success'=>false));exit;
+				}
+				if($post['stime'] <= $post['ftime']){
+					echo json_encode(array('msg'=>'收到时间必须大于发货时间','success'=>false));exit;
+				}
+			}
 			if($this->returns->get_number($post['number']) && $post['number'] != '')
 			{
 				echo json_encode(array('msg'=>'此订单编号已存在！','success'=>false));exit;
@@ -373,6 +383,18 @@ class Returns extends Start_Controller {
 			$post['edittime'] = time();
 			$post['number'] = trim($post['number']);
 			$post['u9_sku'] = trim($post['u9_sku'],";");
+			$post['region'] = trim($post['region'],',');
+			$post['cwjs'] = trim($post['cwjs'],',');
+
+			if(!empty($post['stime'])){
+				if(empty($post['ftime'])){
+					echo json_encode(array('msg'=>'请选择发货时间','success'=>false));exit;
+				}
+				if($post['stime'] <= $post['ftime']){
+					echo json_encode(array('msg'=>'收到时间必须大于发货时间','success'=>false));exit;
+				}
+			}
+
 			$od = $this->returns->get_torderinfo($post['torderinfo']);
 			if($od && $post['torderinfo'] != '')
 			{

template/erp/returns_add.html

@@ -3,7 +3,7 @@
 <div class="warp">
 <div class="title winnone">退单信息 - 添加</div>
 <ul class="setting">
-<li class="length remark">
+<li class=" remark">
 <em>收货地址：</em>
 <div class="checkbox">
 <span class="ckrows"><label><input name="region" type="radio" value="1"><font>国 内</font></label></span>
@@ -11,6 +11,14 @@
 </div>
 </li>
 
+<li>
+    <em>财务退货结算：</em>
+    <div class="checkbox">
+    <span class="ckrows"><label><input name="cwjs" type="radio" value="0" checked><font>否</font></label></span>
+    <span class="ckrows"><label><input name="cwjs" type="radio" value="1"><font>是</font></label></span>
+    </div>
+</li>
+
 <li>
 <em>店铺：</em>
 <select name="shop" class="select class shopselect">

template/erp/returns_edit.html

@@ -3,13 +3,20 @@
 <div class="warp">
 <div class="title winnone">退单信息 - 补充</div>
 <ul class="setting">
-<li class="length remark">
+<li class="remark">
 <em>收货地址：</em>
 <div class="checkbox">
 <span class="ckrows"><label><input name="region" type="radio" value="1" {if $returns['region'] == '1'}checked{/if}><font>国 内</font></label></span>
 <span class="ckrows"><label><input name="region" type="radio" value="2" {if $returns['region'] == '2'}checked{/if}><font>美国店</font></label></span>
 </div>
 </li>
+<li>
+    <em>财务退货结算：</em>
+    <div class="checkbox">
+    <span class="ckrows"><label><input name="cwjs" type="radio" value="0" {if $returns['cwjs'] != '1'}checked{/if}><font>否</font></label></span>
+    <span class="ckrows"><label><input name="cwjs" type="radio" value="1" {if $returns['cwjs'] == '1'}checked{/if}><font>是</font></label></span>
+    </div>
+</li>
 
 <li>
 <em>店铺：</em>