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

config/routes/tranactionRoute/comfirmDemandPosts.ts

+/**
+ * @description: 确认需求报价
+ * @param {type}: preview-查看 detail-操作
+ * @return {type} 
+*/
+export default [
+  {
+    path: '/memberCenter/tranactionAbility/enquiryOfferConfirm',
+    name: 'enquiryOfferConfirm',
+    routes: [
+      // 报价单查询 - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch',
+        name: 'enquiryOfferSearch',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferSearch'
+      },
+      // 报价单查询 - 查看报价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/rfq/preview',
+        name: 'enquiryOfferSearchRfqPreview',
+        component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
+        hideInMenu: true,
+      },
+      // 报价单查询 - 查看询价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/inquiry/preview',
+        name: 'enquiryOfferSearchInquiryPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待提交审核报价单 - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit',
+        name: 'toSubmit',
+        component: '@/pages/transaction/enquiryOfferConfirm/toSubmit'
+      },
+      // 待提交审核报价单 - 查看报价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/rfq/preview',
+        name: 'toSubmitRfqPreview',
+        component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
+        hideInMenu: true,
+      },
+      // 待提交审核报价单 - 查看询价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/inquiry/preview',
+        name: 'toSubmitInquiryPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（一级） - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne',
+        name: 'enquiryOne',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryOne'
+      },
+      // 待审核报价单（一级） - 查看报价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/rfq/preview',
+        name: 'enquiryOneRfqPreview',
+        component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（一级） - 查看询价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/inquiry/preview',
+        name: 'enquiryOneInquiryPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（一级） - 详情
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/datail',
+        name: 'enquiryOneDatail',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryOne/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（二级） - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo',
+        name: 'enquiryTwo',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryTwo'
+      },
+      // 待审核报价单（二级） - 查看报价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/rfq/preview',
+        name: 'enquiryTwoRfqPreview',
+        component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（二级） - 查看询价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/inquiry/preview',
+        name: 'enquiryTwoInquiryPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核报价单（二级） - 详情
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/datail',
+        name: 'enquiryTwoDatail',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryTwo/detail',
+        hideInMenu: true,
+      },
+      // 待确认报价单 - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch',
+        name: 'enquiryOfferComfirmSearch',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch'
+      },
+      // 待确认报价单 - 查看报价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/rfq/preview',
+        name: 'enquiryOfferComfirmSearchRfqPreview',
+        component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
+        hideInMenu: true,
+      },
+      // 待确认报价单 - 查看询价单号
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/inquiry/preview',
+        name: 'enquiryOfferComfirmSearchInquiryPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待确认报价单 - 详情
+      {
+        path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/datail',
+        name: 'enquiryOfferComfirmSearchDatail',
+        component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail',
+        hideInMenu: true,
+      },
+    ]
+  }
+]
\ No newline at end of file

config/routes/tranactionRoute/demandPosts.ts

