Merge branch 'zwpFix' into dev

package.json

@@ -18,6 +18,7 @@
     "build:analyze": "ANALYZE=1 umi build",
     "build:clean": "umi build",
     "build:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn build",
+    "build:all": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn build",
     "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn build",
     "build:25": "cross-env SITE_ID=352 BACK_GATEWAY=http://10.0.0.25:8100 SOCKET_URL=ws://10.0.0.25:9400 yarn build",
     "postinstall": "umi generate tmp",

src/components/AuditProcess/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-15 17:48:36
  * @LastEditors: zwp
- * @LastEditTime: 2020-12-01 18:12:54
+ * @LastEditTime: 2021-01-06 10:54:54
  * @Description: 内外部流转记录组件
  */
 import React from 'react';
@@ -16,8 +16,16 @@ import styles from './index.less';
 interface AuditProcessProp {
   outerVerifyCurrent?: number;
   innerVerifyCurrent?: number;
-  outerVerifySteps?: { step: number, stepName: string, roleName: string }[];
-  innerVerifySteps?: { step: number, stepName: string, roleName: string }[];
+  outerVerifySteps?: {
+    step: number,
+    stepName: string,
+    roleName: string,
+  }[];
+  innerVerifySteps?: {
+    step: number,
+    stepName: string,
+    roleName: string,
+   }[];
   customTitleKey?: string
   customKey?: string
 };
@@ -41,6 +49,7 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
                 key={customKey ? item[customKey] : item.step}
                 title={customTitleKey ? item[customTitleKey] : item.stepName}
                 description={item.roleName}
+                status={item["isExecute"] ? "finish" : "wait"}
               />
             ))}
           </Steps>
@@ -55,6 +64,7 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
                 key={customKey ? item[customKey] : item.step}
                 title={customTitleKey ? item[customTitleKey] : item.stepName}
                 description={item.roleName}
+                status={item["isExecute"] ? "finish" : "wait"}
               />
             ))}
           </Steps>

src/pages/orderSystem/orderDetail/components/orderMergeInfo/index.less

@@ -67,6 +67,8 @@
 
     .invoice_list_item_btn {
       margin: 0 10px;
+      color: @main-color;
+      cursor: pointer;
     }
   }
 }

src/pages/orderSystem/orderDetail/components/orderMergeInfo/index.tsx

 import React, { useContext, useEffect, useState, useMemo } from 'react'
-import { Row, Col, Tag } from 'antd'
+import { Row, Col, Tag, Modal } from 'antd'
 import MellowCard from '@/components/MellowCard'
 import { OrderDetailContext } from '../../context'
 import { formatTimeString } from '@/utils'
@@ -29,25 +29,6 @@ const payInfo = [
   { title: '运费', name: 'freight' }
 ]
 
-const otherInfo = [
-  { title: '发票', name: 'theInvoiceInfo', render: item => <div className={style.invoice_list_item}>
-    <div className={style.invoice_list_item_content}>
-      <div className={cx(style.invoice_list_item_content_tag, item.kind !== 1 ? style.special : '')}>{item.kind === 1 ? '增值税普通发票' : '增值税专用发票'}</div>
-      <div className={style.invoice_list_item_content_name}>
-        <div>{item.invoiceTitle}</div>
-        <div>{item.taxNo}</div>
-      </div>
-    </div>
-    {
-      <div className={style.invoice_list_item_btn_group}>
-        {/* 查看功能todo */}
-        {/* <div className={style.invoice_list_item_btn}>查看</div> */}
-      </div>
-    }
-  </div>, resetCol: {flex: '1 1 100%'} },
-  { title: '包装要求', name: 'pageRequire' },
-  { title: '其他要求', name: 'restsRequire' },
-]
 
 const electronInfo = [
   { title: '电子合同', name: 'none' },
@@ -60,11 +41,33 @@ const RenderCard = ({ infoList, dataSource }) => infoList.map(v => dataSource[v.
 
 const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
   const orderDetailCtx = useContext(OrderDetailContext)
+  const [isModalVisible, setIsModalVisible] = useState(false)
   // const address = useMemo(async () => {
   //   const { data } = await PublicApi.getLogisticsSelectListReceiverAddress()
   //   return data
   // }, [])
   const { data, ctl } = orderDetailCtx
+  const {theInvoiceInfo} = data
+
+  const otherInfo = [
+    { title: '发票', name: 'theInvoiceInfo', render: item => <div className={style.invoice_list_item}>
+      <div className={style.invoice_list_item_content}>
+        <div className={cx(style.invoice_list_item_content_tag, item.kind !== 1 ? style.special : '')}>{item.kind === 1 ? '增值税普通发票' : '增值税专用发票'}</div>
+        <div className={style.invoice_list_item_content_name}>
+          <div>{item.invoiceTitle}</div>
+          <div>{item.taxNo}</div>
+        </div>
+      </div>
+      {
+        <div className={style.invoice_list_item_btn_group}>
+          {/* 查看功能todo */}
+          <div className={style.invoice_list_item_btn} onClick={()=>setIsModalVisible(true)}>查看 &gt;</div>
+        </div>
+      }
+    </div>, resetCol: {flex: '1 1 100%'} },
+    { title: '包装要求', name: 'pageRequire' },
+    { title: '其他要求', name: 'restsRequire' },
+  ]
 
   // useEffect(() => {
   //   if (data.deliveryAddresId && !data.receiverName) {
@@ -82,6 +85,7 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
   // }
 
   return (
+    <>
     <Row style={{ marginTop: 24 }} gutter={24}>
       <Col span={12}>
         <MellowCard title='交易信息' fullHeight>
@@ -110,6 +114,19 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
         </MellowCard>
       </Col>
     </Row>
+    <Modal title="发票信息" visible={isModalVisible} onOk={()=>setIsModalVisible(false)} onCancel={()=>setIsModalVisible(false)}>
+      <Row gutter={[0 ,10]} style={{fontSize: 14}}>
+        <Col span={4}>开具类型：</Col><Col span={20}>{theInvoiceInfo?.type === 1 ? "企业" : "个人"}</Col>
+        <Col span={4}>发票种类：</Col><Col span={20}>{theInvoiceInfo?.kind === 1 ? "增值税普通发票" : "增值税专用发票"}</Col>
+        <Col span={4}>发票抬头：</Col><Col span={20}>{theInvoiceInfo?.invoiceTitle}</Col>
+        <Col span={4}>纳税号：</Col><Col span={20}>{theInvoiceInfo?.taxNo}</Col>
+        <Col span={4}>开户行：</Col><Col span={20}>{theInvoiceInfo?.bankOfDeposit}</Col>
+        <Col span={4}>账号：</Col><Col span={20}>{theInvoiceInfo?.account}</Col>
+        <Col span={4}>地址：</Col><Col span={20}>{theInvoiceInfo?.addres}</Col>
+        <Col span={4}>电话：</Col><Col span={20}>{theInvoiceInfo?.tel}</Col>
+      </Row>
+    </Modal>
+    </>
   )
 }
 

src/pages/orderSystem/orderDetail/components/orderProductTable/index.tsx

@@ -391,7 +391,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       dataIndex: 'memberPrice',
       align: 'center',
       key: 'memberPrice',
-      render: (text, record) => record.isMemberPrice ? (text * 100 + '%') : null
+      render: (text, record) => record.isMemberPrice ? (text * 10000 / 100 + '%') : null
     },
     {
       title: creditsCommodity ? '兑换数量' : '采购数量',