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

config/routes/authConfigRoute.ts

@@ -119,7 +119,13 @@ const AuthConfigRoute: RouterChild = {
       component: '@/pages/accountSetting/editAccount',
       hideInMenu: true,
     },
-    //
+    //消息中心
+    {
+      path: '/memberCenter/systemSetting/message',
+      name: 'message',
+      component: '@/pages/systemSetting/message'
+    },
+    
   ],
 
 }

config/routes/index.ts

@@ -39,6 +39,7 @@ const memberCenterRoute = {
       icon: 'smile',
       key: 'home',
       component: '@/pages/index',
+      // component: '@/pages/home',
     },
     ...routes,
     {

src/locales/zh-CN/menu.ts

@@ -452,6 +452,8 @@ export default {
   'menu.systemSetting.accountSetting': '账号安全设置',
   'menu.systemSetting.editAccount': '编辑账号信息',
 
+  'menu.systemSetting.message': '消息中心',
+
   // 加工能力, assign 指的是 指派生产通知单
   'menu.handling': '加工',
   'menu.handling.assign': '指派生产通知单',

src/pages/commodity/products/addProductsItem/basicInfoForm.tsx

@@ -227,7 +227,8 @@ const BasicInfoForm: React.FC<Iprops> = (props) => {
       >
         <Cascader
           allowClear={false}
-          disabled={!isUpdateAttribute}
+          // disabled={!isUpdateAttribute}
+          disabled={history.location.query?.id}
           options={customerCategoryTree}
           fieldNames={{ label: 'title', value: 'id', children: 'children' }}
           onChange={onCustomerCategoryChange}

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -551,7 +551,6 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
 
   // 校验阶梯范围
   const validatorNumberRange = (rule, value, callback) => {
-    console.log(value,'v')
     try {
       if(Array.isArray(value)){
         let range = value.map(item => {
@@ -563,7 +562,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
           },
           []
         )
-        let result = range.reduce((a, b) => { if(a<b) return b })
+        let result = range.map(Number).reduce((a, b) => { if(a<b) return b })
         if(!result) throw new Error('请正确输入阶梯数量范围');
         if(range[0]!==minOrderNumber) throw new Error('阶段的起始值必须为最小起订数');
         callback()

src/pages/home/index.less

+.homeGuide{
+  background-color: @main-color;
+  border-radius: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 90px;
+  color: white;
+  position: relative;
+  .gridStyle{
+    display: flex;
+    flex: 1;
+    justify-content: space-between;
+    align-items: center;
+    border-right: 1px solid rgba(255, 255, 255, 0.2);
+    height: 90px;
+    p{
+      font-size: 12px;
+      font-weight: 400;
+      margin-left: 24px;
+      margin-bottom: 0;
+      padding: 0 0 8px 0;
+      line-height: 1;
+      vertical-align: middle;
+    }
+    .firstp{
+      height: 24px;
+      line-height: 24px;
+    }
+    .guideTitle{
+      font-size: 14px;
+      font-weight: 400;
+    } 
+    .guideIcon{
+      font-size: 14px;
+      margin-right: 27px;
+    }
+    .guideIconFirst{
+      font-size: 24px;
+      vertical-align: bottom;
+    }
+  }
+  .gridStyleFirst{
+    flex: 0 0 16%;
+  }
+  .guideClose{
+    width: 56px;
+    height: 20px;
+    background: rgba(0, 0, 0, 0.2);
+    border-radius: 0px 8px 0px 8px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    cursor: pointer;
+    text-align: center;
+  }
+  
+  &::after {
+    border-left: 8px solid transparent;
+    border-right: 8px solid transparent;
+    border-top: 8px solid #6B778C;
+    content: "";
+    position: absolute;    
+    right: 18px;
+    bottom: -7px;
+  }
+}
+
+.giudeMenuBox{
+  border-radius: 5px;
+  padding: 16px;
+  background-color: #fff;
+  flex: 0 0 16%;
+  //重写步骤条
+  :global{
+    .ant-steps-vertical.ant-steps-dot .ant-steps-item .ant-steps-icon-dot{
+      border: 1px solid #DFE1E6;
+      background-color: #fff;
+    }
+    .ant-steps-vertical > .ant-steps-item > .ant-steps-item-container > .ant-steps-item-tail::after{
+      background-color: #fff;
+      border-right: 1px dashed #DFE1E6;
+    }
+  }
+}
\ No newline at end of file

src/pages/home/index.tsx

+import React, { useState, useEffect } from 'react'
+import { Button, Card, Space, Steps, Dropdown, Radio, Row, Col, Table, Tabs, Tag, Avatar, Image, List, Badge, Menu } from 'antd'
+import cx from 'classnames'
+
+import styles from './index.less'
+import StatusTag from '@/components/StatusTag'
+import { CaretUpOutlined, CompassFilled, CompassOutlined, RightCircleFilled, RightOutlined, UpOutlined } from '@ant-design/icons'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+
+const { Step } = Steps;
+
+const Home: React.FC<{}> = () => {
+
+  const menu = (
+    <div className={styles.giudeMenuBox}>
+        <Steps progressDot current={1000} direction="vertical">
+          <Step title="定义产品功能" description={<><p>开发第一步，标准功能、自定义功能及云功能编辑</p><a href="">如何定义</a></>} />
+          <Step title="定义产品功能" description={<><p>开发第一步，标准功能、自定义功能及云功能编辑</p><a href="">如何定义</a></>} />
+          <Step title="定义产品功能" description={<><p>开发第一步，标准功能、自定义功能及云功能编辑</p><a href="">如何定义</a></>} />
+          <Step title="定义产品功能" description={<><p>开发第一步，标准功能、自定义功能及云功能编辑</p><a href="">如何定义</a></>} />
+          <Step title="定义产品功能" description={<><p>开发第一步，标准功能、自定义功能及云功能编辑</p><a href="">如何定义</a></>} />
+        </Steps>
+    </div>
+  );
+
+  return (
+    <PageHeaderWrapper>
+      <Space direction="vertical" style={{width:'100%'}}>
+        <Row>
+          <Col span={24}>
+            <div className={styles.homeGuide}>
+              <div className={cx(styles.gridStyle, styles.gridStyleFirst)}>
+                <p className={styles.firstp}>
+                  <CompassFilled className={styles.guideIconFirst} />
+                  <span>&nbsp;使用向导</span>
+                </p>
+              </div>
+              <Dropdown overlay={menu}>
+                <div className={styles.gridStyle}>
+                  <div>
+                    <p className={styles.guideTitle}>1.新建商品</p>
+                    <p className={styles.guideDesc}>三分钟智能化，完成商品创建</p>
+                  </div>
+                  <UpOutlined className={styles.guideIcon} />
+                </div>
+              </Dropdown>
+              <Dropdown overlay={menu}>
+                <div className={styles.gridStyle}>
+                  <div>
+                    <p className={styles.guideTitle}>1.新建商品</p>
+                    <p className={styles.guideDesc}>三分钟智能化，完成商品创建</p>
+                  </div>
+                  <UpOutlined className={styles.guideIcon} />
+                </div>
+              </Dropdown>
+              <Dropdown overlay={menu}>
+                <div className={cx(styles.gridStyle, styles.gridStyleLast)}>
+                  <div>
+                    <p className={styles.guideTitle}>1.新建商品</p>
+                    <p className={styles.guideDesc}>三分钟智能化，完成商品创建</p>
+                  </div>
+                  <UpOutlined className={styles.guideIcon} />
+                </div>
+              </Dropdown>
+              <div className={styles.guideClose}>
+                <p>关闭</p>
+              </div>
+            </div>
+          </Col>
+        </Row>
+      </Space>
+    </PageHeaderWrapper>
+  )
+}
+
+export default Home

src/pages/systemSetting/message/index.less

+.customList{
+  :global{
+    .ant-list-item-meta{
+      align-items: center;
+    }
+  }
+  .messageText{
+    font-size: 14px;
+    font-weight: 400;
+    color: #606266;
+  }
+  .messageTitle{
+    margin: 0 30px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #303133;
+  }
+}
\ No newline at end of file

src/pages/systemSetting/message/index.tsx

+import React from 'react';
+import { history } from 'umi';
+import { Button, Row, Col, Card, List, Avatar } from 'antd';
+import styles from './index.less'
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { PlusOutlined } from '@ant-design/icons';
+import StatusTag from '@/components/StatusTag';
+
+const Message: React.FC<{}> = () => {
+
+  const data = [
+    {
+      id: 1,
+      icon: '',
+      status: 'success',
+      type: '系统消息',
+      title: '订单发货',
+      message: '订单发货，请注意查收，清单发货，请注意查收！',
+      time: '2015-15-05',
+    },
+    {
+      id: 2,
+      icon: '',
+      status: 'success',
+      type: '系统消息',
+      title: '订单收货',
+      message: '订单发货，请注意查收，清单发货，请注意查收！',
+      time: '2015-15-05',
+    },
+    {
+      id: 3,
+      icon: '',
+      status: 'primary',
+      type: '系统消息',
+      title: '系统消息',
+      message: '账户异常，请注意账户资金安全！',
+      time: '2015-15-05',
+    },
+    {
+      id: 4,
+      icon: '',
+      status: 'primary',
+      type: '系统消息',
+      title: '系统消息',
+      message: '账户支出300元，请注意账户资金安全！',
+      time: '2015-15-05',
+    },
+  ];
+
+  const renderMessage = (data) => {
+
+    return (
+      <>
+        <StatusTag type={data.status} title={data.type} />
+        <span className={styles.messageTitle}>{data.title}</span>
+        <span className={styles.messageText}>{data.message}</span>
+      </>
+    )
+  }
+
+  const showTotal = (total) => {
+    return `共 ${total} 条`;
+  }
+
+  return (
+    <PageHeaderWrapper>
+      <Card
+        title="消息列表"
+      > 
+        <List
+          itemLayout="horizontal"
+          dataSource={data}
+          className={styles.customList}
+          pagination={{
+            onChange: page => {
+              console.log(page);
+            },
+            pageSize: 10,
+            size: "small",
+            showQuickJumper: true,
+            total: 4,
+            showTotal: showTotal
+          }}
+          renderItem={item => (
+            <List.Item>
+              <List.Item.Meta
+                avatar={<Avatar src={item.icon} />}
+                title={renderMessage(item)}
+              />
+              <div>{item.time}</div>
+            </List.Item>
+          )}
+        />
+      </Card>
+    </PageHeaderWrapper>
+  )
+}
+
+export default Message;

src/pages/transaction/_public/order/effects/useOrderDetail.tsx

@@ -7,6 +7,7 @@ import { GlobalConfig } from '@/global/config'
 import { orderTypeLabel } from '../constant'
 import { formatTimeString } from '@/utils'
 import StatusColors from '../../../components/StatusColors'
+import { message } from 'antd'
 
 interface OrderDetailHookProps {
   // 采购、销售
@@ -42,9 +43,11 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
   const reloadFormData = useCallback(() => {
     if (id) {
       const fn = type === 'purchaseOrder' ? PublicApi.getOrderProcurementOrderDetails : PublicApi.getOrderPurchaseOrderDetails
-      fn({ id }).then(({ data, code }) => {
-        if (code === 1000) {
-          setFormData(data)
+      fn({ id }, { ctlType: "none" }).then(res => {
+        if (res.code === 1000) {
+          setFormData(res.data)
+        } else {
+          message.error(res.message)
         }
       })
     }