+/**
+ * @description: 需求发布
+ * @param {type}: preview-查看 detail-操作
+ * @return {type} 
+*/
+export default [
+  {
+    path: '/memberCenter/tranactionAbility/enquirySubmit',
+    name: 'enquirySubmit',
+    routes: [
+      // 需求单查询 - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquirySearch',
+        name: 'enquirySearch',
+        component: '@/pages/transaction/enquirySubmit/enquirySearch'
+      },
+      // 需求单查询 - 查看需求单号
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/preview',
+        name: 'enquirySearchPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待新建需求单 - 列表
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList',
+        name: 'toAddSubmitList',
+        component: '@/pages/transaction/enquirySubmit/toAddSubmit'
+      },
+      // 待新增需求单-新增
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/add',
+        name: 'addEnquiry',
+        component: '@/pages/transaction/enquirySubmit/toAddSubmit/detail', 
+        hideInMenu: true, 
+      }, 
+      // 待新增需求单-编辑
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/edit',
+        name: 'editEnquiry',
+        component: '@/pages/transaction/enquirySubmit/toAddSubmit/detail', 
+        hideInMenu: true, 
+      }, 
+      // 待新建需求单 - 查看需求单号
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/preview',
+        name: 'toAddSubmitListPreview',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待新建需求单 - 详情
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/detail',
+        name: 'toAddSubmitListDetail',
+        component: '@/pages/transaction/enquirySubmit/components/detail',
+        hideInMenu: true,
+      },
+      // 待审核需求单（一级）
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryOne',
+        name: 'enquiryOne',
+        component: '@/pages/transaction/enquirySubmit/enquiryOne'
+      }, 
+      // 待审核需求单（一级）- 查看需求单
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/preview',
+        name: 'enquiryOnePreview',
+        component: '@/pages/transaction/enquirySubmit/enquiryOne/detail', 
+        hideInMenu: true,
+      },
+      // 待审核需求单（一级）-详情
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/detail',
+        name: 'enquiryOneDetail',
+        component: '@/pages/transaction/enquirySubmit/enquiryOne/detail', 
+        hideInMenu: true,
+      },
+      // 待审核需求单（二级）
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo',
+        name: 'enquiryTwo',
+        component: '@/pages/transaction/enquirySubmit/enquiryTwo'
+      }, 
+      // 待审核需求单（二级）-查看需求单
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/preview',
+        name: 'enquiryTwoPreview',
+        component: '@/pages/transaction/enquirySubmit/enquiryTwo/detail', 
+        hideInMenu: true,
+      }, 
+      // 待审核需求单（二级）-详情
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/detail',
+        name: 'enquiryTwoDetail',
+        component: '@/pages/transaction/enquirySubmit/enquiryTwo/detail', 
+        hideInMenu: true,
+      }, 
+      // 待提交需求单
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toSubmit',
+        name: 'toSubmit',
+        component: '@/pages/transaction/enquirySubmit/toSubmit'
+      },
+      // 待提交需求单 - 查看需求单
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toSubmit/preview',
+        name: 'toSubmitPreview',
+        component: '@/pages/transaction/enquirySubmit/toSubmit/detail', 
+        hideInMenu: true,
+      }, 
+      // 待提交需求单-详情
+      {
+        path: '/memberCenter/tranactionAbility/enquirySubmit/toSubmit/detail',
+        name: 'toSubmitDetail',
+        component: '@/pages/transaction/enquirySubmit/toSubmit/detail', 
+        hideInMenu: true, 
+      },
+    ]
+  }
+]
\ No newline at end of file

config/routes/tranactionRoute/demandQduote.ts

