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

src/pages/member/components/MemberDocCategory/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-21 16:10:47
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-07 16:49:23
+ * @LastEditTime: 2021-07-08 10:05:03
  * @Description: 会员分类信息
  */
 import React, { useState } from 'react';
@@ -83,7 +83,8 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
   } = props;
   
   const [visibleDrawer, setVisibleDrawer] = useState(false);
-  const [classifyInfo, setClassifyInfo] = useState<FormValueType & { partnerTypes: PartnerTypesItem[] }>();
+  const [classifyInfo, setClassifyInfo] = useState<FormValueType>();
+  const [partnerTypes, setPartnerTypes] = useState<PartnerTypesItem[]>([]);
   const [infoLoading, setInfoLoading] = useState(false);
   const [submitLoading, setSubmitLoading] = useState(false);
 
@@ -111,8 +112,11 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
             taxPoint: +taxPoint,
             ...rest
           })),
-          partnerTypes: res.data.partnerTypes,
         });
+        setPartnerTypes(res.data.partnerTypes.map((item) => ({
+          value: item.id,
+          label: item.text,
+        })));
         handleVisibleDrawer(true);
       }
     }).finally(() => {
@@ -212,7 +216,7 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
         onClose={() => handleVisibleDrawer(false)}
         onSubmit={handleSubmit}
         submitLoading={submitLoading}
-        partnerTypes={classifyInfo?.partnerTypes}
+        partnerTypes={partnerTypes}
         value={classifyInfo}
       />
     </>

src/pages/member/components/ModifyClassifyDrawer/index.less

@@ -2,4 +2,5 @@
 
 .description {
   color: @text-color-secondary;
+  margin-bottom: @margin-md;
 }
\ No newline at end of file

src/pages/member/components/ModifyClassifyDrawer/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-07-07 15:21:00
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-07 18:12:33
+ * @LastEditTime: 2021-07-08 09:59:57
  * @Description: 修改入库分类信息 抽屉
  */
 import React, { useEffect } from 'react';
@@ -173,6 +173,9 @@ interface IProps {
    * 合作关系
    */
   partnerTypes: PartnerTypesItem[],
+  /**
+   * 值
+   */
   value: FormValueType,
   /**
    * 确认按钮 loading
@@ -193,6 +196,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
     onSubmit,
     onClose,
     partnerTypes,
+    value,
     submitLoading,
   } = props;
 
@@ -310,6 +314,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
     >
       <NiceForm
         previewPlaceholder="' '"
+        initialValues={value}
         components={{
           ArrayCards,
           CascaderFormItem,

src/pages/member/constant.tsx

@@ -136,7 +136,7 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
     dataIndex: 'outerStatusName',
     align: 'center', 
     render: (text, record) => (
-      <StatusTag type={MEMBER_INNER_STATUS_BADGE_COLOR[record.outerStatus]} title={text} />
+      <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
     ),
   },
   {

src/pages/member/memberMaintain/index.tsx

@@ -95,9 +95,6 @@ const MemberMaintain: React.FC<[]> = () => {
       filters: [],
       align: 'center',
       onFilter: (value, record) => record.status === value,
-      render: (text, record) => (
-        <StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} />
-      ),
     },
     {
       title: '外部状态',

src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.less

@@ -2,4 +2,5 @@
 
 .description {
   color: @text-color-secondary;
+  margin-bottom: @margin-md;
 }
\ No newline at end of file

src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.tsx

@@ -28,7 +28,7 @@ type CategoriesType = {
   /**
    * 品类名称
    */
-  name: string,
+  names: string[],
   /**
    * 付款周期（天）
    */
@@ -224,7 +224,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
     if (onSubmit) {
       const { maxAmount, categories, ...rest } = values;
       const formated = categories.map((item) => ({
-        name: item.category.join('-'),
+        names: item.category,
         paymentDay: +item.paymentDay,
         invoiceTypeName: item.invoiceTypeName,
         taxPoint: +item.taxPoint,

src/pages/member/memberPrComingClassify/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-25 14:36:14
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-18 17:15:48
+ * @LastEditTime: 2021-07-08 11:46:29
  * @Description: 入库分类
  */
 import React, { useState, useEffect } from 'react';

src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-24 17:47:32
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-06 17:43:13
+ * @LastEditTime: 2021-07-08 11:03:50
  * @Description: 审核Form抽屉
  */
 import React, { useEffect } from 'react';
@@ -187,10 +187,9 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
     }
     const {
       channelLevel,
-      channelTypeId,
     } = channelValue;
 
-    if (channelTypeId && !channelLevel) {
+    if (channelLevel !== undefined && !channelLevel) {
       formActions.setFieldState('INVESTIGATE_INFO', state => {
         FormPath.setIn(state, 'visible', false);
       });

src/pages/member/memberPrVerifyComingData/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-24 17:01:57
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-05 16:43:55
+ * @LastEditTime: 2021-07-08 18:02:59
  * @Description: 审核入库资料
  */
 import React, { useState, useEffect, useRef } from 'react';
@@ -21,6 +21,7 @@ import { history } from 'umi';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
 import { GetMemberDepositVerifyDetailResponse } from '@/services/MemberV2Api';
+import { normalizeFiledata } from '@/utils';
 import AnchorPage from '@/layouts/AnchorPage';
 import AvatarWrap from '@/components/AvatarWrap';
 import AuditProcess from '@/components/AuditProcess';
@@ -61,6 +62,11 @@ const MemberPrVerifyComingDataVerify: React.FC<{}> = () => {
     }).then(res => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
+        setQualifications(res.data.qualities.map((item) => ({
+          file: item.url ? [normalizeFiledata(item.url)] : [],
+          expireDay: item.expireDay,
+          permanent: item.permanent === 1 ? [item.permanent] : [],
+        })));
       }
     }).finally(() => {
       setInfoLoaading(false);
@@ -89,6 +95,7 @@ const MemberPrVerifyComingDataVerify: React.FC<{}> = () => {
       validateId,
       ...value,
       depositDetails: comingData,
+      // 要手动将旧数据带过去
       qualities: (
         qualifications
           .filter((item) => item.file && item.file[0] && item.file[0].status === 'done')

src/pages/procurement/_public/bid/effects/useBidDetail.tsx

@@ -115,16 +115,18 @@ export const useBidDetail = (options: OrderDetailHookProps) => {
 
       // 流转记录（内/外）
       // 招投标
-      const inCheckRecordFn = !type.indexOf('c')
-      ?
-      PublicApi.getPurchaseInviteTenderInCheckRecordGetInviteTenderInCheckRecord
-      :
-      PublicApi.getPurchaseSubmitTenderInCheckRecordGetSubmitTenderInCheckRecord
-
-      const inReocrdRes = await inCheckRecordFn({ inviteTenderId: searchId })
-      if (inReocrdRes.code === 1000) {
-        setInteriorProcurementOrderLogResponses(inReocrdRes.data)
-      }
+      // const inCheckRecordFn = !type.indexOf('c')
+      // ?
+      // PublicApi.getPurchaseInviteTenderInCheckRecordGetInviteTenderInCheckRecord
+      // :
+      // PublicApi.getPurchaseSubmitTenderInCheckRecordGetSubmitTenderInCheckRecord
+
+      // const inReocrdRes = await inCheckRecordFn({ inviteTenderId: searchId })
+      // if (inReocrdRes.code === 1000) {
+      //   setInteriorProcurementOrderLogResponses(inReocrdRes.data)
+      // }
+      // * 内部专用
+      let inCheckRecordFn: any;
 
       // * 外部专用 特殊处理
       let specialParams: any = {};
@@ -132,16 +134,25 @@ export const useBidDetail = (options: OrderDetailHookProps) => {
       if(type === 'callForBid' || type === 'tenderInCallForBid') {
         specialParams['inviteTenderId'] = type === 'callForBid' ? id : data.inviteTender.id
         outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetInviteTenderOutCheckRecord
+
+        inCheckRecordFn = PublicApi.getPurchaseInviteTenderInCheckRecordGetInviteTenderInCheckRecord
       } else if(type === 'tender' || type === 'callForBidInTender') {
-        specialParams['submitTenderId'] = data.submitTender.id
+        specialParams['submitTenderId'] = data.id
         outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetSubmitTenderOutCheckRecord
+
+        inCheckRecordFn = PublicApi.getPurchaseSubmitTenderInCheckRecordGetSubmitTenderInCheckRecord
       }
-      // const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetTenderOutCheckRecord
-      const outRecordRes = await outCheckRecordFn({ inviteTenderId: searchId })
+
+      const outRecordRes = await outCheckRecordFn(specialParams)
       if (outRecordRes.code === 1000) {
         setExternalProcurementOrderLogResponses(outRecordRes.data)
       }
 
+      const inReocrdRes = await inCheckRecordFn(specialParams)
+      if (inReocrdRes.code === 1000) {
+        setInteriorProcurementOrderLogResponses(inReocrdRes.data)
+      }
+
       // 流程状态（内/外）
       // 招投标 投标里面的投标流程单独调接口
       const processRes = type === 'tender' ?

src/pages/procurement/_public/bid/effects/useConfirmDetail.ts

@@ -54,7 +54,7 @@ export const useConfirmDetail = (options: {}) => {
         setInteriorProcurementOrderLogResponses(inReocrdRes.data)
       }
 
-      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetTenderOutCheckRecord
+      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetInviteTenderOutCheckRecord
       const outRecordRes = await outCheckRecordFn({ inviteTenderId: searchId })
       if (outRecordRes.code === 1000) {
         setExternalProcurementOrderLogResponses(outRecordRes.data)

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/bidConfirm/index.tsx

@@ -69,6 +69,8 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
           inviteTenderMateriel: item.inviteTenderMateriel,
           count: item.inviteTenderMateriel.count,
           unitName: item.inviteTenderMateriel.unitName,
+          isAwardTender: item.isAwardTender,
+          awardTenderRatio: item.awardTenderRatio,
           // submitTenderMateriel: { id: item.id }
         })
       })
@@ -81,8 +83,8 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
           temp['submitTender'] = { id: _item.submitTender.id }
           temp['totalAmount'] = _item.totalAmount
           // 默认不授标 授标率100
-          temp['isAwardTender'] = false
-          temp['awardRate'] = 100
+          temp['isAwardTender'] = item.isAwardTender
+          temp['awardRate'] = item.awardTenderRatio
           tempOjbect[_item.id] = {...temp, ..._item.submitTender.submitTenderMateriel[index]}
         })
         return tempOjbect

src/pages/procurement/callForBids/readyCheckedConfirmFirst/constant/index.tsx

@@ -70,15 +70,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/bidConfirm/index.tsx

@@ -69,6 +69,8 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
           inviteTenderMateriel: item.inviteTenderMateriel,
           count: item.inviteTenderMateriel.count,
           unitName: item.inviteTenderMateriel.unitName,
+          isAwardTender: item.isAwardTender,
+          awardTenderRatio: item.awardTenderRatio,
           // submitTenderMateriel: { id: item.id }
         })
       })
@@ -81,8 +83,8 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
           temp['submitTender'] = { id: _item.submitTender.id }
           temp['totalAmount'] = _item.totalAmount
           // 默认不授标 授标率100
-          temp['isAwardTender'] = false
-          temp['awardRate'] = 100
+          temp['isAwardTender'] = item.isAwardTender
+          temp['awardRate'] = item.awardTenderRatio
           tempOjbect[_item.id] = {...temp, ..._item.submitTender.submitTenderMateriel[index]}
         })
         return tempOjbect

