调整报价列表

app/Model/QuoteModel.php

@@ -143,6 +143,7 @@ class QuoteModel extends Model
         $map['brand_name'] = isset($input['brand_name']) ? trim($input['brand_name']) : ''; // 品牌
         $map['quote_sn'] = isset($input['quote_sn']) ? trim($input['quote_sn']) : ''; // 报价单号
         $map['status'] = isset($input['status']) ? $input['status'] : ''; // 报价状态
+        $map['source'] = isset($input['source']) ? $input['source'] : ''; // 来源
         $map['start_time'] = !empty($input['start_time']) ? strtotime($input['start_time']) : '';
         $map['end_time'] = !empty($input['end_time']) ? strtotime($input['end_time']) + 86399 : '';
 
@@ -332,6 +333,7 @@ class QuoteModel extends Model
             $v['currency_val'] = array_get(Config('quote.currency'), $v['currency'], '人民币');
             $v['price'] = $v['currency'] == 1 ? $currency_sign . $v['price_rmb'] : $currency_sign . $v['price_origin'];
             $v['status_val'] = array_get(Config('quote.quote_status'), $v['status'], '');
+            $v['source_val'] = array_get(Config('quote.quote_source'), $v['source'], '');
 
             if ($type == 3) { // 报价草稿
                 if ($v['delivery_time'] > 6) {
@@ -394,6 +396,10 @@ class QuoteModel extends Model
                     $query->where('q.status', '=', $map['status']);
                 }
 
+                if (isset($map['source']) && $map['source']) {
+                    $query->where('q.source', '=', $map['source']);
+                }
+
                 // 创建时间
                 if(!empty($map['start_time']) && !empty($map['end_time'])) {
                     $query->whereBetween('q.create_time', [$map['start_time'], $map['end_time']]);
@@ -722,6 +728,8 @@ class QuoteModel extends Model
                 $quote_info['class_id2_name'] = $classInfo['class_id2_name'];
             }
 
+            $quote_info['goods_name']    = strtoupper($quote_info['goods_name']);
+            $quote_info['brand_name']    = strtoupper($quote_info['brand_name']);
             $quote_info['status']        = 1; // 已报价
             $quote_info['create_uid']    = $input['user_id'];
             $quote_info['create_name']   = $input['user_name'];

config/quote.php

@@ -5,21 +5,27 @@ return [
 		1 => '已报价',
 		2 => '已选中', 
 		3 => '已确认',
+		4 => '已成单',
+		5 => '已关闭',
+		9 => '已删除',
 	],
-
 	'quote_tax_rate' => '0.13', // 报价税率
 
 	'import_quote_map' => [ // 导入报价映射
+        'inquiry_item_id',
 		'goods_name',
 		'brand_name',
+        'inquiry_number',
+        'target_price',
+        'delivery_place',
+        'delivery_time',
 		'supplier_name',
-		'quote_number',
 		'currency',
 		'price_origin',
 		'price_rmb',
 		'price_other',
 		'batch',
-		'delivery_time',
+		'quote_delivery_time',
 	],
 
 	//币种 1：CNY 2：USD 3: 港币 4:欧元 5:英磅
@@ -28,10 +34,10 @@ return [
 		2 => '美元', 
 		3 => '港币',
 		4 => '欧元',
-		5 => '英镑',
+		5 => '英磅',
 	],
 
-	'currency_sign' => [
+	'currency_sign' => [ // 货币符号
 		1 => '￥',
 		2 => '$', 
 		3 => 'HK$',
@@ -39,4 +45,13 @@ return [
 		5 => '￡', 
 	],
 
+    'show_supplier_list' => [
+        strtolower("digikey")
+    ],
+
+    'quote_source' => [ // 报价来源
+    	1 => '猎芯内部',
+    	3 => '云芯商家',
+    ],
+
 ];