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

src/constants/index.ts

@@ -1686,7 +1686,7 @@ export const EXCHANGE_OUTER_STATUS = {
 
 // 售后退货内部状态
 /**
- * 待提交换货
+ * 待提交退货
  */
 export const RETURN_INNER_STATUS_UNCOMMITTED = 1;
 /**

src/pages/afterService/components/ExchangeAddressInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-06 09:54:04
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-21 14:36:00
+ * @LastEditTime: 2021-01-29 14:09:18
  * @Description: 换货收货地址
  */
 import React from 'react';
@@ -173,6 +173,17 @@ const ExchangeAddressInfo: React.FC<ExchangeAddressInfo> = ({
               default: 
                 break
             };
+
+            if (onSubmit) {
+              onSubmit({
+                deliveryType: value,
+                id: undefined, 
+                isDefault: undefined, 
+                sendAddress: undefined, 
+                sendUserName: undefined, 
+                sendUserTel: undefined, 
+              });
+            }
           });
 
           onFieldInputChange$('deliveryType').subscribe(fieldState => {

src/pages/afterService/components/ReturnAnalysis/index.tsx

@@ -71,6 +71,11 @@ interface ReturnInfoProps {
    * 历史记录目标路径
    */
   target: string;
+  
+  /**
+   * 是否可编辑
+   */
+  isEdit?: boolean;
 };
 
 const ReturnInfo: React.FC<ReturnInfoProps> = ({
@@ -82,6 +87,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
   onConfirmReturnReceive, 
   innerStatus, 
   target,
+  isEdit = false, 
 }) => {
   const [currentBatch, setCurrentBatch] = useState(1);
 
@@ -338,6 +344,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
                       </Descriptions.Item>
                       <Descriptions.Item>
                         {(
+                          isEdit && 
                           isPurchaser && 
                           item.innerStatus === MAIL_INNER_STATUS_UNCONFIRMED_DELIVER && 
                           innerStatus === RETURN_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY
@@ -353,6 +360,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
                           </a>
                         )}
                         {(
+                          isEdit && 
                           !isPurchaser && 
                           item.innerStatus === MAIL_INNER_STATUS_CONFIRMED_DELIVER && 
                           innerStatus === RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE
@@ -368,6 +376,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
                           </a>
                         )}
                         {(
+                          isEdit && 
                           isPurchaser && 
                           item.innerStatus === MAIL_INNER_STATUS_CONFIRMED_RECEIVING && 
                           innerStatus === RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT

src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx

@@ -2,17 +2,13 @@ import React, { Suspense, useEffect, useState } from 'react';
 import { 
   PageHeader, 
   Descriptions, 
-  Card, 
   Spin, 
-  Button, 
   Row, 
   Col,
   Badge, 
-  Switch, 
   Tooltip, 
-  message, 
 } from 'antd';
-import { FormOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import { PublicApi } from '@/services/api';
@@ -20,12 +16,14 @@ import {
   GetAsReplaceGoodsGetDetailByConsumerResponse, 
   GetAsReplaceGoodsPageReturnedGoodsResponse,  
 } from '@/services/AfterServiceApi';
-import { EXCHANGE_OUTER_STATUS_FINISHED } from '@/constants';
+import { 
+  EXCHANGE_OUTER_STATUS_FINISHED, 
+  EXCHANGE_INNER_STATUS_UNCOMMITTED,
+} from '@/constants';
 import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import StatusTag from '@/components/StatusTag';
 import EyePreview from '@/components/EyePreview';
-import AuditProcess from '@/components/AuditProcess';
 import { EditableColumns } from '@/components/PolymericTable/interface';
 import { OuterHistoryData, InnerHistoryData } from '../../../components/FlowRecords';
 import { 
@@ -367,6 +365,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     isPurchaser={true}
                     innerStatus={detailInfo?.innerStatus}
                     target={target}
+                    isEdit={isEdit}
                   />
                 </Suspense>
               </Col>
@@ -387,6 +386,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     isPurchaser={true}
                     innerStatus={detailInfo?.innerStatus}
                     target={target}
+                    isEdit={isEdit}
                   />
                 </Suspense>
               </Col>
@@ -421,7 +421,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       fullAddress: detailInfo?.returnGoodsAddress?.sendAddress, 
                     }}
                     onSubmit={() => {}}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === EXCHANGE_INNER_STATUS_UNCOMMITTED} 
                   />
                 </Suspense>
               </Col>
@@ -442,7 +442,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       phone: detailInfo?.replaceGoodsAddress?.sendUserTel, 
                       fullAddress: detailInfo?.replaceGoodsAddress?.sendAddress, 
                     }}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === EXCHANGE_INNER_STATUS_UNCOMMITTED} 
                     onSubmit={() => {}}
                   />
                 </Suspense>

src/pages/afterService/exchangeApplication/exchangePrConfirmBack/verify.tsx

@@ -141,6 +141,7 @@ const ExchangePrConfirmBackVerify: React.FC = () => {
           </Space>
         )}
         target="/memberCenter/afterService/exchangeApplication/exchangePrConfirmBack"
