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

config/routes/handlingRoute.ts

@@ -50,7 +50,7 @@ const HandlingRoute = {
           path: '/memberCenter/handling/assign/tobeAddQuery/add',
           name: '新增成产通知单（新建）',
           icon: 'smile',
-          component: '@/pages/handling/assign/add',
+          component: '@/pages/handling/assign/create',
           hideInMenu: true
         },
         // 指派生产通知单 -> 待新增生产通知单详情
@@ -67,7 +67,7 @@ const HandlingRoute = {
           path: '/memberCenter/handling/assign/tobeAddQuery/edit',
           name: '修改',
           icon: 'smile',
-          component: '@/pages/handling/assign/add',
+          component: '@/pages/handling/assign/create',
           hideInMenu: true
         },
         // 指派生产通知单 -> 待审核通知单（一级）

src/layouts/BasicLayout.tsx

@@ -60,6 +60,8 @@ const defaultFooterDom = (
   />
 );
 
+const DEFAULT_COLLAPSED_LIST = ["/memberCenter/home", "/memberCenter/noAuth"];
+
 const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const {
     // dispatch,
@@ -77,7 +79,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const isHome = location.pathname === '/memberCenter/home'
 
   const handleMenuCollapse = (payload: boolean): void => {
-    if(isHome) {
+    if(DEFAULT_COLLAPSED_LIST.includes(location.pathname)) {
       return ;
     }
     setCollapsed(payload)
@@ -137,7 +139,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   }, [currentRouter, collapsed])
 
   useLayoutEffect(() => {
-    if(isHome) {
+    if(DEFAULT_COLLAPSED_LIST.includes(location.pathname)) {
       setCollapsed(true)
     } else {
       setCollapsed(false);
@@ -165,7 +167,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         </Link>
       )}
       collapsed={collapsed}
-      collapsedButtonRender={(flag) => (isHome ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
+      collapsedButtonRender={(flag) => (DEFAULT_COLLAPSED_LIST.includes(location.pathname) ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
       onCollapse={handleMenuCollapse}
       disableContentMargin={currentRouter?.noMargin !== undefined}
       breadcrumbRender={(routers = []) => [

src/layouts/components/MenuSlider.tsx

@@ -73,10 +73,10 @@ const MenuSlider: React.FC<MenuSliderProps> = (props) => {
   const handleOpenchange = (keys: string[]) => {
     changeOpenKeys(keys)
   }
-
+  /** @tofix 这里体验不好，不太明白点击子路由的时候为什么需要去reload */
   const clickMenuItem = ({ item, key, keyPath, domEvent }) => {
     // 对比url和点击项的key 相同的话重载页面 并清空筛选的store
-    if(key === currentSelectKey[currentSelectKey.length-1]) {
+    if(key === pathname) {
       clearHeightSearchParams()
       window.location.reload()
     }

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/member/memberWarning/dashboard/components/WarningArea/index.tsx

@@ -75,7 +75,7 @@ const WarningArea = () => {
           <div className={styles.radioContainer}>
             <CustomizeRadio options={warningOptions} />
           </div>
-          <RecordList height={384} />
+          <RecordList height={384} dataSource={[]}/>
         </div>
       </div>
     </Card>

src/pages/member/memberWarning/dashboard/components/WarningArea/mapChart.tsx

@@ -10,68 +10,42 @@ import Geom from 'bizcharts/lib/geometry'
 import * as turf from '@turf/turf';
 import DataSet from '@antv/data-set';
 
-interface Iprops {
-  mapData: any,
 
+type PropertiesType = {
+  acroutes: [100000],
+  adchar: null,
+  adcode: "110000",
+  center: number[],
+  centroid: number[],
+  childrenNum: number
+  level: string,
+  name: string,
+  parent: {
+    adcode: number,
+  },
+  subFeatureIndex: number,
+  /** 值 */
+  size: number,
 }
-
-function keepMapRatio(mapData, c, type) {
-	if (mapData && turf) {
-		// 获取数据外接矩形，计算宽高比
-		const bbox = turf.bbox(mapData);
-		const width = bbox[2] - bbox[0];
-		const height = bbox[3] - bbox[1];
-		const ratio = height / width;
-
-		const cWidth = c.width;
-		const cHeight = c.height;
-		const cRatio = cHeight / cWidth;
-
-		let scale = {};
-
-		if (cRatio >= ratio) {
-			const halfDisRatio = (cRatio - ratio) / 2 / cRatio;
-			scale = {
-				x: {
-					range: [0, 1],
-				},
-				y: {
-					range: [halfDisRatio, 1 - halfDisRatio],
-				},
-			};
-		} else {
-			const halfDisRatio = ((1 / cRatio - 1 / ratio) / 2) * cRatio;
-			scale = {
-				y: {
-					range: [0, 1],
-				},
-				x: {
-					range: [halfDisRatio, 1 - halfDisRatio],
-				},
-			};
-		}
-		const curScaleXRange = c.getScaleByField('x').range;
-		const curScaleYRange = c.getScaleByField('y').range;
-		console.log(curScaleYRange, scale.y.range);
-		if (
-			curScaleXRange[0] !== scale.x.range[0] ||
-			curScaleXRange[1] !== scale.x.range[1] ||
-			curScaleYRange[0] !== scale.y.range[0] ||
-			curScaleYRange[1] !== scale.y.range[1]
-		) {
-			setTimeout(() => {
-				c.scale(scale);
-				c.render(true);
-			}, 1);
-		}
-	}
+interface Iprops {
+  mapData: {
+    type: "FeatureCollection",
+    features: {
+      geometry: {
+        coordinates: [],
+        type: "MultiPolygon",
+      },
+      properties: PropertiesType,
+      type: "Feature"
+    }
+  },
 }
 
-const colors = '#075A84,#3978A4,#6497C0,#91B6D7,#C0D6EA,#F2F7F8'
-	.split(',')
-	.reverse();
-
-
+type SelectEleType = {
+  /** 省名 */
+  name: string,
+  properties: PropertiesType
+}
 
 const MapChart: React.FC<Iprops> = (props: Iprops) => {
   // const [mapData, setMapData] = useState(undefined)
@@ -103,6 +77,13 @@ const MapChart: React.FC<Iprops> = (props: Iprops) => {
 		x: { sync: true },
 		y: { sync: true },
 	};
+
+  const onSelectProvince = (e: any) => {
+    const { data } = e;
+    const elementData = data.data as SelectEleType;
+    console.log(elementData)
+  }
+
   return (
     <div style={{ background: '#FAFBFC'}}>
       <Chart
@@ -115,9 +96,11 @@ const MapChart: React.FC<Iprops> = (props: Iprops) => {
         autoFit
         placeholder={<div>Loading</div>}
         padding={[20, 0, 0, 0]}
-        onAfterRender={(e, c) => {
-          keepMapRatio(mapData, c, "rerender")
-        }}
+        // onAfterRender={(e, c) => {
+        //   keepMapRatio(mapData, c, "rerender")
+        // }}
+			  onPlotClick={onSelectProvince}
+
       >
         <Coord reflect="y" />
         <Tooltip title="name" />
@@ -125,12 +108,22 @@ const MapChart: React.FC<Iprops> = (props: Iprops) => {
           type="polygon"
           position="x*y"
           style={{
-            fill: '#EDEEEF',
             stroke: '#fff',
             lineWidth: 1,
             fillOpacity: 0.85,
           }}
-          color={['centroidY', '#777090-#493398']}
+          color={
+            ['properties', (v) => {
+              if (v.size > 220) {
+                  return '#F7A128'
+              } else if (v.size > 160) {
+                  return '#4B8BFA'
+              } else if (v.size > 80) {
+                  return '#E05A55'
+              }
+              return '#EDEEEF'
+            }]
+          }
           tooltip={[
             'name*properties',
             (t, p) => {
@@ -145,9 +138,9 @@ const MapChart: React.FC<Iprops> = (props: Iprops) => {
           state={{
             selected: {
               style: (t) => {
-                return { fill: 'purple', stroke: '#ccc',lineWidth:1 }
+                return { fill: 'purple', stroke: 'green',lineWidth:1 }
               }
-            }
+            },
           }}
         />
         <Interaction type='element-single-selected' />

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}