+/**
+ * @description: 需求报价
+ * @param {type}: preview-查看 detail-操作
+ * @return {type} 
+*/
+export default [{
+  path: '/memberCenter/tranactionAbility/enquiryOffer',
+  name: 'enquiryOffer',
+  routes: [
+    // 需求单查询-列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquirySearch',
+      name: 'enquirySearch',
+      component: '@/pages/transaction/enquiryOffer/enquirySearch'
+    },
+    // 需求单查询-查看详情
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/preview',
+      name: 'enquirySearchPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 报价单查询-列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearch',
+      name: 'enquiryOfferSearch',
+      component: '@/pages/transaction/enquiryOffer/enquiryOfferSearch'
+    },
+    // 报价单查询-报价单号查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearch/rfq/preview',
+      name: 'enquiryOfferSearchRfqPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 报价单查询-需求单查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearch/demand/preview',
+      name: 'enquiryOfferSearchDemandPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待新建报价单-列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList',
+      name: 'toAddSubmitList',
+      component: '@/pages/transaction/enquiryOffer/toAddSubmit'
+    },
+    // 待新增报价单-新增
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add',
+      name: 'addEnquiry',
+      component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
+      hideInMenu: true,
+    },
+    // 待新增报价单-编辑
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/edit',
+      name: 'editEnquiry',
+      component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
+      hideInMenu: true,
+    },
+    // 待新建报价单-报价单号查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/rfq/preview',
+      name: 'toAddSubmitListRfqPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待新建报价单-需求单查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview',
+      name: 'toAddSubmitListDemandPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待新建报价单-详情
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/detail',
+      name: 'enquiryOfferSearchDetail',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（一级）-列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne',
+      name: 'enquiryOne',
+      component: '@/pages/transaction/enquiryOffer/enquiryOne'
+    },
+    // 待审核报价单（一级）-报价单号查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/rfq/preview',
+      name: 'enquiryOneRfqPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（一级）-需求单查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/demand/preview',
+      name: 'enquiryOneDemandPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（一级）-详情
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/detail',
+      name: 'enquiryOneDetail',
+      component: '@/pages/transaction/enquiryOffer/enquiryOne/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（二级）-列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo',
+      name: 'enquiryTwo',
+      component: '@/pages/transaction/enquiryOffer/enquiryTwo'
+    },
+    // 待审核报价单（二级）-报价单号查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/rfq/preview',
+      name: 'enquiryTwoRfqPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（二级）-需求单查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/demand/preview',
+      name: 'enquiryTwoDemandPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待审核报价单（二级）-详情
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/detail',
+      name: 'enquiryTwoDetail',
+      component: '@/pages/transaction/enquiryOffer/enquiryTwo/detail',
+      hideInMenu: true,
+    },
+    // 待提交报价单 - 列表
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toSubmit',
+      name: 'toSubmit',
+      component: '@/pages/transaction/enquiryOffer/toSubmit'
+    },
+    // 待提交报价单-报价单号查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toSubmit/rfq/preview',
+      name: 'toSubmitRfqPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待提交报价单-需求单查看
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toSubmit/demand/preview',
+      name: 'toSubmitDemandPreview',
+      component: '@/pages/transaction/enquiryOffer/components/detail',
+      hideInMenu: true,
+    },
+    // 待提交报价单-详情
+    {
+      path: '/memberCenter/tranactionAbility/enquiryOffer/toSubmit/detail',
+      name: 'toSubmitDetail',
+      component: '@/pages/transaction/enquiryOffer/toSubmit/detail',
+      hideInMenu: true,
+    },
+  ]
+}]
\ No newline at end of file

src/locales/zh-CN/menu.ts

