Browse Source

采购单列表,商品的规格解析优化

wufeng 2 năm trước cách đây
mục cha
commit
c0adeb7a08
2 tập tin đã thay đổi với 5 bổ sung5 xóa
  1. 2 2
      app/admin/controller/ActionProcess.php
  2. 3 3
      app/admin/controller/Purch.php

+ 2 - 2
app/admin/controller/ActionProcess.php

@@ -136,7 +136,7 @@ class ActionProcess extends Base
     public function update()
     {
 
-        $param = $this->request->filter('trim')->only(['token', 'id', 'process_id', 'action_type', 'operation_type', 'status_name', 'order_process', 'next_action_ids', 'remark' => '', 'status', 'is_del','is_master'=>APModel::$is_master_no], 'post');
+        $param = $this->request->filter('trim')->only(['token', 'id', 'process_id', 'action_type', 'operation_type', 'status_name', 'order_process', 'next_action_ids', 'remark' => '', 'status', 'is_del','is_master'], 'post');
 
         $val = Validate::rule([
             'token' => 'require',
@@ -149,7 +149,7 @@ class ActionProcess extends Base
             'next_action_ids|下一节点' => 'array|requireIf:action_type,' . APModel::$action_type_start . '|requireIf:action_type,' . APModel::$action_type_process,
             'is_del|是否删除' => 'eq:' . APModel::$is_deleted,
             'status|状态' => 'in:' . APModel::$status_disable . ',' . APModel::$status_normal,
-            'is_master|是否主节点' => 'require|number|in:' . APModel::$is_master_yes . ',' . APModel::$is_master_no
+            'is_master|是否主节点' => 'number|in:' . APModel::$is_master_yes . ',' . APModel::$is_master_no
         ]);
 
 

+ 3 - 3
app/admin/controller/Purch.php

@@ -244,13 +244,13 @@ class Purch extends Base
 //			$supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
 //            $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
 //            $value['supplier_cgder'] = $supplierCgder['person'] ??'';
-            $cat_id = 0;
+//            $cat_id = 0;
             if ($value['order_type'] == 3 || $value['order_type'] == 4) {
 //                $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
-                $value["speclist"] = $goon_3_4[$value['spuCode']]['specinfo'];//isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
+                $value["speclist"] = json_decode($goon_3_4[$value['spuCode']]['specinfo'],true);//isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
                 //为了格式统一,缺了一个spec_value
                 if ($value['speclist'] != '') {
-                    foreach (json_decode($value['speclist'],true) as &$v) {
+                    foreach ($value['speclist'] as &$v) {
                         $v['spec_value'] = $v['spec_value_name'];
                     }
                 }