+        isEdit
       />
     </>
   );

src/pages/afterService/exchangeApplication/exchangePrDeliver/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-01-06 11:36:34
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-01-29 15:47:54
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { Button } from 'antd';
 import { history } from 'umi';
@@ -52,6 +59,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
           </>
         )}
         target="/memberCenter/afterService/exchangeApplication/exchangePrDeliver"
+        isEdit
       />
     
       <ManualDeliveryModal 

src/pages/afterService/exchangeApplication/exchangePrFinished/verify.tsx

@@ -50,6 +50,7 @@ const ExchangePrFinishedDetailVerify: React.FC = () => {
           </Button>
         )}
         target="/memberCenter/afterService/exchangeApplication/exchangePrFinished"
+        isEdit
       />
     
       <FinishedModal 

src/pages/afterService/exchangeApplication/exchangePrReceived/verify.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-01-06 11:36:34
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-01-29 15:48:28
+ * @Description: 
+ */
 import React, { useState } from 'react';
 import { Button } from 'antd';
 import { history } from 'umi';
@@ -75,6 +82,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
           )
         }}
         target="/memberCenter/afterService/exchangeApplication/exchangePrReceived"
+        isEdit
       />
     </>
   );

src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx

@@ -20,7 +20,10 @@ import {
   GetAsReplaceGoodsGetDetailBySupplierResponse, 
   GetAsReplaceGoodsPageReturnedGoodsResponse, 
 } from '@/services/AfterServiceApi';
-import { EXCHANGE_OUTER_STATUS_FINISHED } from '@/constants';
+import {
+  EXCHANGE_OUTER_STATUS_FINISHED,
+  EXCHANGE_INNER_STATUS_UNCOMMITTED,
+} from '@/constants';
 import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import StatusTag from '@/components/StatusTag';
@@ -474,7 +477,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       phone: detailInfo?.returnGoodsAddress?.sendUserTel, 
                       fullAddress: detailInfo?.returnGoodsAddress?.sendAddress, 
                     }}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === EXCHANGE_INNER_STATUS_UNCOMMITTED} 
                     onSubmit={handleReturnAddressSubmit}
                   />
                 </Suspense>
@@ -496,7 +499,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       phone: detailInfo?.replaceGoodsAddress?.sendUserTel, 
                       fullAddress: detailInfo?.replaceGoodsAddress?.sendAddress, 
                     }}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === EXCHANGE_INNER_STATUS_UNCOMMITTED} 
                     onSubmit={handleExchangeAddressSubmit}
                   />
                 </Suspense>

src/pages/afterService/exchangeManage/exchangePr1/verify.tsx

@@ -50,6 +50,7 @@ const ExchangePr1Verify: React.FC = () => {
             单据审核
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/exchangeManage/exchangePr2/verify.tsx

@@ -50,6 +50,7 @@ const ExchangePr2Verify: React.FC = () => {
             单据审核
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/exchangeManage/exchangePrConfirm/verify.tsx

@@ -69,6 +69,7 @@ const ExchangePrConfirmVerify: React.FC = () => {
             确认单据
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/exchangeManage/exchangePrConfirmBack/verify.tsx

@@ -94,6 +94,7 @@ const ExchangePrConfirmBackVerify: React.FC = () => {
           </Space>
         )}
         target="/memberCenter/afterService/exchangeManage/exchangePrConfirmBack"
+        isEdit
       />
     </>
   );

src/pages/afterService/exchangeManage/exchangePrDeliver/verify.tsx

@@ -52,6 +52,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
           </>
         )}
         target="/memberCenter/afterService/exchangeManage/exchangePrDeliver"
+        isEdit
       />
     
       <ManualDeliveryModal 

src/pages/afterService/exchangeManage/exchangePrReceived/verify.tsx

@@ -74,6 +74,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
           )
         }}
         target="/memberCenter/afterService/exchangeManage/exchangePrReceived"
+        isEdit
       />
     </>
   );

src/pages/afterService/exchangeManage/exchangePrSubmit/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-04 17:22:07
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-21 13:41:41
+ * @LastEditTime: 2021-01-29 15:50:05
  * @Description: 
  */
 import React, { useState } from 'react';

