Merge branch 'master' into feature/billCancel

src/pages/AfterSaleManage/PassAudit/index.jsx

@@ -93,7 +93,7 @@ export default () => {
       hideInSearch: true,
       width: 120,
       order: 4,
-      render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>,
+      render: (_, r) => <a onClick={() => viewProofs(r.proofs)}>查看凭证</a>,
     },
     {
       title: '售后申诉',

src/pages/AfterSaleManage/Pending/index.jsx

@@ -60,7 +60,7 @@ export default () => {
       dataIndex: 'proofs',
       hideInSearch: true,
       width: 100,
-      render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>,
+      render: (_, r) => <a onClick={() => viewProofs(r.proofs)}>查看凭证</a>,
     },
     {
       title: '售后申诉',

src/pages/orderManage/pendingDeliveryOrder/components/LogisticsForm.jsx

@@ -32,6 +32,7 @@ const LogisticsForm = props => {
           expressCompanyCode: data.selectedCompany.split('-')[0],
           expressCompanyName: data.selectedCompany.split('-')[1],
           deliveryNo: data.orderNum,
+          serialNumber: data.serialNumber || '',
         });
       });
     });
@@ -145,6 +146,17 @@ const LogisticsForm = props => {
                   ],
                 })(<Input placeholder="请填写物流单号" />)}
               </FormItem>
+              <FormItem>
+                {getFieldDecorator(`${i}-serialNumber`, {
+                  initialValue: v.serialNumber,
+                  rules: [
+                    {
+                      pattern: new RegExp(/^[0-9a-zA-Z-_]{6,32}$/, 'g'),
+                      message: '序列号格式不正确!',
+                    },
+                  ],
+                })(<Input placeholder="请填写序列号" />)}
+              </FormItem>
             </Card>
           ))}
         <div className={style.logistics}>

src/pages/orderManage/pendingDeliveryOrder/service.js

@@ -70,7 +70,8 @@ export async function uploadFile(file) {
 }
 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/%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_template.xlsx';
 }
 export async function downOrder(params) {
   const data = await request.post('/api/kdsp/op/mch-order/order-export', {