Merge branch 'dev' into test

src/pages/logistics/addLogistics/components/columns.ts

@@ -22,3 +22,37 @@ export const SelectGoodsColumns: ColumnType<any>[] = [
     dataIndex: 'brand',
   }
 ]
+
+export const ExternalListColumns: ColumnType<any>[] = [
+  {
+    title: '流转顺序号',
+    key: 'number',
+    dataIndex: 'number',
+    render:(text:any, record:any, index:number) => {return index + 1;}
+  },
+  {
+    title: '操作角色',
+    key: 'roleName',
+    dataIndex: 'roleName',
+  },
+  {
+    title: '状态',
+    key: 'status',
+    dataIndex: 'status',
+  },
+  {
+    title: '操作',
+    key: 'operationalProcess',
+    dataIndex: 'operationalProcess',
+  },
+  {
+    title: '操作时间',
+    key: 'brand',
+    dataIndex: 'brand',
+  },
+  {
+    title: '审核意见',
+    key: 'brand',
+    dataIndex: 'brand',
+  }
+]

src/pages/logistics/addLogistics/index.tsx

@@ -8,7 +8,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { LinkOutlined, PlusOutlined } from '@ant-design/icons';
 import { PublicApi } from '@/services/api';
 import ModalTable from '@/components/ModalTable';
-import { SelectGoodsColumns } from './components/columns';
+import { SelectGoodsColumns, ExternalListColumns } from './components/columns';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import moment from 'moment';
 import ModalTableOrder from './components/ModalTableOrder';
