返回字段

app/Model/QuoteModel.php

@@ -169,9 +169,12 @@ class QuoteModel extends Model
             'q.delivery_time',
             'q.delivery_time',
             'q.batch',
             'q.batch',
             'q.create_time',
             'q.create_time',
+            "q.tax_rate",
+            "q.mpq",
+            "q.moq",
             'it.goods_name',
             'it.goods_name',
             'it.brand_name',
             'it.brand_name',
-            'it.inquiry_number'
+            'it.inquiry_number',
         ];
         ];
         if ($map) {
         if ($map) {
             $list = $this->commonQuery($map, $input);
             $list = $this->commonQuery($map, $input);
@@ -714,7 +717,6 @@ class QuoteModel extends Model
             $quote_info['create_name'] = $input['user_name'];
             $quote_info['create_name'] = $input['user_name'];
             $quote_info['delivery_time'] = $quote_info['delivery_time_unit'] == '天' ? $quote_info['delivery_time'] : $quote_info['delivery_time'] * 7;
             $quote_info['delivery_time'] = $quote_info['delivery_time_unit'] == '天' ? $quote_info['delivery_time'] : $quote_info['delivery_time'] * 7;
             unset($quote_info['delivery_time_unit']);
             unset($quote_info['delivery_time_unit']);
-
             $res = $this->create($quote_info);
             $res = $this->create($quote_info);
             if ($res === false) {
             if ($res === false) {
                 return [2, '新增报价失败'];
                 return [2, '新增报价失败'];
@@ -1169,12 +1171,12 @@ class QuoteModel extends Model
                         '￥') . $quote_info['price_origin'];
                         '￥') . $quote_info['price_origin'];
             }
             }
 
 
-            $content = '修改报价，报价单号：' . $input['quote_sn'] . '，型号：' . $quote_info['goods_name'] . '，' . $price_log . '，批次：' . $quote_info['batch'] . '，货期：' . $delivery_time;
+            $content = '修改报价，报价单号：' . $info['quote_sn'] . '，型号：' . $quote_info['goods_name'] . '，' . $price_log . '，批次：' . $quote_info['batch'] . '，货期：' . $delivery_time;
 
 
             $data = [];
             $data = [];
             $data['types'] = 2;
             $data['types'] = 2;
             $data['relation_id'] = $input['quote_id'];
             $data['relation_id'] = $input['quote_id'];
-            $data['relation_sn'] = $input['quote_sn'];
+            $data['relation_sn'] = $info['quote_sn'];
             $data['content'] = $content;
             $data['content'] = $content;
             $data['create_uid'] = $input['user_id'];
             $data['create_uid'] = $input['user_id'];
             $data['create_name'] = $input['user_name'];
             $data['create_name'] = $input['user_name'];
@@ -1183,7 +1185,7 @@ class QuoteModel extends Model
 
 
             // 推送消息
             // 推送消息
             $InquiryModel = new InquiryModel;
             $InquiryModel = new InquiryModel;
-            $inquiry_uid = $InquiryModel->where('id', $input['inquiry_id'])->value('create_uid'); // 询价人
+            $inquiry_uid = $InquiryModel->where('id', $info['inquiry_id'])->value('create_uid'); // 询价人
 
 
             $contents = $input['user_name'] . $content;
             $contents = $input['user_name'] . $content;
             $CommonModel->send_msg($inquiry_uid, $contents);
             $CommonModel->send_msg($inquiry_uid, $contents);