src/pages/procurement/callForBids/readyCheckedConfirmSecond/constant/index.tsx

@@ -70,15 +70,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readyConfirmBid/constant/index.tsx

@@ -70,15 +70,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readyExpertRemark/constant/index.tsx

@@ -125,15 +125,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readyExpertRemark/effects/useRemarkDetail.ts

@@ -46,7 +46,7 @@ export const useRemarkDetail = (options: DetailHookProps) => {
         setInteriorProcurementOrderLogResponses(inReocrdRes.data)
       }
 
-      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetTenderOutCheckRecord
+      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetInviteTenderOutCheckRecord
       const outRecordRes = await outCheckRecordFn({ inviteTenderId: searchId })
       if (outRecordRes.code === 1000) {
         setExternalProcurementOrderLogResponses(outRecordRes.data)

src/pages/procurement/callForBids/readyPassBid/constant/index.tsx

@@ -70,15 +70,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readySendBidNotice/constant/index.tsx

@@ -119,15 +119,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readySendBidNotice/effects/useNoticeDetail.ts

@@ -48,7 +48,7 @@ export const useNoticeDetail = (options: DetailHookProps) => {
         setInteriorProcurementOrderLogResponses(inReocrdRes.data)
       }
 
-      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetTenderOutCheckRecord
+      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetInviteTenderOutCheckRecord
       const outRecordRes = await outCheckRecordFn({ inviteTenderId: searchId })
       if (outRecordRes.code === 1000) {
         setExternalProcurementOrderLogResponses(outRecordRes.data)

src/pages/procurement/callForBids/readySubmitReport/constant/index.tsx

@@ -131,15 +131,15 @@ export const insideRecordCols: any[] = [
   },
   {
     title: '部门',
-    dataIndex: 'department',
+    dataIndex: 'userOrgName',
     align: 'center',
-    key: 'department',
+    key: 'userOrgName',
   },
   {
     title: '职位',
-    dataIndex: 'position',
+    dataIndex: 'userJobTitle',
     align: 'center',
-    key: 'position',
+    key: 'userJobTitle',
   },
   {
     title: '状态',

src/pages/procurement/callForBids/readySubmitReport/effects/useReportDetail.ts

@@ -50,7 +50,7 @@ export const useReportDetail = (options: DetailHookProps) => {
         setInteriorProcurementOrderLogResponses(inReocrdRes.data)
       }
 
-      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetTenderOutCheckRecord
+      const outCheckRecordFn = PublicApi.getPurchaseTenderOutCheckRecordGetInviteTenderOutCheckRecord
       const outRecordRes = await outCheckRecordFn({ inviteTenderId: searchId })
       if (outRecordRes.code === 1000) {
         setExternalProcurementOrderLogResponses(outRecordRes.data)

src/pages/procurement/components/bidParticulars/index.tsx

 import React, { useContext, useState } from 'react'
-import { Table, Row, Col } from 'antd'
+import { Table, Row, Col, message, Spin } from 'antd'
 import MellowCard from '@/components/MellowCard'
 import { BidDetailContext } from '@/pages/procurement/_public/bid/context';
 import style from './index.less'
@@ -36,6 +36,10 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
       name: item.inviteTenderMateriel.name,
       type: item.inviteTenderMateriel.type,
       unitName: item.inviteTenderMateriel.unitName,
+      awardTenderRatio: item.awardTenderRatio,
+      commodityId: item.commodityId,
+      commodityName: item.commodityName,
+      commoditySkuId: item.commoditySkuId,
     })) : []
   })
 
