Merge branch 'dev' into test

src/pages/rfq/details/index.tsx

@@ -234,12 +234,13 @@ const Details: React.FC<{}> = (props) => {
           progressDot
           current={Number(data.externalState - 1)}
         >
-          {detailData.externalStateStep.items.map((item, index) => {
+          {Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => {
             return (
               <Step
                 key={index}
-                title={item.title}
-                description={item.desc}
+                title={item.roleName}
+                description={item.operationalProcess}
+                status={item.isExecute ? 'finish' : 'wait'}
               />
             );
           })}

src/pages/rfqOffer/details/index.tsx

@@ -224,12 +224,13 @@ const Details: React.FC<{}> = (props) => {
           progressDot
           current={Number(data.externalState - 1)}
         >
-          {detailData.externalStateStep.items.map((item, index) => {
+          {Object.keys(data).length > 0 && data.externalRequisitionFormResponses.map((item, index) => {
             return (
               <Step
                 key={index}
-                title={item.title}
-                description={item.desc}
+                title={item.roleName}
+                description={item.operationalProcess}
+                status={item.isExecute ? 'finish' : 'wait'}
               />
             );
           })}

src/pages/ruleSettingManage/paySetting/components/payWayTable.tsx

@@ -6,7 +6,7 @@ import SetUpModal from './setUpModal';
 
 interface payWayTableParams {
   name?: string,
-  way?: string,
+  payWayId?: number,
   payParametersList?: any,
   payParametersListResponses?: any,
   visible?: boolean,
@@ -23,7 +23,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
   const [edit, setedit] = useState<any>({});
   const [modifyIndex, setModifyIndex] = useState<any>(0)
   const [modify, setmodify] = useState<boolean>(false);
-  const { name, payParametersListResponses, payParametersList, visible, onType, onGet, onDel, onEdit, id, way } = props;
+  const { name, payParametersListResponses, payParametersList, visible, onType, onGet, onDel, onEdit, id, payWayId } = props;
   const columns: ColumnType<any>[] = [
     {
       title: '参数代码',
@@ -88,7 +88,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
           <Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => { setmodalvisible(true); setType(id); setmodify(false) }} type='dashed'>新增参数配置</Button>
 
           {
-            way !== '微信' &&
+            payWayId !== 2 &&
             <>
               <div style={{ borderLeft: '2px solid #00B37A', margin: '41px 0 8px', padding: '1px 5px' }}>{name}转账到银行卡参数配置</div>
               <Table

src/pages/ruleSettingManage/paySetting/settingIndex.tsx

@@ -38,6 +38,7 @@ const PayWaySetTemplate: React.FC<{}> = () => {
         arr.push({
           id: item.id,
           way: item.way,
+          payWayId: item.payWayId,
           isPitchOn: item.isPitchOn ? item.isPitchOn : 0,
           payType: item.payType,
           payParametersList: item.payParametersList ? item.payParametersList : [],
@@ -183,10 +184,10 @@ const PayWaySetTemplate: React.FC<{}> = () => {
                       selectId={payItem[idx].id}
                       onChange={(value) => onChangeRaido(value, idx)}
                     />
-                    {(payItem[idx].way === '微信' || payItem[idx].way === '支付宝') &&
+                    {(payItem[idx].payWayId === 1 || payItem[idx].payWayId === 2) &&
                       <PayWayTable
                         id={payItem[idx].id}
-                        way={payItem[idx].way}
+                        payWayId={payItem[idx].payWayId}
                         onType={payItem[idx].payType}
                         name={payItem[idx].way}
                         payParametersList={payItem[idx].payParametersList}

src/pages/systemManage/unit/template.tsx

@@ -22,7 +22,9 @@ const Template: React.FC<{}> = () => {
     if (type === 'add') {
       PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
         if (res.code === 1000) {
-          history.goBack();
+          setTimeout(() => {
+            history.goBack();
+          }, 1000)
           message.success('新增单位成功')
         }
       })
@@ -31,7 +33,9 @@ const Template: React.FC<{}> = () => {
       values.id = query.id;
       PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
         if (res.code === 1000) {
-          history.goBack();
+          setTimeout(() => {
+            history.goBack();
+          }, 1000)
           message.success('修改单位成功')
         }
       })