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

src/pages/procurement/callForBids/callForBidsSearch/detail/index.tsx

@@ -52,6 +52,11 @@ const CallForBidsSearchDetail: React.FC = () => {
   //   anchorTitleList.splice(-2, 1)
   // }
 
+  // 勾选资格预审 才有资格预审信息
+  if(!data?.isQualificationCheck) {
+    anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1))
+  }
+
   return (
     <div>
       <BidDetailContext.Provider value={formContext}>

src/pages/procurement/callForBids/callForBidsSearch/index.tsx

@@ -16,7 +16,7 @@ import { createAsyncFormActions } from '@formily/antd'
 import moment from 'moment'
 import { dataChangeUnix } from '../addNewBid/constant'
 import '../../constants/index.less'
-import { BidInsideWorkState, BidOuterWorkState } from '@/constants/procurement'
+// import { BidInsideWorkState, BidOuterWorkState } from '@/constants/procurement'
 
 const destroyActions = createAsyncFormActions()
 const modifyActions = createAsyncFormActions()
@@ -141,7 +141,7 @@ const callForBidsSearch: React.FC<{}> = () => {
           formilyProps={{
             ctx: {
               inline: false,
-              schema: tableListSchema,
+              schema: tableListSchema(),
               effects: ($, actions) => {
                 useStateFilterSearchLinkageEffect(
                   $,

src/pages/procurement/callForBids/callForBidsSearch/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { BidInStateTexts, BidOutStateTexts } from '@/constants/procurement';
+// import { BidInStateTexts, BidOutStateTexts } from '@/constants/procurement';
+import { getInviteTenderInStatus, getInviteTenderOutStatus } from '@/pages/procurement/constants';
 
 /**
  * 招标查询列表高级筛选
  */
-export const tableListSchema: ISchema = {
-  type: 'object',
-  properties: {
-    inviteTenderCode: {
-      type: 'string',
-      "x-component": 'SearchFilter',
-      'x-component-props': {
-        placeholder: '请输入招标编号',
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        inline: true,
-        rowStyle: {
-          justifyContent: 'start',
+export const tableListSchema: any = () => {
+
+  const BidInStateTexts = getInviteTenderInStatus()
+  const BidOutStateTexts = getInviteTenderOutStatus()
+
+  return {
+    type: 'object',
+    properties: {
+      inviteTenderCode: {
+        type: 'string',
+        "x-component": 'SearchFilter',
+        'x-component-props': {
+          placeholder: '请输入招标编号',
+          align: 'flex-start',
         },
-        colStyle: {
-          marginRight: 20
-        }
       },
-      properties: {
-        projectName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标项目',
+      [FORM_FILTER_PATH]: {
+        type: 'object',
+        'x-component': 'flex-layout',
+        'x-component-props': {
+          inline: true,
+          rowStyle: {
+            justifyContent: 'start',
+          },
+          colStyle: {
+            marginRight: 20
           }
         },
-        "[startTime,endTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['发布开始时间','发布结束时间'],
+        properties: {
+          projectName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标项目',
+            }
           },
-        },
-        "[registerStartTime,registerEndTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['报名开始时间','报名结束时间'],
+          "[startTime,endTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['发布开始时间','发布结束时间'],
+            },
           },
-        },
-        "inviteTenderOutStatusList": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择外部状态'
+          "[registerStartTime,registerEndTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['报名开始时间','报名结束时间'],
+            },
           },
-          enum: Object.keys(BidOutStateTexts).map(item => ({
-            label: BidOutStateTexts[item],
-            value: item,
-          }))
-        },
-        "inviteTenderInStatusList": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择内部状态'
+          "inviteTenderOutStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择外部状态'
+            },
+            enum: BidOutStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
           },
-          enum: Object.keys(BidInStateTexts).map(item => ({
-            label: BidInStateTexts[item],
-            value: item,
-          }))
-        },
-        "[preCheckStartTime,preCheckEndTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['预审开始时间','预审结束时间'],
+          "inviteTenderInStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择内部状态'
+            },
+            enum: BidInStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
           },
-        },
-        "[inviteTenderStartTime,inviteTenderEndTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['投标开始时间','投标结束时间'],
+          "[preCheckStartTime,preCheckEndTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['预审开始时间','预审结束时间'],
+            },
           },
-        },
-        submit: {
-          'x-component': 'Submit',
-          'x-component-props': {
-            children: '查询',
+          "[inviteTenderStartTime,inviteTenderEndTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['投标开始时间','投标结束时间'],
+            },
+          },
+          submit: {
+            'x-component': 'Submit',
+            'x-component-props': {
+              children: '查询',
+            },
           },
         },
       },