@@ -201,12 +201,14 @@ const AddLogistics: React.FC<{}> = () => {
               receiverName: res.data.receiveUserName,
               receiverPhone: res.data.receiveUserTel,
               receiverFullAddress: res.data.receiveAddress,
+              shipperAddressId: res.data.deliveryAddressId,
+              shipperFullAddress: res.data.deliveryAddress,
               shipmentOrderCode: res.data.deliveryNo,
-              relevanceOrderCode: res.data.orderNo,
-              voucherTime: res.data.transactionTime,
-              externalState: res.data.state,
+              relevanceOrderCode: res.data.noticeNo,
               shipmentOrderId: res.data.deliveryId,
               relevanceOrderId: res.data.id,
+              voucherTime: res.data.createTime,
+              externalState: res.data.outerStatus,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -224,7 +226,7 @@ const AddLogistics: React.FC<{}> = () => {
               voucherTime: res.data.applyTime,
               relevanceOrderId: res.data.applyId,
               externalState: res.data.state,
-              digest: res.data.applyAbstract
+              digest: res.data.applyAbstract,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -294,7 +296,9 @@ const AddLogistics: React.FC<{}> = () => {
             externalState: res.data.status,
             shipperAddressId: res.data.shipperAddressId,
             shipperFullAddress: res.data.shipperFullAddress,
+            externalList: res.data.externalList
           }
+          form.setFieldsValue(obj)
           setQuery(obj)
           setId(query.id)
           setCreateType(res.data.createType)
@@ -328,11 +332,12 @@ const AddLogistics: React.FC<{}> = () => {
         case 1:
         case 2:
         case 3:
-          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).then((res:any) => {
+          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).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)
             }
@@ -375,7 +380,7 @@ const AddLogistics: React.FC<{}> = () => {
         productName: item.productName,
         categoryName: item.category,
         brandName: item.brand,
-        unitName: item.unitName,
+        unitName: item.unit,
         amount: item.amount,
         carton: item.carton,
         weight: item.weight,
@@ -532,7 +537,10 @@ const AddLogistics: React.FC<{}> = () => {
   /**打开选择商品 */
   const handleVisible = () => {
     console.log(query)
-    if(query.shipmentOrderId || query.relevanceOrderId) {
+    if (query.shipmentOrderCode || query.relevanceOrderCode) {
+      const list = [...detailList];
+      goodsRowCtl.setSelectRow(list)
+      goodsRowCtl.setSelectedRowKeys(list.map(v => v.productId));
       setvisible(true)
     } else {
       message.error('请先选择要操作的对应发货单号或对应订单号/售后单')
@@ -541,9 +549,11 @@ const AddLogistics: React.FC<{}> = () => {
 
   /** 提交数据 */
   const handleSubmit = async () => {
-    const basicRef = await form.validateFields().then(res => { return true }).catch(error => { return error });
-    const goodsRef = await goodsForm.validateFields().then(res => { return true }).catch(error => { return error });
     const data = [...badge]
+    const params = { ...query };
+    const basicRef = await form.validateFields().then(res => { console.log(res); params.digest = res.digest; return true }).catch(error => { return error });
+    const goodsRef = await goodsForm.validateFields().then(res => { return true }).catch(error => { return error });
+    params.createType = createType;
     if (basicRef.errorFields) {
       data[0] = basicRef.errorFields.length;
       setbadge(data);
@@ -559,10 +569,9 @@ const AddLogistics: React.FC<{}> = () => {
           setbadge(data)
           const { pathname } = history.location;
           const path = pathname.split('/')[pathname.split('/').length - 1];
-          const params = {...query};
           params.detailList = detailList
-          if(path === 'edit') {
-            PublicApi.postLogisticsOrderWaitSubmitUpdate({...params }).then(res => {
+          if (path === 'edit') {
+            PublicApi.postLogisticsOrderWaitSubmitUpdate({ ...params }).then(res => {
               if (res.code === 1000) {
                 history.goBack()
               }
@@ -588,7 +597,7 @@ const AddLogistics: React.FC<{}> = () => {
     if (Object.keys(memberInfo).length > 0) {
       PublicApi.getSettleAccountsPlatformConfigGetSettlementWay({ ...memberInfo }).then(res => {
         if (res.code === 1000) {
-          const data = {...query}
+          const data = { ...query }
           data.settlementWay = res.data;
           setQuery(data)
         }
@@ -674,7 +683,12 @@ const AddLogistics: React.FC<{}> = () => {
             </Form>
           </TabPane>
           {/** 流转记录 */}
-          <TabPane key='tab-4' tab='流转记录' forceRender></TabPane>
+          <TabPane key='tab-4' tab='流转记录' forceRender>
+            <Table
+              columns={ExternalListColumns}
+              dataSource={query.externalList}
+            />
+          </TabPane>
         </Tabs>
       </Card>
       {/* 选择对应发货单 - createType === 1的时候才显示 */}

src/pages/logistics/list/addCompany.tsx

@@ -94,7 +94,7 @@ const company: React.FC<parmas> = (props) => {
   useEffect(() => {
     let _title = pageStatus === PageStatus.PREVIEW ? '查看' : id ? '编辑' : '新建'
     setHeaderTitle(`${_title}物流公司`)
-    PublicApi.getMemberManageRoleList().then(res => {
+    PublicApi.getMemberManageRoleAll().then(res => {
       if (res.code === 1000) {
         let { data } = res || {}
         let list = data.map(v => ({

src/pages/payandSettle/paySetting/index.tsx

@@ -4,19 +4,20 @@
  * @LastEditors: HJX
  * @LastEditTime: 2020-11-19 15:25:54
  */
-import React, { useState, useEffect} from 'react';
+import React, { useState, useEffect } from 'react';
+import { history } from 'umi';
 import { Button, Card, Tabs, Space, Input } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { PublicApi } from '@/services/api';
 import PayWayRadio from './components/payWayRadio';
 import PayWayTable from './components/payWayTable';
-import { set } from 'mobx';
 const { TabPane } = Tabs
 
 const PayWaySetTemplate: React.FC<{}> = () => {
   const [config, setconfig] = useState<any>([]);
   const [payItem, setPayItem] = useState<any>([]);
   const [step, setStep] = useState<Array<number>>([]);
+  const [obj, setObj] = useState<any>({});
   const payWayConfigInfo = () => {
     // 支付配置信息
     return new Promise(resolve => {
@@ -107,9 +108,9 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     setPayItem(data);
   }
 
-  const onGet = (value:any, type:number, idx:number) => {
+  const onGet = (value: any, type: number, idx: number) => {
     const data = [...payItem];
-    if(type === 1) {
+    if (type === 1) {
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests, value]
     } else {
       data[idx].payParametersList.push(value)
@@ -118,10 +119,10 @@ const PayWaySetTemplate: React.FC<{}> = () => {
   }
 
   /**删除 */
-  const onDel = (value:any, index:number, idx:number) => {
+  const onDel = (value: any, index: number, idx: number) => {
     console.log(value, index, idx, 10086)
     const data = [...payItem];
-    if(Number(value) === 1) {
+    if (Number(value) === 1) {
       data[idx].payParametersAddListRequests.splice(index, 1);
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
     } else {
@@ -131,14 +132,14 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     setPayItem([...data]);
   }
   /**编辑 */
-  const onEdit = (value:any, type:number, index:number, idx: number) => {
+  const onEdit = (value: any, type: number, index: number, idx: number) => {
     console.log(value, type, index, idx)
     const data = [...payItem];
-    if(type === 1) {
-      data[idx].payParametersAddListRequests[index] = {...value};
+    if (type === 1) {
+      data[idx].payParametersAddListRequests[index] = { ...value };
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
     } else {
-      data[idx].payParametersList[index] = {...value};
+      data[idx].payParametersList[index] = { ...value };
       data[idx].payParametersList = [...data[idx].payParametersList]
     }
     console.log(data, 10086)
@@ -150,12 +151,22 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     PublicApi.postPayMemberQueryPlatformUpdate({
       platformPayWays: payItem
     }).then(res => {
-      if(res.code === 1000) {
-        location.reload();
+      if (res.code === 1000) {
+        history.push('/memberCenter/payandSettle/paySetting/payParamsSetting')
+        // location.reload();
       }
     })
   }
 
+  /** */
+  const handleBlur = (e, name, idx) => {
+    const data = [...payItem];
+    const assginObj = {...obj, ...{[name]: e.target.value}}
+    setObj(assginObj)
+    const arr: any[] = []
+    arr.push(assginObj)
+    data[idx].payParametersAddListRequests = [...arr]
+  }
   return (
     <PageHeaderWrapper
       extra={<Button type='primary' onClick={onHnadleSubmit}>保存</Button>}
@@ -189,16 +200,14 @@ const PayWaySetTemplate: React.FC<{}> = () => {
                     }
                     {
                       (payItem[idx].id === 6 && !!payItem[idx].isPitchOn) &&
-                      payItem[idx].payParametersAddListRequests.map((item: any, index: number) => (
-                        <div style={{ marginTop: 42 }} key={`space_${index}`}>
+                      <div style={{ marginTop: 42 }}>
                         <Space direction="horizontal" size={16}>
                           初始申请额度不超过
-                            <Input value={item.code} addonBefore="￥" />
-                            允许满<Input value={item.value} />
-                            天后申请上调<Input value={item.describe} addonAfter="%" />
+                            <Input onChange={(e) => handleBlur(e, 'code', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].code : undefined} addonBefore="￥" />
+                            允许满<Input onChange={(e) => handleBlur(e, 'value', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
+                            天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
                         </Space>
                       </div>
-                      ))
                     }
 
                   </>