Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/logistics/addLogistics/index.tsx

@@ -376,6 +376,25 @@ const AddLogistics: React.FC<{}> = () => {
       return new Promise(resolve => {
         switch (Number(createType)) {
           case 1:
+            if (query.shipmentOrderId) {
+              PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId }).then((res: any) => {
+                if (res.code === 1000) {
+                  res.data.data.forEach(item => {
+                    item.category = item.categoryName
+                    item.brand = item.brandName
+                    item.unit = item.unitName
+                  })
+                  resolve(res.data)
+                }
+              })
+            } else {
+              PublicApi.getOrderProcurementOrderProductList({ ...params, id: query.relevanceOrderId, orderNo: query.relevanceOrderCode }).then((res: any) => {
+                if (res.code === 1000) {
+                  resolve(res)
+                }
+              })
+            }
+            break;
           case 2:
             PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId ? query.shipmentOrderId : query.relevanceOrderId }).then((res: any) => {
               if (res.code === 1000) {
@@ -771,7 +790,7 @@ const AddLogistics: React.FC<{}> = () => {
                 <div>{query.receiverFullAddress}</div>
               </Form.Item>
               <Form.Item label="发货地址" name="shipperAddressId" rules={[{ required: true, message: '请选择发货地址' }]}>
-                <Select allowClear onChange={(value, option) => handleSelectAddress(option )}>
+                <Select allowClear onChange={(value, option) => handleSelectAddress(option)}>
                   {
                     listShipperAddress.map((item: any, idx: number) => (
                       <Option key={item.id} value={item.id} shipperName={item.shipperName} shipperPhone={item.phone}>{item.fullAddress}</Option>