@@ -139,8 +139,7 @@ export default {
   // 确认询价报价
   'menu.tranactionAbility.confirmInquiryQuote': '确认询价报价',
   'menu.tranactionAbility.confirmInquiryQuote.quoteOrder': '报价单查询',
-  'menu.tranactionAbility.confirmInquiryQuote.viewEnquiryDetail': '报价单详情',
-  'menu.tranactionAbility.confirmInquiryQuote.viewDemandDetail': '需求单详情',
+  'menu.tranactionAbility.confirmInquiryQuote.quoteOrderDetails': '报价单查询详情',
   'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitReview': '待提交审核报价单',
   'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitReviewDetails': '待提交审核报价单详情',
   'menu.tranactionAbility.confirmInquiryQuote.pendingReviewOne': '待审核报价单（一级）',
@@ -148,8 +147,7 @@ export default {
   'menu.tranactionAbility.confirmInquiryQuote.pendingReviewTwo': '待审核报价单（二级）',
   'menu.tranactionAbility.confirmInquiryQuote.pendingReviewTwoDetails': '待审核报价单（二级）详情',
   'menu.tranactionAbility.confirmInquiryQuote.pendingSubmit': '待确认报价单',
-  'menu.tranactionAbility.confirmInquiryQuote.enquiryViewDetail': '报价单详情',
-  'menu.tranactionAbility.confirmInquiryQuote.demandViewDetail': '需求单详情',
+  'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitDetails': '待确认报价单详情',
 
   // 商品询价
   'menu.tranactionAbility.goodsOffer': '商品询价',
@@ -203,19 +201,23 @@ export default {
   'menu.tranactionAbility.transactionRules': '交易规则',
   'menu.tranactionAbility.addRule': '新建交易规则',
 
-  // 需求发布
+  // 需求发布 2020-10-26修改
   'menu.tranactionAbility.enquirySubmit': '需求发布',
   'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询',
-  'menu.tranactionAbility.enquirySubmit.enquirySearchDetail': '需求单查询详情',
+  'menu.tranactionAbility.enquirySubmit.enquirySearchPreview': '需求单详情',
   'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新建需求单',
   'menu.tranactionAbility.enquirySubmit.addEnquiry': '新建需求单',
   'menu.tranactionAbility.enquirySubmit.editEnquiry': '编辑需求单',
-  'menu.tranactionAbility.enquirySubmit.viewEnquiryDetail': '需求单详情',
+  'menu.tranactionAbility.enquirySubmit.toAddSubmitListPreview': '需求单详情',
+  'menu.tranactionAbility.enquirySubmit.toAddSubmitListDetail': '需求单详情',
   'menu.tranactionAbility.enquirySubmit.enquiryOne': '待审核需求单（一级）',
+  'menu.tranactionAbility.enquirySubmit.enquiryOnePreview': '需求单详情',
   'menu.tranactionAbility.enquirySubmit.enquiryOneDetail': '待审核需求单（一级）详情',
   'menu.tranactionAbility.enquirySubmit.enquiryTwo': '待审核需求单（二级）',
+  'menu.tranactionAbility.enquirySubmit.enquiryTwoPreview': '需求单详情',
   'menu.tranactionAbility.enquirySubmit.enquiryTwoDetail': '待审核需求单（二级）详情',
   'menu.tranactionAbility.enquirySubmit.toSubmit': '待提交需求单',
+  'menu.tranactionAbility.enquirySubmit.toSubmitPreview': '需求单详情',
   'menu.tranactionAbility.enquirySubmit.toSubmitDetail': '待提交需求单详情',
 
   // 采购订单
@@ -266,35 +268,52 @@ export default {
   'menu.tranactionAbility.saleOrder.readyReturnDocument': '待确认归档',
   'menu.tranactionAbility.saleOrder.readyReturnDocumentDetail': '待确认归档详情',
 
-  // 需求报价
+  // 需求报价 2020-10-26修改
   'menu.tranactionAbility.enquiryOffer': '需求报价',
   'menu.tranactionAbility.enquiryOffer.enquirySearch': '需求单查询',
-  'menu.tranactionAbility.enquiryOffer.enquirySearchDetail': '需求单查询详情',
+  'menu.tranactionAbility.enquiryOffer.enquirySearchPreview': '需求单详情',
   'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch': '报价单查询',
-  'menu.tranactionAbility.enquiryOffer.enquiryOfferSearchDetail': '报价单查询详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryOfferSearchRfqPreview': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryOfferSearchDemandPreview': '需求单详情',
   'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新建报价单',
   'menu.tranactionAbility.enquiryOffer.addEnquiry': '新建报价单',
   'menu.tranactionAbility.enquiryOffer.editEnquiry': '编辑报价单',
-  'menu.tranactionAbility.enquiryOffer.viewEnquiryDetail': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.toAddSubmitListRfqPreview': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.toAddSubmitListDemandPreview': '需求单详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryOfferSearchDetail': '报价单详情',
   'menu.tranactionAbility.enquiryOffer.enquiryOne': '待审核报价单（一级）',
+  'menu.tranactionAbility.enquiryOffer.enquiryOneRfqPreview': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryOneDemandPreview': '需求单详情',
   'menu.tranactionAbility.enquiryOffer.enquiryOneDetail': '待审核报价单（一级）详情',
   'menu.tranactionAbility.enquiryOffer.enquiryTwo': '待审核报价单（二级）',
+  'menu.tranactionAbility.enquiryOffer.enquiryTwoRfqPreview': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryTwoDemandPreview': '需求单详情',
   'menu.tranactionAbility.enquiryOffer.enquiryTwoDetail': '待审核报价单（二级）详情',
   'menu.tranactionAbility.enquiryOffer.toSubmit': '待提交报价单',
+  'menu.tranactionAbility.enquiryOffer.toSubmitRfqPreview': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.toSubmitDemandPreview': '需求单详情',
   'menu.tranactionAbility.enquiryOffer.toSubmitDetail': '待提交报价单详情',
 
-  // 确认报价
+  // 确认报价 2020-10-26修改
   'menu.tranactionAbility.enquiryOfferConfirm': '确认需求报价',
   'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearch': '报价单查询',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearchRfqPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearchInquiryPreview': '询价单号详情',
   'menu.tranactionAbility.enquiryOfferConfirm.toSubmit': '待提交审核报价单',
-  'menu.tranactionAbility.enquiryOfferConfirm.toSubmitDetail': '待提交审核报价单详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.toSubmitRfqPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.toSubmitInquiryPreview': '询价单号详情',
   'menu.tranactionAbility.enquiryOfferConfirm.enquiryOne': '待审核报价单（一级）',
-  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOneDetail': '待审核报价单（一级）详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOneRfqPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOneInquiryPreview': '询价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOneDatail': '询价单号详情',
   'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwo': '待审核报价单（二级）',
-  'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwoDetail': '待审核报价单（二级）详情',
-  'menu.tranactionAbility.enquiryOfferConfirm.viewEnquiryDetail': '报价单详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwoRfqPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwoInquiryPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwoDatail': '询价单号详情',
   'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearch': '待确认报价单',
-  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearchDetail': '待确认报价单详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearchRfqPreview': '报价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearchInquiryPreview': '询价单号详情',
+  'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearchDatail': '待确认报价单详情',
 
   // 供应商评价
   'menu.tranactionAbility.supplierEvaluation': '供应会员评价管理',

src/pages/transaction/_public/order/constant.ts

+import { ISchema } from '@formily/antd'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+
 export const orderTypeLabel = ['', 
   '询价采购',
   '需求采购',
@@ -24,4 +27,58 @@ export enum SALE_ORDER_STATUS {
   CONFIRM_DELIVE_GOODS_ORDER,
   CONFIRM_RETURN_ORDER,
   RETURN_DOCUMENT_ORDER
+}
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-end',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginLeft: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
 }
\ No newline at end of file

src/pages/transaction/components/createElectronModal/index.tsx

 import React, { useContext, useRef } from 'react'
-import { Modal, Button } from 'antd'
+import { Modal, Button, message } from 'antd'
 import { createFormActions, ISchema } from '@formily/antd'
 import ModalForm from '@/components/ModalForm'
 import { history } from 'umi'
@@ -120,6 +120,10 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
   const { run: submitRun, loading: submitLoading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrder)
   const createElectron = async () => {
     const contractTemplateId = schemaActions.getFieldValue('contractTemplateId')
+    if (!contractTemplateId) {
+      message.error('请先选择电子合同模板')
+      return ;
+    }
     const orderNo = data.orderNo
     const signMemberId = data.createMemberId
 

src/pages/transaction/components/orderDeleveRecord/index.tsx

@@ -162,19 +162,19 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
   const { orderReceivingStatisticsResponses, orderDeliveryDetailsResponses } = data
   const sideOrderCols: any[] = [
     {
-      title: '收货批次',
+      title: '发货批次',
       dataIndex: 'deliveryBatch',
       align: 'center',
       key: 'deliveryBatch'
     },
     {
-      title: '收货单号',
+      title: '发货单号',
       dataIndex: 'deliveryNo',
       align: 'center',
       key: 'deliveryNo',
     },
     {
-      title: '收货时间',
+      title: '发货时间',
       dataIndex: 'deliveryTime',
       align: 'center',
       key: 'deliveryTime',

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -82,14 +82,18 @@ const warehouseColumns: any[] = [
 const modalPriceActions = createFormActions()
 // 总计金额联动框
 export const MoneyTotalBox = ({ dataSource, isEditData }) => {
-  const { orderProductRequests = [], receiverAddressId  } = dataSource || {}
-  const sum = orderProductRequests.reduce((prev, next) => prev + parseInt((next.price || 0)), 0)
+  const { orderProductRequests = [], receiverAddressId, freight, amount  } = dataSource || {}
+  const sum = orderProductRequests.reduce((prev, next) => prev + parseInt((next.money || 0)), 0)
+  
   const modelRef = useRef<any>({})
-  const [freePrice, setFreePrice] = useState<number>(0)
+  const [freePrice, setFreePrice] = useState<number>(freight || 0)
   const handleSetting = () => {
     modelRef.current.setVisible(true)
   }
 
+  // 总计金额
+  const amountMoney = amount || sum + freePrice
+
   const handleConfirm = () => {
     setFreePrice(parseInt(modalPriceActions.getFieldValue('freePrice') || 0))
     modelRef.current.setVisible(false)
@@ -126,7 +130,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
     </Col>
     <Col span={2}>
       <div>总计金额</div>
-      <div>{sum + freePrice}</div>
+      <div>{amountMoney}</div>
     </Col>
     <ModalForm
       modalTitle='设置运费'
@@ -377,9 +381,9 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
     },
     {
       title: '金额',
-      dataIndex: 'price',
+      dataIndex: 'money',
       align: 'center',
-      key: 'price',
+      key: 'money',
     },
     // 接口调用
     {

src/pages/transaction/enquiryOffer/components/index.tsx

@@ -85,15 +85,26 @@ const List:React.FC<listParams> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (type,id)  => {
-    if(type === 1){
-      // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/detail?id=${id}`)
-    }else if(type === 2){
-      // history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/detail?id=${id}`)
-    } else {
-      history.push(`/memberCenter/tranactionAbility/enquiryOffer/toSubmit/detail?id=${id}`)
+    if(props.type === 1) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/rfq/preview?id=${id}`)
+      } else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/demand/preview?id=${id}`)
+      }
+    } else if(props.type === 2) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/rfq/preview?id=${id}`)
+      } else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/demand/preview?id=${id}`)
+      }
+    } else if(props.type === 3) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/toSubmit/rfq/preview?id=${id}`)
+      } else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOffer/toSubmit/demand/preview?id=${id}`)
+      }
     }
+    
   }
 
   const columns : ColumnType<any>[] = [

src/pages/transaction/enquiryOffer/enquiryOfferSearch/index.tsx

@@ -71,11 +71,9 @@ const List:React.FC<{listParams}> = (props) => {
    */
   const handleToDetail= (type,id)  => {
     if(type === 1){
-      // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearchDetail?id=${id}`)
+      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearch/rfq/preview?id=${id}`)
     }else{
-      // history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${4}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearchDetail?id=${id}`)
+      history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearch/demand/preview?id=${id}`)
     }
   }
   const fetchData = async (params: any) => {

src/pages/transaction/enquiryOffer/enquirySearch/index.tsx

@@ -75,8 +75,7 @@ const List:React.FC<{listParams}> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (id)  => {
-    // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${6}&id=${id}`)
-    history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/details?id=${id}`)
+    history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/preview?id=${id}`)
   }
 
   const columns : ColumnType<any>[] = [

src/pages/transaction/enquiryOffer/toAddSubmit/index.tsx

@@ -56,18 +56,22 @@ const List:React.FC<{}> = () => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
   }
 
+
+
   const columns : ColumnType<any>[] = [
     {
       title:'报价单号',
       key:'quotationNo',
       dataIndex:'quotationNo',
-      align:'center'
+      align:'center',
+      render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/rfq/preview?id=${record.id}`}>{text}</EyePreview>
     },
     {
       title:'需求单号',
       key:'requisitionFormNo',
       dataIndex:'requisitionFormNo',
-      align:'center'
+      align:'center',
+      render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview?id=${record.id}`}>{text}</EyePreview>
     },
     {
       title:'报价摘要',

src/pages/transaction/enquiryOfferConfirm/components/formleftIndex.tsx

@@ -74,18 +74,14 @@ const List: React.FC<listParams> = (props) => {
   const handleToDetail = (type, id) => {
     if(props.type === 1){
       if (type === 1) {
-        // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewEnquiryDetail?id=${id}`)
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/rfq/preview?id=${id}`)
       } else {
-        // history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${4}&id=${id}`)
-        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewDemandDetail?id=${id}`)
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/inquiry/preview?id=${id}`)
       }
     }else if(props.type === 2){
       if (type === 1) {
-        // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
         history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/enquiryViewDetail?id=${id}`)
       } else {
-        // history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${5}&id=${id}`)
         history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/demandViewDetail?id=${id}`)
       }
     }

src/pages/transaction/enquiryOfferConfirm/components/index.tsx

@@ -85,15 +85,26 @@ const List:React.FC<listParams> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (type,id)  => {
-    if(type === 1){
-      // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/detail?&id=${id}`)
-    }else if(type === 2){
-      // history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
-      history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/detail?id=${id}`)
-    } else {
-      history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail?id=${id}`)
+    if(props.type === 1) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/rfq/preview?&id=${id}`)
+      }else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/inquiry/preview?&id=${id}`)
+      }
+    }else if(props.type === 2) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/rfq/preview?&id=${id}`)
+      }else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/inquiry/preview?&id=${id}`)
+      }
+    }else if(props.type === 3) {
+      if(type === 1) {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/rfq/preview?&id=${id}`)
+      }else {
+        history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/inquiry/preview?&id=${id}`)
+      }
     }
