Merge branch 'master' of git.quantgroup.cn:ui/merchant-manage-ui into feature/new-goods-up

src/pages/orderManage/pendingDeliveryOrder/components/MultiLogisticsModal/index.jsx

@@ -118,6 +118,9 @@ const FormComponent = (props, ref) => {
     );
   };
 
+  // 选择物流可搜索
+  const filterOption = (inputValue, option) => option.expressCompanyName.includes(inputValue);
+
   return (
     <Form
       form={form}
@@ -148,6 +151,8 @@ const FormComponent = (props, ref) => {
                 >
                   <Select
                     placeholder="请选择物流公司"
+                    showSearch
+                    filterOption={filterOption}
                     fieldNames={{ label: 'expressCompanyName', value: 'expressCompanyCode' }}
                     options={companys}
                   ></Select>

src/pages/orderManage/pendingDeliveryOrder/service.js

@@ -72,7 +72,7 @@ export function downTemplate() {
   window.location.href =
     // 'https://kdspstatic.q-gp.com/%E8%AE%A2%E5%8D%95%E7%89%A9%E6%B5%81%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF-v1.xlsx';
     // 'https://kdspstatic.q-gp.com/order_import_templatev2.xlsx';
-    'https://sc-img.q-gp.com/orders/templates/batch_deliveries.xlsx';
+    'https://sc-img.q-gp.com/orders/templates/batch_deliveriesV2.xlsx';
 }
 export async function downOrder(params) {
   const data = await request.post('/api/kdsp/op/mch-order/order-export', {