dever 3 years ago
parent
commit
3c5cb4be26
2 changed files with 6 additions and 7 deletions
  1. 1 2
      app/goods/lib/Sku.php
  2. 5 5
      app/shop/database/buy_order.php

+ 1 - 2
app/goods/lib/Sku.php

@@ -16,7 +16,7 @@ class Sku
         'price' => '销售价',
         'min' => '采购起订数',
         'unit' => '计量单位',
-        'weight' => '重量',
+        'weight' => '重量(kg)',
     );
 
     # 主要价格字段
@@ -145,7 +145,6 @@ class Sku
             } else {
                 $update['where_id'] = $info['id'];
                 $update['state'] = 1;
-                print_r($update);
                 $state = Dever::db($sku_table)->update($update);
             }
             

+ 5 - 5
app/shop/database/buy_order.php

@@ -74,7 +74,7 @@ $factory = function()
     return $array;
 };
 
-$type = 1;
+$stype = 1;
 $noprice = 2;
 
 $search_option_type = Dever::input('search_option_type', 1);
@@ -103,7 +103,7 @@ if ($search_option_type == 1) {
         array('导出订单', '仓库入库订单', ''),
         array('导出订单明细', '仓库入库订单明细', 'shop/excel.store_buy_order'),
     );
-    $source_name = '发货工厂';
+    $source_name = '供货商';
     $source_order = 4;
     $noprice = 1;
 }
@@ -272,7 +272,7 @@ return array
             'default'   => '',
             'desc'      => '供货商',
             'match'     => 'is_numeric',
-            'search'    => $search_option_source_type == 2 ? array
+            'searchs'    => $search_option_source_type == 2 ? array
             (
                 'api' => 'store/info-like',
                 'col' => 'name',
@@ -283,7 +283,7 @@ return array
                 'col' => 'name',
                 'result' => 'id',
             ),
-            'search'    => $search_option_type != 1 ? 'select' : false,
+            //'search'    => $search_option_type != 1 ? 'select' : false,
             'option'    => $search_option,
             'list'      => 'Dever::load("shop/lib/manage.buyInfo", "{source_type}", "{source_id}")',
             'list_order' => $source_order,
@@ -577,7 +577,7 @@ return array
             //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2'),
             //'delete' => array('删除', '', '{status} == 1'),
 
-            'list' => array('查看详情', '"buy_order_goods&project=shop&order_id={id}&page_type=1&type='.$type.'&noprice='.$noprice.'"'),
+            'list' => array('查看详情', '"buy_order_goods&project=shop&order_id={id}&page_type=1&type='.$stype.'&noprice='.$noprice.'"'),
 
             //'oper'  => array('审核', '"mshop/lib/manage.audit?order_id={id}"', '{status} == 2'),
             'fast' => array('审核', '"buy_order&where_id={id}&col=audit,audit_desc&oper_save_jump=buy_order&oper_table=buy_order&oper_parent=buy_order"', '{status} == 2'),