1

app/Model/InquiryItemsModel.php

@@ -238,11 +238,10 @@ class InquiryItemsModel extends Model
                 }
             }
 
-
             #日志
             \App\Model\OpLogModel::log([
                 'types'=>1,
-                'relation_id'=>$b["inquiry_id"],
+                'relation_id'=>$inquiryItemsId, #明细id
                 'relation_sn'=>(new InquiryModel())->FindInquirySn($b["inquiry_id"]),
                 'content'=>'批量导入询价',
                 'create_uid'=>$b['user_id'],
@@ -313,6 +312,16 @@ class InquiryItemsModel extends Model
                 }
             }
 
+            #修改询价日志
+            \App\Model\OpLogModel::log([
+                'types'=>1,
+                'relation_id'=>$inquiry_items_id, #明细id
+                'relation_sn'=>(new InquiryModel())->FindInquirySn($b["inquiry_id"]),
+                'content'=>'修改询价,型号:'.$updateArr["goods_name"]." 品牌名称：".$updateArr["brand_name"]." 分类名称：".$updateArr["class_id2_name"]." 询价数量：".$updateArr["inquiry_number"],
+                'create_uid'=>$b['user_id'],
+                'create_name'=>$b["user_name"],
+            ]);
+
             $con->commit();
             return [0,"修改成功"];
         }catch (\Exception $e) {
@@ -446,13 +455,14 @@ class InquiryItemsModel extends Model
             $temp = [];
             $c = 0;
             foreach ($v as $a=>$b){
+                if ($a >=7) continue;
                 if (empty(trim($b))) $c ++;
                 $temp[$filer[$a]] = trim($b);
             }
             if ($c == count($v)) continue;
             array_push($goodsInfo,$temp);
         }
-         if (count($goodsInfo) == 1) return [1, '询价信息不全'];
+         if (count($goodsInfo) == 0) return [1, '询价信息不全'];
 
          #验证数据
          $CommonModel = new CommonModel();

app/Model/InquiryModel.php

@@ -387,6 +387,7 @@ class InquiryModel extends Model
             "status" => 1, #启用
             "remark" => $input["remark"],
             "delivery_place" => $input["delivery_place"],
+            "currency" => $input["delivery_place"],
             "user_types" => $input["user_types"], //询价客户类型： 1 个人 2 公司
             "create_time" => time(),
             "update_time" => time(),