@@ -55,32 +59,43 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
   })
 
 
-  const onExpandRender = async (e, r) => {
-    setTableData(() => [...tableData].map(item => ({
-      ...item,
-      description: <div className={style.childrenWrap}>
+  const renderDescription = async (record) => {
+    // 商品信息
+    let res = await PublicApi.getProductCommodityGetCommodity({id: record.commoditySkuId})
+    // 商品规格信息
+    let spec = await PublicApi.getProductCommodityGetCommodityAttributeByUnitPriceAndPicId({ unitPriceAndPicId: record.commodityId })
+    const { code , data } = res
+    if(code === 1000) {
+      const newData = [...tableData];
+      const index = newData.findIndex(item => record.id === item.id);
+      const item = newData[index];
+      item.description = (<div className={style.childrenWrap}>
         <Row>
           <Col span={3}>
             <div className={style.childrenTitle}>
               <p>对应</p>
-              <p>招标商品</p>
+              <p>投标商品</p>
             </div>
           </Col>
           <Col span={6}>
             <div className={style.childrenContent}>
-              <p><span>商品编号:</span>{r.code}</p>
-              <p><span>商品名称:</span>{r.name}</p>
+              <p><span>商品编号:</span>{data.code}</p>
+              <p><span>商品名称:</span>{data.name}</p>
             </div>
           </Col>
           <Col span={6}>
             <div className={style.childrenContent}>
-              <p><span>规格型号:</span>{r.type}</p>
-              <p><span>品类:</span>{r.categoryName}</p>
+              <p><span>规格型号:</span>
+              {
+                spec.data.length ? spec.data.map(item => item.customerAttributeValueList[0].value).join('/') : null
+              }
+              </p>
+              <p><span>品类:</span>{data.customerCategory.fullName}</p>
             </div>
           </Col>
           <Col span={6}>
             <div className={style.childrenContent}>
-              <p><span>品牌:</span>{r.brandName}</p>
+              <p><span>品牌:</span>{data?.brand?.name}</p>
             </div>
           </Col>
           {/* <Col span={3}>
@@ -89,8 +104,9 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
             </div>
           </Col> */}
         </Row>
-      </div>
-    })))
+      </div>)
+      setTableData([...newData])
+    }
   }
 
   return (<>
@@ -104,7 +120,7 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
       <Table
         columns={tableColumn}
         expandable={{
-          expandedRowRender: record => <p style={{ margin: 0 }}>{record.description}</p>,
+          expandedRowRender: record => <p style={{ margin: 0 }}>{ record.description || <Spin size="small" style={{margin: '15px auto', width: '100%'}} />}</p>,
           rowExpandable: record => record.name !== 'Not Expandable',
           expandIcon: ({ expanded, onExpand, record }) =>
             expanded ? (
@@ -112,9 +128,18 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
             ) : (
               <CaretRightOutlined onClick={e => onExpand(record, e)} />
             ),
-          onExpand: (expand, record) => onExpandRender(expand, record)
+          onExpand: (expanded, record) => {
+            console.log('通过商品Id 查询商品信息显示在嵌套中', record, expanded)
+            if(!record?.commodityId && expanded) {
+              return message.error('您没有关联商品')
+            }
+            if(expanded) {
+              renderDescription(record)
+            }
+          }
         }}
         dataSource={tableData}
+        rowKey="id"
         pagination={{size: "small"}}
       />
     </MellowCard>

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -89,32 +89,32 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
       ]
     }
   ]