+
   }
 
   const columns : ColumnType<any>[] = [

src/pages/transaction/enquirySubmit/components/index.tsx

@@ -86,13 +86,12 @@ const List:React.FC<listParams> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (id)  => {
-    // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
     if(props.type === 1) {
-      history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/detail?id=${id}`)
+      history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/preview?id=${id}`)
     } else if(props.type === 2)  {
-      history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/detail?id=${id}`)
+      history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/preview?id=${id}`)
     } else {
-      history.push(`/memberCenter/tranactionAbility/enquirySubmit/toSubmit/detail?id=${id}`)
+      history.push(`/memberCenter/tranactionAbility/enquirySubmit/toSubmit/preview?id=${id}`)
     }
     
   }
@@ -183,7 +182,6 @@ const List:React.FC<listParams> = (props) => {
                       <Button 
                         type="link" 
                         onClick={() =>
-                          // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
                           history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/detail?id=${record.id}`)
                         }
                       >
@@ -197,7 +195,6 @@ const List:React.FC<listParams> = (props) => {
                       <Button 
                         type="link" 
                         onClick={() =>
-                          // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
                           history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/detail?id=${record.id}`)
                         }
                       >
@@ -214,7 +211,6 @@ const List:React.FC<listParams> = (props) => {
                       <Button 
                         type="link" 
                         onClick={() => 
-                          // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
                           history.push(`/memberCenter/tranactionAbility/enquirySubmit/toSubmit/detail?id=${record.id}`)
                         }
                       >

src/pages/transaction/enquirySubmit/enquirySearch/index.tsx

@@ -75,8 +75,7 @@ const List:React.FC<{listParams}> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (id)  => {
-    // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-    history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/detail?id=${id}`)
+    history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/preview?id=${id}`)
   }
 
   const columns : ColumnType<any>[] = [

src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx

@@ -57,7 +57,7 @@ const List:React.FC<{}> = () => {
   }
   const handleToDetail= (id)  => {
     // history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
-    history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
+    history.push(`/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/preview?id=${id}`)
   }
   const columns : ColumnType<any>[] = [
     {

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

@@ -28,12 +28,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/purchaseOrder/index.tsx

@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PublicApi } from '@/services/api'
 import { baseOrderListColumns } from './constant'
+import { PurchaseOrderOutWorkState } from '@/constants'
+import { history } from 'umi'
+import { tableListSchema } from '../_public/order/constant'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { DatePicker } from '@formily/antd-components'
+import Submit from '@/components/NiceForm/components/Submit'
 
 // 订单查询
 
@@ -25,7 +32,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
   }
 
   const handleEvaluate = (id) => {
-
+    history.push(`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated`)
   }
   
   const secondColumns: any[] = baseOrderListColumns.concat([
@@ -35,7 +42,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button>
+        { record.externalState === PurchaseOrderOutWorkState.FINISH_ORDER && <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button> }
         {/* todo */}
         {/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */}
       </>
@@ -48,6 +55,37 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
       <StandardTable
         fetchTableData={params => fetchTableData(params)}
         columns={secondColumns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyChilds={{
+          layouts: {
+            order: 2
+          },
+          children: <Button style={{width: 140}} onClick={() => {}} type='default'>导出</Button>
+        }}
+        formilyProps={{
+          layouts: {
+            order: 3
+          },
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -137,10 +137,15 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
   }, [])
 
   const handleConfirmProduct = async () => {
-    const productData = schemaAction.getFieldValue('orderProductRequests')
-    schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
-    confirmModal && confirmModal()
-    setVisible(false)
+    // 判断所选择的商品是否属于同一个工作流
+    const { code, data } = await PublicApi.postOrderIsWorkFlow({productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
+
+    if (code === 1000) {
+      const productData = schemaAction.getFieldValue('orderProductRequests')
+      schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
+      confirmModal && confirmModal()
+      setVisible(false)
+    }
   }
 
   const fetchProductList = (values) => {

src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx

@@ -44,7 +44,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
       productInfoColumns[productInfoColumns.length - 1].render = (text, record) => {
         return <>
           <Button type='link' onClick={() => handleDelete(record)}>删除</Button>
-          <Button type='link'>选择合并订单</Button>
+          {/* <Button type='link'>选择合并订单</Button> */}
         </>
       }
     } else {

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

@@ -68,12 +68,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

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

@@ -39,12 +39,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx

@@ -39,12 +39,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/saleOrder/index.tsx

@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PublicApi } from '@/services/api'
 import { baseOrderListColumns } from './constant'
+import { history } from 'umi'
+import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/constants'
+import { tableListSchema } from '../_public/order/constant'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { DatePicker } from '@formily/antd-components'
+import Submit from '@/components/NiceForm/components/Submit'
 
 // 销售订单查询
 
@@ -25,7 +32,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
   }
 
   const handleEvaluate = (id) => {
-
+    history.push(`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated`)
   }
   
   const secondColumns: any[] = baseOrderListColumns.concat([
@@ -35,7 +42,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button>
+        { record.externalState === PurchaseOrderOutWorkState.FINISH_ORDER && <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button> }
         {/* todo */}
         {/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */}
       </>
@@ -47,6 +54,37 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
       <StandardTable
         fetchTableData={params => fetchTableData(params)}
         columns={secondColumns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyChilds={{
+          layouts: {
+            order: 2
+          },
+          children: <Button style={{width: 140}} onClick={() => {}} type='default'>导出</Button>
+        }}
+        formilyProps={{
+          layouts: {
+            order: 3
+          },
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx

@@ -29,12 +29,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx

@@ -39,12 +39,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx

@@ -39,12 +39,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx

@@ -69,12 +69,12 @@ export const useSelfTable = () => {
       }
     },
     {
-      title: '订单商品摘要/下单时间',
+      title: '订单摘要/下单时间',
       align: 'center',
       dataIndex: 'orderThe',
       key: 'orderThe',
       render: (text, record) => <>
-        <div>{record.productName}</div>
+        <div>{text}</div>
         <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
       </>,
       width: 200

src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts

@@ -49,7 +49,7 @@ const orderColumns: any[] = [
     dataIndex: 'orderNo',
   },
   {
-    title: '订单商品摘要',
+    title: '订单摘要',
     align: 'center',
     dataIndex: 'orderThe',
   },