src/pages/afterService/returnApplication/components/DetailInfo/index.tsx

@@ -24,6 +24,7 @@ import {
   RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED, 
   RETURN_OUTER_STATUS_NOT_RECEIVED, 
   RETURN_OUTER_STATUS_UNCONFIRMED_FINISHED, 
+  RETURN_INNER_STATUS_UNCOMMITTED,
 } from '@/constants';
 import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
@@ -412,6 +413,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     isPurchaser={true}
                     innerStatus={detailInfo?.innerStatus}
                     target={target}
+                    isEdit={isEdit}
                   />
                 </Suspense>
               </Col>
@@ -472,7 +474,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       fullAddress: detailInfo?.returnGoodsAddress?.sendAddress, 
                     }}
                     onSubmit={() => {}}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === RETURN_INNER_STATUS_UNCOMMITTED} 
                   />
                 </Suspense>
               </Col>

src/pages/afterService/returnApplication/returnPrConfirmBack/verify.tsx

@@ -141,6 +141,7 @@ const ReturnPrConfirmBackVerify: React.FC = () => {
           </Space>
         )}
         target="/memberCenter/afterService/returnApplication/returnPrConfirmBack"
+        isEdit
       />
     </>
   );

src/pages/afterService/returnApplication/returnPrConfirmFinish/verify.tsx

@@ -43,6 +43,7 @@ const ReturnPrConfirmFinishVerify: React.FC = () => {
           </Button>
         )}
         target="/memberCenter/afterService/returnApplication/returnPrConfirmFinish"
+        isEdit
       />
 
       <FinishedModal 

src/pages/afterService/returnApplication/returnPrConfirmResult/verify.tsx

@@ -41,6 +41,7 @@ const ReturnPrConfirmResultVerify: React.FC = () => {
           </Button>
         )}
         target="/memberCenter/afterService/returnApplication/returnPrConfirmResult"
+        isEdit
       />
     </>
   );

src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx

@@ -52,6 +52,7 @@ const ReturnPrDeliverVerify: React.FC = () => {
           </>
         )}
         target="/memberCenter/afterService/returnApplication/returnPrDeliver"
+        isEdit
       />
     
       <ManualDeliveryModal 

src/pages/afterService/returnManage/components/DetailInfo/index.tsx

@@ -26,6 +26,7 @@ import {
   RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED, 
   RETURN_OUTER_STATUS_NOT_RECEIVED, 
   RETURN_OUTER_STATUS_UNCONFIRMED_FINISHED, 
+  RETURN_INNER_STATUS_UNCOMMITTED,
 } from '@/constants';
 import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
@@ -451,6 +452,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                     onConfirmReturnReceive={handleReceivedConfirmReturnReceive}
                     innerStatus={detailInfo?.innerStatus}
                     target={target}
+                    isEdit={isEdit}
                   />
                 </Suspense>
               </Col>
@@ -510,7 +512,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
                       fullAddress: detailInfo?.returnGoodsAddress?.sendAddress, 
                     }}
                     onSubmit={handleReturnAddressSubmit}
-                    isEdit={isEdit} 
+                    isEdit={isEdit && detailInfo?.innerStatus === RETURN_INNER_STATUS_UNCOMMITTED} 
                   />
                 </Suspense>
               </Col>

src/pages/afterService/returnManage/returnPr1/verify.tsx

@@ -50,6 +50,7 @@ const ReturnPr1Verify: React.FC = () => {
             单据审核
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/returnManage/returnPr2/verify.tsx

@@ -50,6 +50,7 @@ const ReturnPr2Verify: React.FC = () => {
             单据审核
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/returnManage/returnPrConfirm/verify.tsx

@@ -67,6 +67,7 @@ const ReturnPrConfirmVerify: React.FC = () => {
             确认单据
           </Button>
         )}
+        isEdit
       />
     
       <VerifyModal 

src/pages/afterService/returnManage/returnPrReceived/verify.tsx

@@ -75,6 +75,7 @@ const ReturnPrReceivedVerify: React.FC = () => {
           )
         }}
         target="/memberCenter/afterService/returnManage/returnPrReceived"
+        isEdit
       />
   
     </>

src/pages/afterService/returnManage/returnPrReturn/verify.tsx

@@ -49,6 +49,7 @@ const ReturnPrReturnVerify: React.FC = () => {
             确认本单已完成所有退款
           </Button>
         )}
+        isEdit
       />
     </>
   );

src/pages/afterService/returnManage/returnPrSubmit/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-04 17:22:07
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-14 18:07:20
+ * @LastEditTime: 2021-01-29 15:55:33
  * @Description: 
  */
 import React, { useState } from 'react';