lvhao hai 1 día
pai
achega
b2965fad32

+ 3 - 1
core/CoreApp/controllers/Beihuogl.php

@@ -2515,6 +2515,7 @@ class Beihuogl extends Start_Controller {
                 $list[$k]['shop_id'] = isset($shop_list[$v['shop_id']])?$shop_list[$v['shop_id']]:"无";
                 $list[$k]['status'] = isset($status_list[$v['status']])?$status_list[$v['status']]:"";
                 $list[$k]['add_time'] = date("Y-m-d",$v['add_time']);
+                $change_num = $v['before_num'] - $v['after_num'];
                 if($v['status'] == 0){
                     $list[$k]['after_num'] = $v['after_num'];
                     $list[$k]['cxr'] = $v['cxr'];
@@ -2533,7 +2534,8 @@ class Beihuogl extends Start_Controller {
                 // }
                 $str .=  "</div>";
                 $list[$k]['update_time'] = $str;
-                unset($list[$k]['before_num']);
+                $list[$k]['before_num'] = $change_num;
+                //unset($list[$k]['before_num']);
             }
 
 

+ 5 - 2
template/erp/beihuogl_bhcxshlist.html

@@ -36,7 +36,9 @@
 <td>备注</td>
 <td>状态</td>
 <td>申请人</td>
+
 <td>要生产数量</td>
+<td>撤销数量</td>
 <td>申请时间</td>
 <td>操作</td>
 </tr>
@@ -73,8 +75,9 @@ $(".data tr").each(function() {
     $(this).find('td:eq(6)').css("width","6%");
     $(this).find('td:eq(7)').css("width","8%");
     $(this).find('td:eq(8)').css("width","6%");
-    $(this).find('td:eq(9)').css("width","8%");
-    $(this).find('td:eq(10)').css("width","15%");
+    $(this).find('td:eq(9)').css("width","6%");
+    $(this).find('td:eq(10)').css("width","8%");
+    $(this).find('td:eq(11)').css("width","15%");
   
 });}