Merge branch 'dev-srm' into v2

src/pages/member/memberQuery/rectificationQuery/detail.tsx

@@ -116,7 +116,7 @@ const rectificationAddDetail = () => {
           ) || null
         }
         {
-          initialValue?.agreeResult && (
+          initialValue?.agreeResult !== null && (
             <div id="result" style={{ margin: `${theme["@margin-md"]} 0` }}>
               <CustomizeColumn  data={resultInfo} title="整改结果" column={1} />
             </div>

src/pages/member/memberRectification/rectificationQuery/detail.tsx

@@ -72,7 +72,7 @@ const rectificationAddDetail = () => {
           ) || null
         }
         {
-          initialValue?.agreeResult && (
+          initialValue?.agreeResult !== null && (
             <div id="result" style={{ margin: `${theme["@margin-md"]} 0` }}>
               <CustomizeColumn  data={resultInfo} title="整改结果" column={1} />
             </div>

src/pages/member/memberRectification/tobeConfirmRectification/detail.tsx

@@ -51,7 +51,7 @@ const TobeEvaluateDetail = () => {
   const handleSubmit = async (value: { result: 0 | 1, reason: string }) => {
     setSubmitLoading(true)
     const { data, code } = await PublicApi.postMemberRectifyWaitConfirmConfirm({
-      id: id,
+      id: +id,
       agree: value.result,
       reason: value.reason
     })

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

@@ -71,7 +71,7 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
           data.code = data['inviteTender']['code']
           data.projectName = data['inviteTender']['projectName']
           data.openTenderTime = formatTimeString(data['inviteTender']['openTenderTime'])
-          data.status = data.status ? '待发送' : '已发送'
+          data.status = data.status ? '已发送' : '待发送'
           setInitFormValue(transformAreaField(data, 'render'))
         }
       })
@@ -93,7 +93,7 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
           // initRender.status = data.status ? '待发送' : '已发送'
           initRender.status = '待发送'
           initRender.expertExtractQueryList = initConditionData
-          initRender.inviteTender = { id: code}
+          initRender.inviteTender = { id: code }
           setInitFormValue(initRender)
         }
       })
@@ -193,16 +193,17 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
 
   const addd = (<span>添加评标内容</span>)
 
-  const selectButton = pageStatus !== PageStatus.PREVIEW
+  const selectButton = (pageStatus !== PageStatus.PREVIEW)
   ?
   <div style={{display: 'flex', alignItems: 'center'}}>
     <div className="connectBtn" onClick={handleClick}><LinkOutlined style={{marginRight: 4}}/>选择</div>
-    <a style={{paddingLeft: 10, display: 'block', height: '32px', lineHeight: '32px', backgroundColor: '#fff'}} onClick={clickPreviewDetail}>查看详情</a>
-  </div>
-  :
-  <div style={{display: 'flex', alignItems: 'center'}}>
-    <a style={{paddingLeft: 10,  display: 'block', height: '32px', lineHeight: '32px', backgroundColor: '#fff'}} onClick={clickPreviewDetail}>查看详情</a>
   </div>
+  : null
+
+  const JumpDetails = () => (<a
+    target="_blank"
+    onClick={clickPreviewDetail}
+    >{initFormValue?.code || initFormValue?.inviteTender?.code}</a>)
 
   const selectExpertButton = pageStatus !== PageStatus.PREVIEW && <Space size={16} style={{marginBottom: 16}}>
     <Button onClick={conditionExtractExpret} icon={<ThunderboltFilled />}>按条件抽取专家</Button>
@@ -317,7 +318,8 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
           schema={formSchema}
           onSubmit={handleSubmit}
           components={{
-            ArrayTable
+            ArrayTable,
+            JumpDetails
           }}
           effects={($, ctx) => {
             $('onFormMount').subscribe(() => {

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

@@ -68,6 +68,7 @@ export const formSchema: ISchema = {
                   type: 'string',
                   title: '招标编号',
                   readOnly: true,
+                  'x-component': 'JumpDetails'
                 },
                 openTenderTime: {
                   type: 'string',

src/pages/procurement/callForBids/callForBidsSearch/model/useSelfTable.tsx

@@ -16,7 +16,6 @@ export const useSelfTable = () => {
       align: 'left',
       dataIndex: 'id',
       key: 'id',
-      // width: 60,
       render: (text, record, index) => index + 1
     },
     {
@@ -28,7 +27,7 @@ export const useSelfTable = () => {
         <EyePreview url={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.id}`}>
           {text}
         </EyePreview>
-        <div>{record['projectName']}</div>
+        <div style={{width: 240, whiteSpace: "nowrap", overflow: 'hidden', textOverflow: "ellipsis"}} title={record['projectName']}>{record['projectName']}</div>
       </>
     },
     {
@@ -51,7 +50,6 @@ export const useSelfTable = () => {
       dataIndex: 'createTime',
       key: 'createTime',
       render: (text, record) => formatTimeString(record.createTime),
-      // width: 180
     },
     {
       title: '报名开始/截止时间',
@@ -62,7 +60,6 @@ export const useSelfTable = () => {
         <div><PlayCircleOutlined />&nbsp;{formatTimeString(record.registerStartTime)}</div>
         <div><PoweroffOutlined />&nbsp;{formatTimeString(record.registerEndTime)}</div>
       </>,
-      // width: 180
     },
     {
       title: '资格预审开始/截止时间',
@@ -73,7 +70,6 @@ export const useSelfTable = () => {
         {record.preCheckStartTime ? <div><PlayCircleOutlined />&nbsp;{formatTimeString(record.preCheckStartTime)}</div> : null}
         {record.preCheckEndTime ? <div><PoweroffOutlined />&nbsp;{formatTimeString(record.preCheckEndTime)}</div> : null}
       </>,
-      // width: 180
     },
     {
       title: '投标开始/截止时间',

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

@@ -97,7 +97,7 @@ const ExtractNoticeManageDetail: React.FC = () => {
         </Col>
         <Col span={18}>
           <p className={styles.cardListText}>
-          <Button type="link" onClick={clickPreviewDetail}>{inviterInfo?.code}</Button>
+          <a onClick={clickPreviewDetail}>{inviterInfo?.code}</a>
           </p>
         </Col>
       </Row>

src/pages/procurement/callForBids/readyCheckedConfirmFirst/detail/index.less

+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readyCheckedConfirmSecond/detail/index.less

+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readyConfirmBid/detail/index.less

+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readyExpertRemark/detail/index.less

@@ -7,3 +7,19 @@
   font-size: 12px;
   color: #909399;
 }
+
+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readyPassBid/detail/index.less

+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readySendBidNotice/detail/index.less

@@ -33,3 +33,20 @@
 
   }
 }
+
+
+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.less

@@ -95,7 +95,7 @@
         position: absolute;
         right: 0;
         top: 0;
-        height: 12px;
+        height: 16px;
         font-size: 12px;
         font-weight: 400;
         color: #00B37A;
@@ -105,7 +105,7 @@
       }
       .statusInfo {
         color: #5243AA;
-        background-color: #6554C0;
+        background: rgba(101,84,192,0.12);
       }
       .statusReceive {
         color: #2266EE;

src/pages/procurement/callForBids/readySubmitReport/detail/index.less

@@ -7,3 +7,19 @@
   font-size: 12px;
   color: #909399;
 }
+
+.cardWrap {
+  :global {
+    .ant-radio-button-wrapper:hover {
+      color: #606266;
+    }
+    .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+      color: #fff;
+      background: #6B778C;
+      border-color: #6B778C;
+    }
+    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+      background-color: #6B778C;
+    }
+  }
+}

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

@@ -15,7 +15,7 @@ import {
 import { Annotation } from 'bizcharts/lib'
 import moment from 'moment';
 import { BidInStateTexts, BidOutStateTexts, PURCHASE_TYPE, TenderInStateTexts, TenderOutStateTexts } from '@/constants/procurement';
-
+import { history } from 'umi';
 /**
  * 描述信息列表
  */
@@ -480,10 +480,24 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
     }
   ]
 
+  /** 通过url字符串和apiType综合判断显示 */
+  const pathName = history.location.pathname
+  const showBasicInfo = () => {
+    // 待审核报名 待资格预审 待提交资格预审 显示招标信息
+    if(pathName.indexOf('readyCheckedRegister') !== -1 || pathName.indexOf('readyQualifityChecked') !== -1) {
+      return basicColumnList
+    }
+    // 招标大类显示招标信息 投标大类显示投标信息
+    if(apiType[apiType.length - 1] === 'r') {
+      return basicTenderColumnList
+    } else {
+      return basicColumnList
+    }
+  }
   /** 类型数据映射 */
   const Type_Data_Map = {
-    // 招标大类显示招标信息 投标大类显示投标信息
-    'basicInfo': apiType[apiType.length - 1] === 'r' ? basicTenderColumnList : basicColumnList,
+    // 'basicInfo': apiType[apiType.length - 1] === 'r' ? basicTenderColumnList : basicColumnList,
+    'basicInfo': showBasicInfo(),
     // 投标显示投标要求
     'bidNeed': apiType[apiType.length - 1] === 'r' ? tenderNeedList : callForNeedList,
     'registerNeed': registerNeedList,
@@ -597,7 +611,8 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
           {
             _data['isSend'] ? <>
               <p className={style.name}>尊敬的{_data.memberName}</p>
-              <p>贵公司参与了我公司《{data.projectName}》竞标。在我公司综合各投标单位的基本情况，并进行充分技术交流后，经评标委员会综合评定，贵公司未能中标。我公司对贵公司的积极参与和支持深表感谢!希望下次合作成功。</p>
+              {/* <p>贵公司参与了我公司《{data.projectName}》竞标。在我公司综合各投标单位的基本情况，并进行充分技术交流后，经评标委员会综合评定，贵公司未能中标。我公司对贵公司的积极参与和支持深表感谢!希望下次合作成功。</p> */}
+              <p>{ data?.winTenderThanksContent }</p>
               <p className={style.company}>{data.memberName}</p>
             </> : <p>贵公司此次未中标！非常感谢贵公司的积极参与，希望下次合作成功！</p>
           }

src/pages/procurement/tender/callForBidsSearch/model/useSelfTable.tsx

@@ -26,7 +26,7 @@ export const useSelfTable = () => {
         <EyePreview url={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${record.id}`}>
           {text}
         </EyePreview>
-        <div>{record['projectName']}</div>
+        <div style={{width: 240, whiteSpace: "nowrap", overflow: 'hidden', textOverflow: "ellipsis"}} title={record['projectName']}>{record['projectName']}</div>
       </>
     },
     // {

src/pages/trademark/addBrand.tsx

@@ -19,6 +19,7 @@ import { UPLOAD_TYPE } from '@/constants'
 import styles from './index.less'
 import { validatorByte } from '@/utils/regExp'
 import UploadImage from '@/components/UploadImage'
+import { getAuth } from '@/utils/auth'
 
 const { Step } = Steps;
 
@@ -68,6 +69,7 @@ const AddBrand: React.FC<{}> = () => {
   const [banSomeField, setBanSomeField] = useState<boolean>(false)
   const [isDisabledSave, setIsDisabledSave] = useState<boolean>(false)
   const [isDisabledCheck, setDisabledCheck] = useState<boolean>(true)
+  const { roles, memberRoleId } = getAuth() || {};
 
   useEffect(()=>{
     const { id } = history.location.query
@@ -198,7 +200,7 @@ const AddBrand: React.FC<{}> = () => {
       <Space direction="vertical" style={{width:'100%'}}>
         <Card headStyle={{borderBottom:'none'}} title="流程进度">
           <Steps progressDot current={currentStep}>
-            <Step title="提交审核" description="供应商" />
+            <Step title="提交审核" description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
             <Step title="审核品牌" description="平台" />
             <Step title="完成" description="" />
           </Steps>