-  // @todo基本信息——投标
+  // @基本信息——投标
   const basicTenderColumnList = [
     {
       span: 8,
       fieldList: [
         { title: '投标编号:', name: 'code', render: () => _data['code'] },
+        { title: '投标项目:', name: 'projectName' },
         { title: '外部状态:', name: 'submitTenderOutStatusValue', render: () => _data['submitTenderOutStatusValue']},
         { title: '内部状态:', name: 'submitTenderInStatusValue', render: () => _data['submitTenderInStatusValue']},
-        { title: '投标项目:', name: 'projectName' },
       ]
     },
-    // {
-    //   span: 8,
-    //   fieldList: [
-    //     { title: '投标摘要:', name: 'remark', render: () => _data['submitTender']['remark']  },
-    //     {
-    //       title: '投标文件:',
-    //       name: 'inviteTenderFile',
-    //       render: (t, r) => (<div>
-    //         {
-    //           _data['submitTender']['file'].map((_item, _i) => <p><a key={`submitTenderFile${_i}`} target="_blank" href={_item.url}><FileFilled /> {_item.name}</a></p>)
-    //         }
-    //       </div>)
-    //     },
-    //   ]
-    // },
+    {
+      span: 8,
+      fieldList: [
+        { title: '投标摘要:', name: 'remark', render: () => _data?.submitTender?.remark },
+        {
+          title: '投标文件:',
+          name: 'inviteTenderFile',
+          render: (t, r) => (<div>
+            {
+              _data?.submitTender?.file?.length && _data['submitTender']['file'].map((_item, _i) => <p><a key={`submitTenderFile${_i}`} target="_blank" href={_item.url}><FileFilled /> {_item.name}</a></p>)
+            }
+          </div>)
+        },
+      ]
+    },
     {
       span: 8,
       fieldList: [

src/pages/procurement/components/registerInfoList/index.tsx

@@ -54,7 +54,7 @@ const RegisterInfoList: React.FC<RegisterInfoListProps> = ({cardTitle, type="reg
                       <Col>
                         <p>
                           {
-                            item?.registerFile?.length ? item.registerFile.map(_item => (<a key={_item.id} href={_item.url}>{_item.name}</a>)) : null
+                            item?.submitTenderRegister?.registerFile?.length ? item?.submitTenderRegister?.registerFile.map(_item => (<a key={_item.id} href={_item.url}>{_item.name}</a>)) : null
                           }
                         </p>
                       </Col>

src/pages/procurement/components/remarkBidReport/index.tsx

@@ -292,7 +292,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
               <Col span={4}><p className={style['card-list_title']}>附件:</p></Col>
               <Col>
                 {
-                  data?.evaluationFile.length ? data.evaluationFile.map(item => (<p key={item.id}><a href={item.url} target="_blank"><FileFilled /> {item.name}</a></p>)) : null
+                  data?.evaluationTenderFile.length ? data.evaluationTenderFile.map(item => (<p key={item.id}><a href={item.url} target="_blank"><FileFilled /> {item.name}</a></p>)) : null
                 }
               </Col>
             </Row>

src/pages/procurement/components/transferRecord/index.tsx

@@ -80,15 +80,15 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
     },
     {
       title: '部门',
-      dataIndex: 'department',
+      dataIndex: 'userOrgName',
       align: 'center',
-      key: 'department',
+      key: 'userOrgName',
     },
     {
       title: '职位',
-      dataIndex: 'position',
+      dataIndex: 'userJobTitle',
       align: 'center',
-      key: 'position',
+      key: 'userJobTitle',
     },
     {
       title: '状态',

src/pages/procurement/tender/addTender/model/useProductTable.tsx

@@ -148,7 +148,6 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
 
   // 嵌套子表格
   const productChildren = {
-    // expandedRowRender: record => <p style={{ margin: 0 }}>{record.description}</p>,
     expandedRowRender: record => <p style={{ margin: 0 }}>{ record.description || <Spin size="small" style={{margin: '15px auto', width: '100%'}} />}</p>,
     rowExpandable: record => record.name !== 'Not Expandable',
     expandIcon: ({ expanded, onExpand, record }) =>

src/pages/procurement/tender/tenderSearch/index.tsx

@@ -53,7 +53,7 @@ const TenderSearch: React.FC<{}> = () => {
           formilyProps={{
             ctx: {
               inline: false,
-              schema: tableListSchema,
+              schema: tableListSchema(),
               effects: ($, actions) => {
                 useStateFilterSearchLinkageEffect(
                   $,

src/pages/transaction/purchaseAbility/offter/addOffter/add.tsx

@@ -63,6 +63,8 @@ const AddForm = () => {
         basicInfo.offerEndTime = params.offerEndTime;
         basicInfo.createTime = params.createTime;
         basicInfo.externalState = params.externalState;
+        basicInfo.interiorStateName = params.interiorStateName;
+        basicInfo.externalStateName = params.externalStateName;
         basicInfo.interiorState = params.interiorState;
         offerInfo.id = params.id;
         if (path === 'edit') {

src/pages/transaction/purchaseAbility/offter/addOffter/components/basic.tsx

@@ -166,13 +166,13 @@ const BasicInfo: React.FC<IProps> = (props: any) => {
         label='外部状态'
         name='externalState'
       >
-        {fetchdata && <Tag color={OFFTER_EXTERNALSTATE_COLOR[fetchdata.externalState]}>{OFFTER_EXTERNALSTATE[fetchdata.externalState]}</Tag>}
+        {fetchdata && <Tag color={OFFTER_EXTERNALSTATE_COLOR[fetchdata.externalState]}>{fetchdata.externalStateName}</Tag>}
       </Form.Item>
       <Form.Item
         label='内部状态'
         name='interiorState'
       >
-        {fetchdata && <Badge status={OFFTER_INTERNALSTATE_COLOR[fetchdata.interiorState]} text={OFFTER_INTERNALSTATE[fetchdata.interiorState]} />}
+        {fetchdata && <Badge status={OFFTER_INTERNALSTATE_COLOR[fetchdata.interiorState]} text={fetchdata.interiorStateName} />}
 
       </Form.Item>
     </Form>

src/pages/transaction/purchaseAbility/offter/addOffter/components/offer.tsx

@@ -128,6 +128,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
           name={`isTax${index}`}
           style={{ margin: 0 }}
           rules={[{ required: true, message: '请选择' }]}
+          initialValue={text}
         >
           <Select
             style={{ width: 100 }}
@@ -223,7 +224,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
     console.log(params, 123)
     params.forEach((it: any, i: number) => {
       form.setFieldsValue({
-        ['isTax' + i]: it.isTax ? it.isTax : 1,
+        ['isTax' + i]: (it.isTax || it.isTax === 0) ? it.isTax : 1,
         ['taxProbability' + i]: it.taxProbability,
         ['taxUnitPrice' + i]: it.taxUnitPrice
       })
@@ -299,7 +300,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
             detailss.push({
               purchaseInquiryDetailsId: name === 'quote' ? item.id : item.purchaseInquiryDetailsId,
               taxUnitPrice: item.taxUnitPrice,
-              isTax: item.isTax ? item.isTax : 1,
+              isTax: (item.isTax || item.isTax === 0) ? item.isTax : 1,
               taxProbability: item.taxProbability,
               productName: item.productName,
               productId: item.productId,

src/pages/transaction/purchaseAbility/purchasDoor/purchasInfo/index.tsx

@@ -78,11 +78,7 @@ const PurchasInfo: React.FC<PurchasInfoPropsType> = (props) => {
 
   // 根据站点获取商城信息
   const fetchAllShop = () => {
-    const param: any = {
-      siteId,
-      type: 3
-    }
-    PublicApi.getManageShopFindShopsBySiteId(param).then(res => {
+    PublicApi.getManageShopFindByDoorType({doorType: '3'}).then(res => {
       if (res.code === 1000) {
         setAllMallList(res.data)
       }