Bladeren bron

提交数据

lvhao 6 uur geleden
bovenliggende
commit
ea67c343a6
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 2 1
      core/CoreApp/controllers/Beihuogl.php
  2. 2 0
      template/erp/beihuogl_ccwlshlist.html

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

@@ -705,7 +705,7 @@ class Beihuogl extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
 
-            $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,ccwl_num,add_time,update_time,erp_check",$order_str,$start,$perpage);
+            $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,ccwl_num,add_time,yqwc_time,update_time,erp_check",$order_str,$start,$perpage);
 
             if(empty($list)){
                 $rows = array('total'=>0,'over'=>1,'pagenum'=>0,'rows'=>([]));
@@ -719,6 +719,7 @@ class Beihuogl extends Start_Controller {
                 $list[$k]['shop_id'] = isset($shop_list[$v['shop_id']])?$shop_list[$v['shop_id']]:"无";
                 $list[$k]['plat_id'] = isset($plat_list[$v['plat_id']])?$plat_list[$v['plat_id']]:"无";
                 $list[$k]['add_time'] = date("Y-m-d",$v['add_time']);
+                $list[$k]['yqwc_time'] = empty($v['yqwc_time'])?'': date("Y-m-d",$v['yqwc_time']);
                 if($v['erp_check'] == 1){
                       $list[$k]['sku'] = "<a style='color:red' href='javascript:void(0)' onclick='addnewgoods(this)' id='edit_sku_".$v['id']."'  data-id='".$v['id']."'>".$v['sku']."</a>  <i class='fa fa-edit' data-id='".$v['id']."' data-sku='".$v['sku']."' onclick='edit_sku(this)'></i>";
                 }else{

+ 2 - 0
template/erp/beihuogl_ccwlshlist.html

@@ -53,6 +53,7 @@
 <td>申请数量</td>
 <td>备货数量</td>
 <td>申请时间</td>
+<td>预计完工时间</td>
 <td>操作</td>
 </tr>
 </table>
@@ -88,6 +89,7 @@ $(".data tr").each(function() {
     $(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","8%");
   
   
 });}