调整路由

src/locales/zh-CN/menu.ts

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-13 14:08:50
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-09-29 20:36:12
+ * @LastEditTime: 2020-10-12 16:11:58
  */
 
 export default {
@@ -38,7 +38,8 @@ export default {
   'menu.exception.403': '403',
   'menu.exception.404': '404',
   'menu.exception.500': '500',
-  //商品能力
+
+  // 商品能力
   'menu.commodityAbility': '商品',
   'menu.commodityAbility.classAndProperty': '品类及属性',
   'menu.commodityAbility.classAndProperty.class': '品类',
@@ -62,11 +63,11 @@ export default {
   'menu.commodityAbility.commodity.addDirectChannel': '新建渠道直采商品',
   'menu.commodityAbility.commodity.modifyDirectChannel': '修改渠道直采商品',
   'menu.commodityAbility.commodity.viewDirectChannel': '渠道直采商品详情',
-
   'menu.commodityAbility.repositories': '仓位',
   'menu.commodityAbility.addRepository': '新建仓位',
   'menu.commodityAbility.adjustRepository': '仓位库存调拨',
   'menu.commodityAbility.viewRepository': '查看仓位库存',
+
   // 会员能力
   'menu.memberAbility': '会员',
   'menu.memberAbility.memberManage': '会员管理',
@@ -113,7 +114,8 @@ export default {
 
   // 交易能力
   'menu.tranactionAbility': '交易',
-  //电子合同
+
+  // 电子合同
   'menu.tranactionAbility.electronicContracts': '电子合同',
   'menu.tranactionAbility.electronicContracts.apply': '电子签章申请',
   'menu.tranactionAbility.electronicContracts.enterpriseCertified': '企业信息核验',
@@ -130,7 +132,8 @@ export default {
   'menu.tranactionAbility.goodsOffer.pendingReviewOne': '待审核询价单（一级）',
   'menu.tranactionAbility.goodsOffer.pendingReviewTwo': '待审核询价单（二级）',
   'menu.tranactionAbility.goodsOffer.pendingSubmit': '待提交询价单',
-  //进销存
+
+  // 进销存
   'menu.tranactionAbility.stockSellStorage': '进销存',
   'menu.tranactionAbility.stockSellStorage.warehouse': '仓库',
   'menu.tranactionAbility.stockSellStorage.addWarehouse': '新增仓库',
@@ -142,7 +145,7 @@ export default {
   'menu.tranactionAbility.transactionRules': '交易规则',
   'menu.tranactionAbility.addRule': '新增交易规则',
 
-  //需求发布
+  // 需求发布
   'menu.tranactionAbility.enquirySubmit': '需求发布',
   'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询',
 
@@ -156,17 +159,25 @@ export default {
   // 采购订单
   'menu.tranactionAbility.purchaseOrder': '采购订单',
   'menu.tranactionAbility.purchaseOrder.purchaseOrderSearch': '订单查询',
+  'menu.tranactionAbility.purchaseOrder.addPurchaseOrder': '新增订单',
+  'menu.tranactionAbility.purchaseOrder.editPurchaseOrder': '编辑订单',
   'menu.tranactionAbility.purchaseOrder.readyAddOrder': '待新增订单',
   'menu.tranactionAbility.purchaseOrder.orderDetail': '订单详情',
   'menu.tranactionAbility.purchaseOrder.orderPreview': '查看订单',
   'menu.tranactionAbility.purchaseOrder.firstApprovedOrder': '待审核订单（一级）',
+  'menu.tranactionAbility.purchaseOrder.firstApprovedOrderDetail': '待审核订单（一级）详情',
   'menu.tranactionAbility.purchaseOrder.secondApprovedOrder': '待审核订单（二级）',
-  'menu.tranactionAbility.purchaseOrder.readyConfirmContract': '待确认电子合同',
+  'menu.tranactionAbility.purchaseOrder.secondApprovedOrderDetail': '待审核订单（二级）详情',
   'menu.tranactionAbility.purchaseOrder.readySubmitOrder': '待提交订单',
-  'menu.tranactionAbility.purchaseOrder.readyFileOrder': '待归档订单',
-  'menu.tranactionAbility.purchaseOrder.readyReceiveOrder': '待收货订单',
+  'menu.tranactionAbility.purchaseOrder.readySubmitOrderDetail': '待提交订单详情',
+  'menu.tranactionAbility.purchaseOrder.readyConfirmContract': '待确认电子合同',
+  'menu.tranactionAbility.purchaseOrder.readyConfirmContractDetail': '待确认电子合同详情',
   'menu.tranactionAbility.purchaseOrder.readyPayOrder': '待支付订单',
+  'menu.tranactionAbility.purchaseOrder.readyPayOrderDetail': '待支付订单详情',
   'menu.tranactionAbility.purchaseOrder.addPurchaseWarehouseOrder': '待新增入库单',
+  'menu.tranactionAbility.purchaseOrder.readyReceiveOrder': '待收货订单',
+  'menu.tranactionAbility.purchaseOrder.readyFileOrder': '待归档订单',
+  'menu.tranactionAbility.purchaseOrder.readyFileOrderDetail': '待归档订单详情',
 
   // 销售订单
   'menu.tranactionAbility.saleOrder': '销售订单',
@@ -183,7 +194,6 @@ export default {
   'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrder': '待确认发货订单',
   'menu.tranactionAbility.saleOrder.readyConfirmReturnOrder': '待确认回单',
   'menu.tranactionAbility.saleOrder.readyReturnDocument': '待确认归档',
-  
 
   //需求报价
   'menu.tranactionAbility.enquiryOffer': '需求报价',
@@ -205,7 +215,6 @@ export default {
   'menu.tranactionAbility.enquiryOfferConfirm.viewEnquiryDetail':'报价单详情',
   'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearch':'待确认报价单',
   
-  
   // 供应商评价
   'menu.tranactionAbility.supplierEvaluation': '供应会员评价管理',
   'menu.tranactionAbility.supplierEvaluation.unevaluated': '待评价订单',
@@ -222,7 +231,7 @@ export default {
   'menu.tranactionAbility.purchaserEvaluation.received': '收到的评价',
   'menu.tranactionAbility.purchaserEvaluation.sent': '发出的评价',
 
-  //物流能力
+  // 物流能力
   'menu.logisticsAbility': '物流',
   'menu.logisticsAbility.logistics': '物流管理',
   'menu.logisticsAbility.logistics.company': '物流公司管理',

src/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder/model/useSelfTable.tsx

@@ -31,9 +31,14 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
-        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
-        {text}
-        </EyePreview>
+        return (
+          // <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
+          //   {text}
+          // </EyePreview>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+            {text}
+          </EyePreview>
+        )
       }
     },
     {

src/pages/transaction/purchaseOrder/addReadyAddOrder/index.tsx

+import React from 'react';
+
+const AddReadyAddOrder: React.FC = () => {
+  return (
+    <div>
+      新增采购订单
+    </div>
+  );
+};
+
+export default AddReadyAddOrder;
\ No newline at end of file

src/pages/transaction/purchaseOrder/constant/index.tsx

@@ -13,9 +13,14 @@ export const baseOrderListColumns: any[] = [
     key: 'orderNo',
     render: (text, record) => {
       // 查看订单, 需根据状态显示不同schema
-      return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
-      {text}
-      </EyePreview>
+      return (
+        // <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
+        //   {text}
+        // </EyePreview>
+        <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+          {text}
+        </EyePreview>
+      )
     },
     ellipsis: true,
   },

src/pages/transaction/purchaseOrder/editReadyAddOrder/index.tsx

+import React from 'react';
+
+const EditReadyAddOrder: React.FC = () => {
+  return (
+    <div>
+      编辑采购订单
+    </div>
+  );
+};
+
+export default EditReadyAddOrder;
\ No newline at end of file

src/pages/transaction/purchaseOrder/firstApprovedOrder/detail/index.tsx

+import React from 'react';
+
+const FirstApprovedOrderDetail: React.FC = () => {
+  return (
+    <div>
+      待一级审核详情
+    </div>
+  );
+};
+
+export default FirstApprovedOrderDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/firstApprovedOrder/model/useSelfTable.tsx

@@ -14,7 +14,8 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.interiorState === PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=${PURCHASE_ORDER_STATUS.ONE_LEVEL_APPROVED_ORDER}`)
+      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=${PURCHASE_ORDER_STATUS.ONE_LEVEL_APPROVED_ORDER}`)
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail?id=${record.id}`)
     }
     // await PublicApi.postOrderQuotationBeReviewed({id})
     // ref.current.reload()

src/pages/transaction/purchaseOrder/readyAddOrder/index.tsx

@@ -89,7 +89,14 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
         }}
         formilyChilds={{
           children: <Space>
-            <Button icon={<PlusCircleOutlined/>} type='primary' onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/orderDetail')}>新建</Button>
+            <Button 
+              icon={<PlusCircleOutlined/>} 
+              type='primary' 
+              // onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/orderDetail')}
+              onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/add')}
+            >
+                新建
+            </Button>
             <Button onClick={handleBitchPush}>批量提交审核</Button>
             <DropDeleteDown>
               <Menu onClick={(e) => handleMenuClick(e)}>

src/pages/transaction/purchaseOrder/readyAddOrder/model/useReadyAddOrder.tsx

@@ -23,7 +23,8 @@ export const useSelfTable = () => {
   }
 
   const handleEdit = (id) => {
-    history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=0&id=${id}&preview=0`)
+    // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=0&id=${id}&preview=0`)
+    history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/edit?id=${id}`)
   }
 
   const handleCancel = async (id) => {

src/pages/transaction/purchaseOrder/readyConfirmContract/detail/index.tsx

+import React from 'react';
+
+const ReadyConfirmContractDetail: React.FC = () => {
+  return (
+    <div>
+      待确认电子合同详情
+    </div>
+  );
+};
+
+export default ReadyConfirmContractDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/readyConfirmContract/model/useSelfTable.tsx

@@ -10,7 +10,8 @@ export const useSelfTable = () => {
   const handleConfirm = async (record) => {
     //@todo 是否签约电子签章, 如果没有，需跳转至签约页面
     if (isSign) {
-      history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
+      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/detail?id=${record.id}`)
     } else {
       // 未认证
       Modal.confirm({

src/pages/transaction/purchaseOrder/readyFileOrder/detail/index.tsx

+import React from 'react';
+
+const ReadyFileOrderDetail: React.FC = () => {
+  return (
+    <div>
+      待归档订单详情
+    </div>
+  );
+};
+
+export default ReadyFileOrderDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/readyFileOrder/model/useSelfTable.tsx

@@ -13,7 +13,8 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=7`)
+      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=7`)
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/detail?id=${record.id}`)
     }
   }
   const secondColumns: any[] = baseOrderListColumns.concat([

src/pages/transaction/purchaseOrder/readyPayOrder/detail/index.tsx

+import React from 'react';
+
+const ReadyPayOrderDetail: React.FC = () => {
+  return (
+    <div>
+      待支付订单详情
+    </div>
+  );
+};
+
+export default ReadyPayOrderDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/readyPayOrder/model/useSelfTable.tsx

@@ -64,9 +64,14 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
-        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=-1&id=${record.id}&preview=1`}>
-          {text}
-        </EyePreview>
+        return (
+          // <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=-1&id=${record.id}&preview=1`}>
+          //   {text}
+          // </EyePreview>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+            {text}
+          </EyePreview>
+        )
       }
     },
     {
@@ -128,7 +133,9 @@ export const useSelfTable = () => {
         <Row justify='space-between'>
           <Col>{record.currentPayments} / {record.sum}</Col>
           <Col>
-            {record.currentPayments !== record.sum && showOutPayState}<Link to={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=5&id=${record.id}&preview=0`}>去支付</Link>
+            {record.currentPayments !== record.sum && showOutPayState}
+            {/* <Link to={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=5&id=${record.id}&preview=0`}>去支付</Link> */}
+            <Link to={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.id}`}>去支付</Link>
           </Col>
         </Row>
         <Progress percent={Math.ceil(record.currentPayments / record.sum)} showInfo={false} />

src/pages/transaction/purchaseOrder/readySubmitOrder/detail/index.tsx

+import React from 'react';
+
+const ReadySubmitOrderDetail: React.FC = () => {
+  return (
+    <div>
+      待提交订单详情
+    </div>
+  );
+};
+
+export default ReadySubmitOrderDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/readySubmitOrder/model/useSelfTable.tsx

@@ -11,7 +11,8 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
   const handleSubmit = async (id) => {
-    history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${id}&preview=0&page_type=3`)
+    // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${id}&preview=0&page_type=3`)
+    history.push(`/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail?id=${id}&preview=0`)
   }
 
   // 取消订单

src/pages/transaction/purchaseOrder/secondApprovedOrder/detail/index.tsx

+import React from 'react';
+
+const SecondApprovedOrderDetail: React.FC = () => {
+  return (
+    <div>
+      待二级审核详情
+    </div>
+  );
+};
+
+export default SecondApprovedOrderDetail;
\ No newline at end of file

src/pages/transaction/purchaseOrder/secondApprovedOrder/model/useSelfTable.tsx

@@ -10,7 +10,8 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const handleSubmit = async (record) => {
     if (record.interiorState === PurchaseOrderInsideWorkState.TWO_LEVEL_AUDIT_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
+      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail?id=${record.id}`)
     }
   }
   const secondColumns: any[] = baseOrderListColumns.concat([

src/pages/transaction/purchaseOrder/utils/index.ts

@@ -24,6 +24,9 @@ export const changeRouterTitleByStatus = () => {
 
 // 找到最后一个可用的工作流状态的索引
 export const findLastIndexFlowState = (data: any[]) => {
+  if (!Array.isArray(data)) {
+    return 0
+  }
   for (let item = 0; item < data.length; item++) {
     if (data[item].isExecute === 0) {
       return item > 0 ? --item : 0