-    },
+    }
   }
 }

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

@@ -19,10 +19,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
 
   return <div className={style.totalWrapper}>
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>报价小计:</p></Col>
@@ -42,10 +42,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
     </Row>
     <Divider dashed={true} style={{margin: 0, marginBottom: 8}} />
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>授标数量:</p></Col>

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

@@ -149,10 +149,10 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
               <Col span={24}>
                 {/* header */}
                 <Row>
-                  <Col span={4}><p className={style.bidTableHead}>采购物料</p></Col>
-                  <Col span={4}><p className={style.bidTableHead}>采购数量</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购物料</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购数量</p></Col>
                   {
-                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} key={`column_${index}`}>
+                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} lg={6} key={`column_${index}`}>
                       <p className={style.bidTableHead}>
                         <RenderRanking title={item.title} level={index-1} />
                       </p>
@@ -166,7 +166,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       tableColumns.map((_item, _index) => {
                         const { title, dataIndex } = _item
                         if(title === '采购物料') {
-                          return (<Col span={4} style={{paddingTop: 0, marginTop: 0}}>
+                          return (<Col span={4} lg={6} style={{paddingTop: 0, marginTop: 0}}>
                             <div className={style.materialInfo}>
                               <span className={style.rankNumber}>{index+1}</span>
                               <div className={style['card-list']}>
@@ -202,7 +202,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else if(title === '采购数量') {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <div className={style.amountInfo}>
                               <span>{item[dataIndex]}</span>
                               <br />
@@ -210,7 +210,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <GivenBidItem currentData={item} datas={tableDataSource} currentColumn={_item} columns={tableColumns} currentIndex={index}  />
                           </Col>)
                         }

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

@@ -40,7 +40,7 @@ const ParticipateInfo: React.FC<ParticipateInfoProps> = ({cardTitle}) => {
         <div className={style.participateWrapper}>
           <Row gutter={[16, 0]}>
             {
-              participateList.map((item, index) => (<Col span={4} key={index}>
+              participateList.map((item, index) => (<Col span={4} lg={6} key={index}>
                   <div className={style.participateContent}>
                     <div className={style.topWrapper}>
                       <h3>{item.company}</h3>

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

@@ -19,10 +19,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
 
   return <div className={style.totalWrapper}>
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>报价小计:</p></Col>
@@ -42,10 +42,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
     </Row>
     <Divider dashed={true} style={{margin: 0, marginBottom: 8}} />
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>授标数量:</p></Col>

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

@@ -149,10 +149,10 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
               <Col span={24}>
                 {/* header */}
                 <Row>
-                  <Col span={4}><p className={style.bidTableHead}>采购物料</p></Col>
-                  <Col span={4}><p className={style.bidTableHead}>采购数量</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购物料</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购数量</p></Col>
                   {
-                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} key={`column_${index}`}>
+                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} lg={6} key={`column_${index}`}>
                       <p className={style.bidTableHead}>
                         <RenderRanking title={item.title} level={index-1} />
                       </p>
@@ -166,7 +166,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       tableColumns.map((_item, _index) => {
                         const { title, dataIndex } = _item
                         if(title === '采购物料') {
-                          return (<Col span={4} style={{paddingTop: 0, marginTop: 0}}>
+                          return (<Col span={4} lg={6} style={{paddingTop: 0, marginTop: 0}}>
                             <div className={style.materialInfo}>
                               <span className={style.rankNumber}>{index+1}</span>
                               <div className={style['card-list']}>
@@ -202,7 +202,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else if(title === '采购数量') {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <div className={style.amountInfo}>
                               <span>{item[dataIndex]}</span>
                               <br />
@@ -210,7 +210,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <GivenBidItem currentData={item} datas={tableDataSource} currentColumn={_item} columns={tableColumns} currentIndex={index}  />
                           </Col>)
                         }

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

@@ -43,7 +43,7 @@ const ParticipateInfo: React.FC<ParticipateInfoProps> = ({cardTitle}) => {
         <div className={style.participateWrapper}>
           <Row gutter={[16, 0]}>
             {
-              participateList.map((item, index) => (<Col span={4} key={index}>
+              participateList.map((item, index) => (<Col span={4} lg={6} key={index}>
                   <div className={style.participateContent}>
                     <div className={style.topWrapper}>
                       <h3>{item.company}</h3>

src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/components/totalAmount/index.tsx

@@ -30,10 +30,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
 
   return <div className={style.totalWrapper}>
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>报价小计:</p></Col>
@@ -53,10 +53,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
     </Row>
     <Divider dashed={true} style={{margin: 0, marginBottom: 8}} />
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>授标数量:</p></Col>

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

@@ -122,10 +122,10 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
             <Col span={24}>
               {/* header */}
               <Row>
-                <Col span={4}><p className={style.bidTableHead}>采购物料</p></Col>
-                <Col span={4}><p className={style.bidTableHead}>采购数量</p></Col>
+                <Col span={4} lg={6}><p className={style.bidTableHead}>采购物料</p></Col>
+                <Col span={4} lg={6}><p className={style.bidTableHead}>采购数量</p></Col>
                 {
-                  tableColumns.map((item, index) => index > 1 ? (<Col span={4} key={`column_${index}`}>
+                  tableColumns.map((item, index) => index > 1 ? (<Col span={4} lg={6} key={`column_${index}`}>
                     <p className={style.bidTableHead}>
                       <RenderRanking title={item.title} level={index-1} />
                     </p>
@@ -139,7 +139,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                     tableColumns.map((_item, _index) => {
                       const { title, dataIndex } = _item
                       if(title === '采购物料' && item[dataIndex]) {
-                        return (<Col span={4} style={{paddingTop: 0, marginTop: 0}}>
+                        return (<Col span={4} lg={6} style={{paddingTop: 0, marginTop: 0}}>
                           <div className={style.materialInfo}>
                             <span className={style.rankNumber}>{index+1}</span>
                             <div className={style['card-list']}>
@@ -175,7 +175,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                           </div>
                         </Col>)
                       } else if(title === '采购数量') {
-                        return (<Col span={4}>
+                        return (<Col span={4} lg={6}>
                           <div className={style.amountInfo}>
                             <span>{item[dataIndex]}</span>
                             <br />
@@ -183,7 +183,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                           </div>
                         </Col>)
                       } else {
-                        return (<Col span={4}>
+                        return (<Col span={4} lg={6}>
                           <GivenBidItem currentData={item} datas={tableDataSource} currentColumn={_item} columns={tableColumns} currentIndex={index}  />
                         </Col>)
                       }

src/pages/procurement/callForBids/readyConfirmBid/components/participateInfo/index.tsx

@@ -44,7 +44,7 @@ const ParticipateInfo: React.FC<ParticipateInfoProps> = ({cardTitle}) => {
         <div className={style.participateWrapper}>
           <Row gutter={[16, 0]}>
             {
-              participateList.map((item, index) => (<Col span={4} key={index}>
+              participateList.map((item, index) => (<Col span={4} lg={6} key={index}>
                   <div className={style.participateContent}>
                     <div className={style.topWrapper}>
                       <h3>{item.company}</h3>

src/pages/procurement/callForBids/readyPassBid/components/bidConfirm/components/totalAmount/index.tsx

@@ -19,10 +19,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
 
   return <div className={style.totalWrapper}>
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>报价小计:</p></Col>
@@ -42,10 +42,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
     </Row>
     <Divider dashed={true} style={{margin: 0, marginBottom: 8}} />
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>授标数量:</p></Col>

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

@@ -150,10 +150,10 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
               <Col span={24}>
                 {/* header */}
                 <Row>
-                  <Col span={4}><p className={style.bidTableHead}>采购物料</p></Col>
-                  <Col span={4}><p className={style.bidTableHead}>采购数量</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购物料</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购数量</p></Col>
                   {
-                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} key={`column_${index}`}>
+                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} lg={6} key={`column_${index}`}>
                       <p className={style.bidTableHead}>
                         <RenderRanking title={item.title} level={index-1} />
                       </p>
@@ -167,7 +167,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       tableColumns.map((_item, _index) => {
                         const { title, dataIndex } = _item
                         if(title === '采购物料') {
-                          return (<Col span={4} style={{paddingTop: 0, marginTop: 0}}>
+                          return (<Col span={4} lg={6} style={{paddingTop: 0, marginTop: 0}}>
                             <div className={style.materialInfo}>
                               <span className={style.rankNumber}>{index+1}</span>
                               <div className={style['card-list']}>
@@ -203,7 +203,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else if(title === '采购数量') {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <div className={style.amountInfo}>
                               <span>{item[dataIndex]}</span>
                               <br />
@@ -211,7 +211,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <GivenBidItem currentData={item} datas={tableDataSource} currentColumn={_item} columns={tableColumns} currentIndex={index}  />
                           </Col>)
                         }

src/pages/procurement/callForBids/readyPassBid/components/participateInfo/index.tsx

@@ -43,7 +43,7 @@ const ParticipateInfo: React.FC<ParticipateInfoProps> = ({cardTitle}) => {
         <div className={style.participateWrapper}>
           <Row gutter={[16, 0]}>
             {
-              participateList.map((item, index) => (<Col span={4} key={index}>
+              participateList.map((item, index) => (<Col span={4} lg={6} key={index}>
                   <div className={style.participateContent}>
                     <div className={style.topWrapper}>
                       <h3>{item.company}</h3>

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

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

src/pages/procurement/callForBids/tenderSearch/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { TenderOutStateTexts } from '@/constants/procurement';
+// import { TenderOutStateTexts } from '@/constants/procurement';
+import { getInviteSubmitTenderOutStatus } from '@/pages/procurement/constants';
 
 /**
  * 招标查询列表高级筛选
  */
-export const tableListSchema: ISchema = {
-  type: 'object',
-  properties: {
-    inviteTenderCode: {
-      type: 'string',
-      "x-component": 'SearchFilter',
-      'x-component-props': {
-        placeholder: '请输入招标编号',
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        inline: true,
-        rowStyle: {
-          justifyContent: 'start',
+export const tableListSchema: any = () => {
+
+  const TenderOutStateTexts = getInviteSubmitTenderOutStatus()
+
+  return {
+    type: 'object',
+    properties: {
+      inviteTenderCode: {
+        type: 'string',
+        "x-component": 'SearchFilter',
+        'x-component-props': {
+          placeholder: '请输入招标编号',
+          align: 'flex-start',
         },
-        colStyle: {
-          marginRight: 20
-        }
       },
-      properties: {
-        projectName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入投标项目',
-          }
-        },
-        submitTenderCode: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入投标编号',
-          }
-        },
-        openTenderTime: {
-          type: 'string',
-          "x-component": 'data',
-          'x-component-props': {
-            placeholder: '开标开始时间',
-            showTime: true,
+      [FORM_FILTER_PATH]: {
+        type: 'object',
+        'x-component': 'flex-layout',
+        'x-component-props': {
+          inline: true,
+          rowStyle: {
+            justifyContent: 'start',
           },
-        },
-        submitTenderMemberName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入投标会员',
+          colStyle: {
+            marginRight: 20
           }
         },
-        submitTenderOutStatusList: {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择外部状态'
+        properties: {
+          projectName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入投标项目',
+            }
           },
-          enum: Object.keys(TenderOutStateTexts).filter(_item => Number(_item) >= 8).map(item => ({
-            label: TenderOutStateTexts[item],
-            value: item,
-          }))
-        },
-        submit: {
-          'x-component': 'Submit',
-          'x-component-props': {
-            children: '查询',
+          submitTenderCode: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入投标编号',
+            }
+          },
+          openTenderTime: {
+            type: 'string',
+            "x-component": 'data',
+            'x-component-props': {
+              placeholder: '开标开始时间',
+              showTime: true,
+            },
+          },
+          submitTenderMemberName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入投标会员',
+            }
+          },
+          submitTenderOutStatusList: {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择外部状态'
+            },
+            enum: TenderOutStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
+          },
+          submit: {
+            'x-component': 'Submit',
+            'x-component-props': {
+              children: '查询',
+            },
           },
         },
       },
-    },
+    }
   }
 }

src/pages/procurement/components/bidConfirm/components/totalAmount/index.tsx

@@ -19,10 +19,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
 
   return <div className={style.totalWrapper}>
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>报价小计:</p></Col>
@@ -42,10 +42,10 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
     </Row>
     <Divider dashed={true} style={{margin: 0, marginBottom: 8}} />
     <Row>
-      <Col span={4}></Col>
-      <Col span={4}></Col>
+      <Col span={4} lg={6}></Col>
+      <Col span={4} lg={6}></Col>
       {
-        columns.map((item, index) => index > 1 ? (<Col span={4}>
+        columns.map((item, index) => index > 1 ? (<Col span={4} lg={6}>
           <div className={style['card-list']}>
             <Row>
               <Col span={8}><p className={style['card-list_title']}>授标数量:</p></Col>

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

@@ -167,10 +167,10 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
               <Col span={24}>
                 {/* header */}
                 <Row>
-                  <Col span={4}><p className={style.bidTableHead}>采购物料</p></Col>
-                  <Col span={4}><p className={style.bidTableHead}>采购数量</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购物料</p></Col>
+                  <Col span={4} lg={6}><p className={style.bidTableHead}>采购数量</p></Col>
                   {
-                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} key={`column_${index}`}>
+                    tableColumns.map((item, index) => index > 1 ? (<Col span={4} lg={6} key={`column_${index}`}>
                       <p className={style.bidTableHead}>
                         <RenderRanking title={item.title} level={index-1} />
                       </p>
@@ -184,7 +184,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       tableColumns.map((_item, _index) => {
                         const { title, dataIndex } = _item
                         if(title === '采购物料') {
-                          return (<Col span={4} style={{paddingTop: 0, marginTop: 0}}>
+                          return (<Col span={4} lg={6} style={{paddingTop: 0, marginTop: 0}}>
                             <div className={style.materialInfo}>
                               <span className={style.rankNumber}>{index+1}</span>
                               <div className={style['card-list']}>
@@ -220,7 +220,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else if(title === '采购数量') {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <div className={style.amountInfo}>
                               <span>{item[dataIndex]}</span>
                               <br />
@@ -228,7 +228,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                             </div>
                           </Col>)
                         } else {
-                          return (<Col span={4}>
+                          return (<Col span={4} lg={6}>
                             <GivenBidItem currentData={item} datas={tableDataSource} currentColumn={_item} columns={tableColumns} currentIndex={index}  />
                           </Col>)
                         }

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

@@ -43,6 +43,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           tempObject.id = item.id
           tempObject.memberId = item.memberId
           tempObject.memberName = item.memberName
+          if(item.evaluationTenderList)
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
             tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']

src/pages/procurement/constants/index.tsx

-import React from 'react'
+import React, { useEffect, useState } from 'react'
 import {history} from 'umi'
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview'
@@ -6,6 +6,7 @@ import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 import CustomTag from '@/pages/procurement/components/CustomTag'
 import CustomBadge from '@/pages/procurement/components/customBadge'
 import { CALLFORBID_TYPE, PURCHASE_TYPE } from '@/constants/procurement'
+import { PublicApi } from '@/services/api'
 
  /** 工具: 按属性归类 */
  export const groupBy = (objectArray: any[], property: string) => {
@@ -195,3 +196,125 @@ export const baseTenderListColumns: any[] = [
     render: (text, r) => <CustomBadge text={text} color={r.submitTenderInStatusColor} />
   },
 ]
+
+
+/** 获取高级筛选状态 */
+
+interface IState {
+  code: number;
+  message: string;
+}
+
+/** 招标管理 */
+/** 招标 招标查询 内部状态 */
+export const getInviteTenderInStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseInviteTenderGetInviteTenderInStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 招标 招标查询 外部状态 */
+export const getInviteTenderOutStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseInviteTenderGetInviteTenderOutStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 招标 投标查询 外部状态 */
+export const getInviteSubmitTenderOutStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseInviteTenderGetSubmitTenderOutStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 投标管理 */
+/** 投标 招标查询 内部状态 */
+export const getSubmitInviteTenderInStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseSubmitTenderGetInviteTenderInStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 投标 招标查询 外部状态 */
+export const getSubmitInviteTenderOutStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseSubmitTenderGetInviteTenderOutStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 投标 投标查询 内部状态 */
+export const getSubmitSubmitTenderInStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseSubmitTenderGetSubmitTenderInStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}
+
+/** 投标 投标查询 外部状态 */
+export const getSubmitSubmitTenderOutStatus = () => {
+  const [state, setstate] = useState<IState[]>([])
+
+  useEffect(() => {
+    PublicApi.getPurchaseSubmitTenderGetSubmitTenderOutStatus({}).then(res => {
+      const { code, data } = res
+      if(code === 1000) {
+        setstate(data)
+      }
+    })
+  }, [])
+
+  return state
+}

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

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

src/pages/procurement/tender/callForBidsSearch/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { BidOutStateTexts, TenderInStateTexts, TenderOutStateTexts } from '@/constants/procurement';
+import { getSubmitInviteTenderInStatus, getSubmitInviteTenderOutStatus } from '@/pages/procurement/constants';
+// import { TenderInStateTexts, TenderOutStateTexts } from '@/constants/procurement';
 
 /**
  * 招标查询列表高级筛选
  */
- export const tableListSchema: ISchema = {
-  type: 'object',
-  properties: {
-    inviteTenderCode: {
-      type: 'string',
-      "x-component": 'SearchFilter',
-      'x-component-props': {
-        placeholder: '请输入招标编号',
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        inline: true,
-        rowStyle: {
-          justifyContent: 'start',
+ export const tableListSchema: any = () => {
+
+  const TenderInStateTexts = getSubmitInviteTenderInStatus()
+  const TenderOutStateTexts = getSubmitInviteTenderOutStatus()
+
+  return {
+    type: 'object',
+    properties: {
+      inviteTenderCode: {
+        type: 'string',
+        "x-component": 'SearchFilter',
+        'x-component-props': {
+          placeholder: '请输入招标编号',
+          align: 'flex-start',
         },
-        colStyle: {
-          marginRight: 20
-        }
       },
-      properties: {
-        projectName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标项目',
-          }
-        },
-        "[startTime,endTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['发布开始时间','发布结束时间'],
+      [FORM_FILTER_PATH]: {
+        type: 'object',
+        'x-component': 'flex-layout',
+        'x-component-props': {
+          inline: true,
+          rowStyle: {
+            justifyContent: 'start',
           },
-        },
-        inviteTenderMemberName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标会员',
+          colStyle: {
+            marginRight: 20
           }
         },
-        "submitTenderOutStatusList": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择外部状态'
+        properties: {
+          projectName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标项目',
+            }
           },
-          enum: Object.keys(TenderOutStateTexts).map(item => ({
-            label: BidOutStateTexts[item],
-            value: item,
-          }))
-        },
-        "submitTenderInStatusList": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择内部状态'
+          "[startTime,endTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['发布开始时间','发布结束时间'],
+            },
           },
-          enum: Object.keys(TenderInStateTexts).map(item => ({
-            label: TenderInStateTexts[item],
-            value: item,
-          }))
-        },
-        submit: {
-          'x-component': 'Submit',
-          'x-component-props': {
-            children: '查询',
+          inviteTenderMemberName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标会员',
+            }
+          },
+          "submitTenderOutStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择外部状态'
+            },
+            enum: TenderOutStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
+          },
+          "submitTenderInStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择内部状态'
+            },
+            enum: TenderInStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
+          },
+          submit: {
+            'x-component': 'Submit',
+            'x-component-props': {
+              children: '查询',
+            },
           },
         },
       },
-    },
+    }
   }
 }
 

src/pages/procurement/tender/tenderSearch/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
+import { getSubmitSubmitTenderInStatus, getSubmitSubmitTenderOutStatus } from '@/pages/procurement/constants';
+// import { TenderInStateTexts, TenderOutStateTexts } from '@/constants/procurement';
 
 /**
  * 投标查询列表高级筛选
  */
- export const tableListSchema: ISchema = {
-  type: 'object',
-  properties: {
-    submitTenderCode: {
-      type: 'string',
-      "x-component": 'SearchFilter',
-      'x-component-props': {
-        placeholder: '请输入投标编号',
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        inline: true,
-        colStyle: {
-          marginRight: 20
-        },
-        rowStyle: {
-          justifyContent: 'start',
+ export const tableListSchema: any = () => {
+
+  const TenderInStateTexts = getSubmitSubmitTenderInStatus()
+  const TenderOutStateTexts = getSubmitSubmitTenderOutStatus()
+
+   return {
+    type: 'object',
+    properties: {
+      submitTenderCode: {
+        type: 'string',
+        "x-component": 'SearchFilter',
+        'x-component-props': {
+          placeholder: '请输入投标编号',
+          align: 'flex-start',
         },
       },
-      properties: {
-        inviteTenderCode: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标编号',
+      [FORM_FILTER_PATH]: {
+        type: 'object',
+        'x-component': 'flex-layout',
+        'x-component-props': {
+          inline: true,
+          colStyle: {
+            marginRight: 20
           },
-        },
-        projectName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标项目',
-          }
-        },
-        "[startTime,endTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
-          'x-component-props': {
-            placeholder: ['发布开始时间','发布结束时间'],
+          rowStyle: {
+            justifyContent: 'start',
           },
         },
-        inviteTenderMemberName: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: '请输入招标会员',
-          }
-        },
-        submit: {
-          'x-component': 'Submit',
-          'x-component-props': {
-            children: '查询',
+        properties: {
+          inviteTenderCode: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标编号',
+            },
+          },
+          projectName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标项目',
+            }
+          },
+          "[startTime,endTime]": {
+            type: 'array',
+            "x-component": 'DateRangePickerUnix',
+            'x-component-props': {
+              placeholder: ['发布开始时间','发布结束时间'],
+            },
+          },
+          inviteTenderMemberName: {
+            type: 'string',
+            'x-component-props': {
+              placeholder: '请输入招标会员',
+            }
+          },
+          "submitTenderOutStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择外部状态'
+            },
+            enum: TenderOutStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
+          },
+          "submitTenderInStatusList": {
+            type: 'string',
+            "x-component-props": {
+              placeholder: '请选择内部状态'
+            },
+            enum: TenderInStateTexts.map(item => ({
+              label: item['message'],
+              value: item['code'],
+            }))
+          },
+          submit: {
+            'x-component': 'Submit',
+            'x-component-props': {
+              children: '查询',
+            },
           },
         },
       },
-    },
+    }
   }
 }