lvhao преди 4 месеца
родител
ревизия
27b664c21f
променени са 2 файла, в които са добавени 22 реда и са изтрити 20 реда
  1. 4 4
      core/CoreApp/controllers/Returngoods.php
  2. 18 16
      template/erp/returngoods.html

+ 4 - 4
core/CoreApp/controllers/Returngoods.php

@@ -526,13 +526,13 @@ class Returngoods extends Start_Controller {
 		    {			
                 $tmp = [];
                 $tmp['id'] = $value['id'];
-                
+                $tmp['shopname'] = $value['shopname'];
                 $tmp['orderinfo'] =  "<h9 class='window' data-h='/returngoods/edit/".$value['id']."' data-t='订单号:".$value['orderinfo']."'><p>".$value['orderinfo']."</p></h9>";
                 
                // $tmp['orderinfo'] = $value['orderinfo'];
-                $tmp['shopname'] = $value['shopname'];
+               
                 $tmp['number'] = $value['number'];
-                $tmp['status'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
+               
                 if(empty($value['cate_two'])){
                     $tmp['cate_show'] = $cate_one_show[$value['cate_one']];
                 }else{
@@ -557,7 +557,7 @@ class Returngoods extends Start_Controller {
                 }else{
                      $tmp['back_money'] = $value['back_money'];
                 }
-                
+                $tmp['status'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
                 $time_int = strtotime($value['create_time']);
                 $tmp['recorder'] = $value['recorder'];
                 $tmp['create_time'] = date("Y-m-d",$time_int)."<br />".date("H:i:s",$time_int);

+ 18 - 16
template/erp/returngoods.html

@@ -49,11 +49,6 @@
 <div class="fixed">
 <form >
 <ul class="search">
-<li>订单号:<input value="{$orderinfo}" name="orderinfo" type="text" ></li>
-<li>编号:<input value="" name="number" type="text" ></li>
-<li>退货单:<input value="" name="back_no" type="text" ></li>
-
-
 <li>
     店铺:
     <select name="shop" class="select">
@@ -64,23 +59,30 @@
     </select>
 </li>
 <li>
-    状态
-    <select name="status" class="select">
-            <option value="">选择状态</option>
-            {loop $status_list as $key=>$val}
+    售后类型
+    <select name="back_status" class="select">
+            <option value="">选择售后类型</option>
+            {loop $back_status_list as $key=>$val}
             <option value="{$key}">{$val}</option>
             {/loop}
     </select>
 </li>
+<li>订单号:<input value="{$orderinfo}" name="orderinfo" type="text" ></li>
+<li>编号:<input value="" name="number" type="text" ></li>
+<li>退货单:<input value="" name="back_no" type="text" ></li>
+
+
+
 <li>
-    售后类型:
-    <select name="back_status" class="select">
-            <option value="">选择售后类型</option>
-            {loop $back_status_list as $key=>$val}
+    状态
+    <select name="status" class="select">
+            <option value="">选择状态</option>
+            {loop $status_list as $key=>$val}
             <option value="{$key}">{$val}</option>
             {/loop}
     </select>
 </li>
+
 <li>登记人:<input value="" name="recorder" type="text" ></li>
 <li>
     登记时间:
@@ -121,15 +123,15 @@
 <td>
     <label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label>
 </td>
-<td>订单号</td>
 <td>店铺</td>
+<td>订单号</td>
 <td>编号</td>
-<td>状态</td>
 <td>登记原因</td>
 <td>备注信息</td>
 <td>售后类型</td>
 <td>重发订单编号</td>
 <td>退款金额</td>
+<td>状态</td>
 <td>登记人</td>
 <td>登记时间</td>
 <td>操作</td>
@@ -158,7 +160,7 @@ $(".data tr").each(function() {
 $(this).find('td:eq(0)').css("width","1%");
 $(this).find('td:eq(1)').css("width","7%");
 $(this).find('td:eq(2)').css("width","7%");
-$(this).find('td:eq(3)').css("width","6%");
+$(this).find('td:eq(3)').css("width","7%");
 $(this).find('td:eq(4)').css("width","4%");
 $(this).find('td:eq(5)').css("width","10%");
 $(this).find('td:eq(6)').css("width","22%");