|
@@ -502,7 +502,7 @@ class Returngoods extends Start_Controller {
|
|
if(empty($back_money)){
|
|
if(empty($back_money)){
|
|
$tmp['back_money'] = $value['back_money'];
|
|
$tmp['back_money'] = $value['back_money'];
|
|
}else{
|
|
}else{
|
|
- $tmp['back_money'] = $value['back_money']."USD";
|
|
|
|
|
|
+ $tmp['back_money'] = $value['back_money'];
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -532,7 +532,10 @@ class Returngoods extends Start_Controller {
|
|
if($value['status']== 120){
|
|
if($value['status']== 120){
|
|
$tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff !important;background-color: #f39c12; !important;border-color: #e08e0b;font-size:18px"" class="btn btn-xs window" data-h="/returngoods/doubtful/'.$value['id'].'" data-type="2" data-t="<b style='."'font-size:18px"."'".'>状态更正</b>">售后存疑</a>';
|
|
$tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff !important;background-color: #f39c12; !important;border-color: #e08e0b;font-size:18px"" class="btn btn-xs window" data-h="/returngoods/doubtful/'.$value['id'].'" data-type="2" data-t="<b style='."'font-size:18px"."'".'>状态更正</b>">售后存疑</a>';
|
|
}
|
|
}
|
|
- $tmp['caozuo'] .= '<br/><a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-日志</b>">日志</a>';
|
|
|
|
|
|
+ if(!empty($tmp['caozuo'])){
|
|
|
|
+ $tmp['caozuo'] .= "<br>";
|
|
|
|
+ }
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-日志</b>">日志</a>';
|
|
|
|
|
|
$tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px"" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-详情</b>">详情</a>';
|
|
$tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px"" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-详情</b>">详情</a>';
|
|
|
|
|
|
@@ -643,9 +646,9 @@ class Returngoods extends Start_Controller {
|
|
|
|
|
|
$tmp['back_no'] = empty($value['back_no'])?"":$value['back_no'];
|
|
$tmp['back_no'] = empty($value['back_no'])?"":$value['back_no'];
|
|
if($value['currency'] == 1){
|
|
if($value['currency'] == 1){
|
|
- $tmp['back_money'] = $value['back_money']."USD";
|
|
|
|
|
|
+ $tmp['back_money'] = $value['back_money'];
|
|
}else if($value['currency'] == 2){
|
|
}else if($value['currency'] == 2){
|
|
- $tmp['back_money'] = $value['back_money']."CNY";
|
|
|
|
|
|
+ $tmp['back_money'] = $value['back_money'];
|
|
}else{
|
|
}else{
|
|
$tmp['back_money'] = $value['back_money'];
|
|
$tmp['back_money'] = $value['back_money'];
|
|
}
|
|
}
|
|
@@ -654,11 +657,11 @@ class Returngoods extends Start_Controller {
|
|
$tmp['caozuo'] = "";
|
|
$tmp['caozuo'] = "";
|
|
|
|
|
|
if($value['status'] == 20){
|
|
if($value['status'] == 20){
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff !important;background-color: #5cb85c !important;border-color: #4cae4c;" data-id="'.$value['id'].'" class="btn btn-xs cancel" data-type="2" onclick="mastercheck(this)">待审核</a>';
|
|
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff !important;background-color: #5cb85c !important;border-color: #4cae4c;font-size:18px;" data-id="'.$value['id'].'" class="btn btn-xs cancel" data-type="2" onclick="mastercheck(this)">待审核</a>';
|
|
}
|
|
}
|
|
-
|
|
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="退货登记-日志">日志</a>';
|
|
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="退货登记-详情">详情</a>';
|
|
|
|
|
|
+
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-日志</b>">日志</a>';
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-详情</b>">详情</a>';
|
|
|
|
|
|
$data_list[] = $tmp;
|
|
$data_list[] = $tmp;
|
|
}
|
|
}
|
|
@@ -766,9 +769,9 @@ class Returngoods extends Start_Controller {
|
|
|
|
|
|
$tmp['back_no'] = empty($value['back_no'])?"":$value['back_no'];
|
|
$tmp['back_no'] = empty($value['back_no'])?"":$value['back_no'];
|
|
if($value['currency'] == 1){
|
|
if($value['currency'] == 1){
|
|
- $tmp['back_money'] = $value['back_money']."USD";
|
|
|
|
|
|
+ $tmp['back_money'] = $value['back_money'];
|
|
}else if($value['currency'] == 2){
|
|
}else if($value['currency'] == 2){
|
|
- $tmp['back_money'] = $value['back_money']."CNY";
|
|
|
|
|
|
+ $tmp['back_money'] = $value['back_money'];
|
|
}else{
|
|
}else{
|
|
$tmp['back_money'] = $value['back_money'];
|
|
$tmp['back_money'] = $value['back_money'];
|
|
}
|
|
}
|
|
@@ -777,11 +780,14 @@ class Returngoods extends Start_Controller {
|
|
$tmp['caozuo'] = "";
|
|
$tmp['caozuo'] = "";
|
|
|
|
|
|
if($value['status'] == 30){
|
|
if($value['status'] == 30){
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff ;background-color: #f39c12; border-color: #e08e0b;" data-type="2" data-h="/returngoods/backmoney/'.$value['id'].'" class="window btn btn-xs " data-t="退款">财务退款</a>';
|
|
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #fff ;background-color: #f39c12; border-color: #e08e0b;font-size:18px" data-type="2" data-h="/returngoods/backmoney/'.$value['id'].'" class="window btn btn-xs " data-t="<b style='."'font-size:18px"."'".'>退款</b>">财务退款</a>';
|
|
|
|
+ }
|
|
|
|
+ if(!empty($tmp['caozuo'])){
|
|
|
|
+ $tmp['caozuo'] .= '<br>';
|
|
}
|
|
}
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="退货登记-日志">日志</a>';
|
|
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returnlogs/table/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-日志</b>">日志</a>';
|
|
|
|
|
|
- $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="退货登记-详情">详情</a>';
|
|
|
|
|
|
+ $tmp['caozuo'] .= '<a href="javascript:void(0);" style="margin-right:4px;color: #444;background-color:#f4f4f4;border-color: #ddd;font-size:18px" data-h="/returngoods/see/'.$value['id'].'" data-type="2" class="window btn btn-xs" data-t="<b style='."'font-size:18px"."'".'>退货登记-详情</b>">详情</a>';
|
|
|
|
|
|
$data_list[] = $tmp;
|
|
$data_list[] = $tmp;
|
|
}
|
|
}
|