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

src/pages/commodity/products/modifyDirectChannel.tsx

@@ -491,7 +491,7 @@ const ModifyDirectChannel:React.FC<{}> = () => {
               label="会员折扣"
               valuePropName="checked"
             >
-              <Checkbox>允许使用会员折扣价购买</Checkbox>
+              <Checkbox disabled={priceTypeRef.current === 3}>允许使用会员折扣价购买</Checkbox>
             </Form.Item>
           </Form>
           <Button onClick={()=>setVisibleAddSpec(true)} style={{width:'100%', marginBottom: 24, backgroundColor: '#fafbfc'}}>

src/pages/member/memberQuery/detailed/basicInfo.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-01-06 11:36:35
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-07 17:06:17
+ * @LastEditTime: 2021-07-19 10:06:58
  * @Description: 会员基础信息详情
  */
 import React from 'react';
@@ -69,7 +69,8 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
       </Col>
       
       {/* 渠道信息 */}
-      {
+      {/* 平台录入的会员不需要填渠道信息的 */}
+      {/* {
         memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_CORPORATE
         || memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_INDIVIDUAL
           ? (
@@ -86,7 +87,7 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
             </Col>
           )
           : null
-      }
+      } */}
 
       {/* 其他注册信息 */}
       {

src/pages/member/memberQuery/detailed/index.tsx

@@ -112,15 +112,16 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
             key: 'basicInfo',
             name: '基本信息',
           },
-          (
-            memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_CORPORATE
-            || memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_INDIVIDUAL
-              ? {
-                key: 'channelInfo',
-                name: '渠道信息',
-              }
-              : null
-          ),
+          // // 平台录入的会员不需要填渠道信息的
+          // (
+          //   memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_CORPORATE
+          //   || memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_INDIVIDUAL
+          //     ? {
+          //       key: 'channelInfo',
+          //       name: '渠道信息',
+          //     }
+          //     : null
+          // ),
           ...(
             memberInfo && memberInfo.groups
               ? memberInfo.groups.map((item, index) => ({

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

@@ -92,7 +92,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
       console.log(dataSource, computedScore, dataBySort, 'computedScore')
 
       setEvaluationRecord(dataBySort)
-      // 线下评标或者线上评标但是没有去评 评分项Radio来自评标模板接口
+      // 线下评标 评分项Radio来自评标模板接口
       if(data?.templateId) {
         PublicApi.getPurchaseTemplateGetTemplate({id: data.templateId}).then(res => {
           const { code, data } = res
@@ -343,7 +343,10 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
           <h3 className="commonPanelTitle">评标记录</h3>
           <Radio.Group value={transferRadio} buttonStyle="solid" size="small" onChange={handleChangeType}>
             {
-              Object.keys(evaluationRecord).map((item, index) => (typeof item === "undefined" ? <Radio.Button key={index} value={index}>{item}</Radio.Button> : null))
+              data?.isOnlineEvaluation ?
+              Object.keys(evaluationRecord).map((item, index) => ( item === 'undefined' ? null : <Radio.Button key={index} value={index}>{item}</Radio.Button>))
+              :
+              templateSort.map((item, index) => <Radio.Button key={index} value={index}>{item['sort']}</Radio.Button>)
             }
           </Radio.Group>
         </div>
@@ -367,7 +370,8 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
               };
             });
 
-            if(transferRadio === index) {
+            // if(transferRadio === index) {
+            if(transferRadio === index || !data?.isOnlineEvaluation) {
               return <Table
                 key={index}
                 components={components}