fix: 处理投标二级审核筛选异常

src/pages/procurement/callForBids/addRemarkBidCommittee/schema/modal.ts

@@ -62,6 +62,7 @@ export const selectBidSchema: ISchema = {
         inline: false,
         rowStyle: {
           justifyContent: 'start',
+          rowGap: 20
         },
         colStyle: {
           marginRight: 20

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

@@ -95,8 +95,8 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
       span: 8,
       fieldList: [
         { title: '投标编号:', name: 'code', render: () => _data['code'] },
-        { title: '外部状态:', name: 'submitTenderOutStatus', render: (text) => TenderOutStateTexts[_data['submitTenderOutStatus']]},
-        { title: '内部状态:', name: 'submitTenderInStatus', render: (text) => TenderInStateTexts[_data['submitTenderInStatus']] },
+        { title: '外部状态:', name: 'submitTenderOutStatusValue', render: () => _data['submitTenderOutStatusValue']},
+        { title: '内部状态:', name: 'submitTenderInStatusValue', render: () => _data['submitTenderInStatusValue']},
         { title: '投标项目:', name: 'projectName' },
       ]
     },

src/pages/procurement/constants/index.tsx

@@ -26,7 +26,7 @@ export const processLogResponses = (resData) => {
     id: item.taskStep,
     name: item.taskName,
     operationRole: item.memberRoleName,
-    isActive: item.taskStep < currentOuterStep
+    isActive: currentOuterStep === 0 ? true : (item.taskStep < currentOuterStep)
   }))
   const subTasks = externalTasks.filter(item => item.taskStep === currentOuterStep)
   const interiorLogs = subTasks.length ? subTasks[0]['subTasks'].map(item => ({

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

@@ -131,7 +131,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
           </Col>
           <Col span={6}>
             <div className={style.childrenContent}>
-              <p><span>品牌:</span>{data.brand.name}</p>
+              <p><span>品牌:</span>{data?.brand?.name}</p>
             </div>
           </Col>
           {/* <Col span={3}>

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

@@ -8,7 +8,7 @@ export const tableListSchema: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入招标编号',
+        placeholder: '请输入投标编号',
         align: 'flex-end',
       },
     },

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

@@ -31,18 +31,18 @@ const ReadyAddTender:React.FC<ReadyAddTenderProps> = (props) => {
   const { columns, ref, rowSelection, rowSelectionCtl } = useSelfTable()
 
   const handleBitchPush = async () => {
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.submitTenderInStatus !== TenderInsideWorkState.Not_Submitted_Check_Submit_Tender)
+    // const canBitch = !rowSelectionCtl.selectRow.some(v => v.submitTenderInStatus !== TenderInsideWorkState.Not_Submitted_Check_Submit_Tender)
     if(!rowSelectionCtl.selectRow.length) return message.error('请先选择投标')
-    if (canBitch) {
+    // if (canBitch) {
       const { code } = await run({idList: rowSelectionCtl.selectedRowKeys})
       if (code === 1000) {
         ref.current.reload()
         rowSelectionCtl.setSelectRow([])
         rowSelectionCtl.setSelectedRowKeys([])
       }
-    } else {
-      message.error('只能提交待提交审核投标的投标')
-    }
+    // } else {
+    //   message.error('只能提交待提交审核投标的投标')
+    // }
   }
 
   return <PageHeaderWrapper>

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

@@ -67,7 +67,7 @@ const SecondCheckedTender:React.FC<SecondCheckedTenderProps> = (props) => {
               useStateFilterSearchLinkageEffect(
                 $,
                 actions,
-                'orderNo',
+                'submitTenderCode',
                 FORM_FILTER_PATH,
               );
             },

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

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-// import { OrderTypeMap } from '@/constants/order';
 
 export const tableListSchema: ISchema = {
   type: 'object',
   properties: {
-    orderNo: {
+    submitTenderCode: {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入订单编号',
+        placeholder: '请输入投标编号',
         align: 'flex-end',
       },
     },
@@ -19,38 +18,34 @@ export const tableListSchema: ISchema = {
       'x-component-props': {
         inline: true,
         colStyle: {
-          marginLeft: 20
-        }
+          marginRight: 20
+        },
       },
       properties: {
-        orderThe: {
+        inviteTenderCode: {
           type: 'string',
           'x-component-props': {
-            placeholder: '请输入订单摘要',
-          }
+            placeholder: '请输入招标编号',
           },
-        "supplyMembersName": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请输入供应会员名称'
-          }
         },
-        "type": {
+        projectName: {
           type: 'string',
-          "x-component-props": {
-            placeholder: '请选择订单类型'
-          },
-          // enum: Object.keys(OrderTypeMap).map(item => ({
-          //   label: OrderTypeMap[item],
-          //   value: item,
-          // }))
+          'x-component-props': {
+            placeholder: '请输入招标项目',
+          }
         },
-        "[startCreateTime,endCreateTime]": {
+        "[startTime,endTime]": {
           type: 'array',
           "x-component": 'DateRangePickerUnix',
           'x-component-props': {
-            placeholder: ['开始时间','结束时间'],
+            placeholder: ['发布开始时间','发布结束时间'],
+          },
         },
+        inviteTenderMemberName: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入招标会员',
+          }
         },
         submit: {
           'x-component': 'Submit',