修改确认询价报价搜索字段不对问题， 修改需求发布待确认没有提交按钮问题】

src/pages/transaction/common/statusList.ts

@@ -239,4 +239,51 @@ export const confirmFilterInteriorState = [
   }
 ]
 
+/**
+ * @description: 确认询价报价搜索外部状态筛选
+ * @param {type} 
+ * @return {type} 1.待提交询价单 2.待提交报价单 3.待确认报价单 4.报价通过 5.报价不通过
+ */
+export const searchFilterExternalState = [
+  {
+    label: '待提交询价单', value: 1
+  },
+  {
+    label: '待提交报价单', value: 2
+  },
+  {
+    label: '待确认报价单', value: 3
+  },
+  {
+    label: '报价通过', value: 4
+  },
+  {
+    label: '报价不通过', value: 5
+  }
+] 
 
+/**
+ * @description: 确认询价报价搜索内部状态筛选
+ * @param {type} 
+ * @return {type} 1.待提交审核 2.待审核 3.待审核 4.审核通过 5.完成 6.审核不通过
+ */
+export const searchFilterInteriorState = [
+  {
+    label: '待提交审核', value: 1
+  },
+  {
+    label: '待审核', value: 2
+  },
+  {
+    label: '待审核', value: 3
+  },
+  {
+    label: '审核通过', value: 4
+  },
+  {
+    label: '完成', value: 5
+  },
+  {
+    label: '审核不通过', value: 6
+  }
+]

src/pages/transaction/confirmInquiryQuote/components/details.tsx

@@ -272,6 +272,11 @@ const Details: React.FC<parmas> = (props) => {
     }, 1000)
   }
 
+  /**下载 */
+  const onDownload = (file: any) => {
+    window.location.href = `/api/order/contractTemplate/downloadContract?contractName=${file.name}&contractUrl=${file.url}`
+  }
+
   return (
     <PageHeaderWrapper
       className={style.header}
@@ -461,7 +466,7 @@ const Details: React.FC<parmas> = (props) => {
           {
             data.enclosureUrls &&
             data.enclosureUrls.map((v,i) => (
-              <div key={i} className={style.upload_item}>
+              <div key={i} className={style.upload_item} onClick={() => onDownload(v)}>
                 <div className={style.upload_left}>
                   <LinkOutlined />
                   <span>{v.name}</span>

src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx

@@ -70,8 +70,8 @@ const ReviewList: React.FC<parmas> = (props) => {
     },
     {
       title: '询价时间',
-      key: 'voucherTime',
-      dataIndex: 'voucherTime',
+      key: 'createTime',
+      dataIndex: 'createTime',
       render: (text: any, record: any) => format(text)
     },
     {
@@ -114,8 +114,8 @@ const ReviewList: React.FC<parmas> = (props) => {
   // 搜索
   const search = (values: any) => {
     if (values.voucherTime) {
-      values.startVoucherTime = timeRange(values.voucherTime).st
-      values.endVoucherTime = timeRange(values.voucherTime).et
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
       delete values.voucherTime
     }
     ref.current.reload(values)
@@ -149,7 +149,7 @@ const ReviewList: React.FC<parmas> = (props) => {
               actions={formActions}
               onSubmit={values => search(values)}
               effects={($, actions) => {
-                useStateFilterSearchLinkageEffect($, actions, 'inquiryListNo', FORM_FILTER_PATH)
+                useStateFilterSearchLinkageEffect($, actions, 'quotationNo', FORM_FILTER_PATH)
               }}
               expressionScope={{
                 controllerBtns

src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx

@@ -52,8 +52,8 @@ const PendingSubmit: React.FC<{}> = () => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',

src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx

@@ -51,8 +51,8 @@ const PendingSubmitReview: React.FC<{}> = () => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',
@@ -121,6 +121,16 @@ const PendingSubmitReview: React.FC<{}> = () => {
       })
     })
   }
+  // 搜索
+  const search = (values: any) => {
+    if (values.voucherTime) {
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
+      delete values.voucherTime
+    }
+    ref.current.reload(values)
+  }
+
   const handleModalOK = () => {
     setvisible(false)
     setTimeout(() => {
@@ -139,6 +149,7 @@ const PendingSubmitReview: React.FC<{}> = () => {
           controlRender={
             <NiceForm
               actions={formActions}
+              onSubmit={values => search(values)}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect($, actions, 'quotationNo', FORM_FILTER_PATH)
               }}

src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx

@@ -28,7 +28,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     dataIndex: 'quotationNo',
     render: (text: any, record: any) => <EyePreview
       url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&view=2`}>{text}</EyePreview>
-  },{
+  }, {
     title: '询价单号',
     key: 'inquiryListNo',
     dataIndex: 'inquiryListNo',
@@ -42,15 +42,15 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     title: '报价会员',
     key: 'memberName',
     dataIndex: 'memberName',
-  },{
+  }, {
     title: '报价截止时间',
     key: 'quotationAsTime',
     dataIndex: 'quotationAsTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',
@@ -68,12 +68,12 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     filterMultiple: false,
     onFilter: (value, record) => record.interiorState === value,
     render: (text: any) =>
-    confirmInteriorState(text)
+      confirmInteriorState(text)
   }];
   //交易能力 询价报价 询价单查询
   const fetchData = (params?: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getOrderNotarizeEnquiryProductQuotationList({...params}).then(res => {
+      PublicApi.getOrderNotarizeEnquiryProductQuotationList({ ...params }).then(res => {
         resolve(res.data)
       })
     })
@@ -81,8 +81,8 @@ const EnquiryOrder: React.FC<{}> = (props) => {
   // 搜索
   const search = (values: any) => {
     if (values.voucherTime) {
-      values.startVoucherTime = timeRange(values.voucherTime).st
-      values.endVoucherTime = timeRange(values.voucherTime).et
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
       delete values.voucherTime
     }
     ref.current.reload(values)

src/pages/transaction/confirmInquiryQuote/schema/index.tsx

 import { ISchema} from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
-import {TimeList, filterExternalState, filterInternalState} from '../../common/statusList'
+import {TimeList, searchFilterExternalState, searchFilterInteriorState} from '../../common/statusList'
 import TranactionRoute from 'config/routes/tranactionRoute'
 
 /**
@@ -81,25 +81,6 @@ export const commonEnquieryOfferSchema: ISchema = {
                 placeholder:'被询价会员'
               }
             },
-            // category:{
-            //   type:'string',
-            //   'x-component': 'CustomInputSearch',
-            //   'x-component-props': {
-            //     placeholder: '商品品类',
-            //     showSearch: true,
-            //     showArrow: true,
-            //     defaultActiveFirstOption: false,
-            //     filterOption: false,
-            //     notFoundContent: null,
-            //     style: { width: '174px', lineHeight: '32px' },
-            //     searchValue: null,
-            //     dataoption: []
-            //   }
-            //   // "x-component-props":{
-            //   //   placeholder:'请选择品类'
-            //   // },
-            //   // enum:[]
-            // },
             voucherTime:{
               type:'string',
               default: 0,
@@ -458,14 +439,14 @@ export const quoteFormSearch: ISchema = {
               "x-component-props":{
                 placeholder:'外部状态'
               },
-              enum: []
+              enum: searchFilterExternalState
             },
             interiorState	:{
               type:'string',
               "x-component-props":{
                 placeholder:'内部状态'
               },
-              enum: []
+              enum: searchFilterInteriorState
             },
           }
         },

src/pages/transaction/confirmInquiryQuote/schema/pendingReview.tsx

-import { ISchema} from '@formily/antd'
+import { ISchema } from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
-import {TimeList} from '../../common/statusList'
+import { TimeList } from '../../common/statusList'
 import TranactionRoute from 'config/routes/tranactionRoute'
 
 /**
@@ -9,85 +9,85 @@ import TranactionRoute from 'config/routes/tranactionRoute'
  * @return {type} 
  */
 export const pendingReviewSchema: ISchema = {
-  type:'object',
-  properties:{
-    megalayout:{
-      type:'object',
-      "x-component":'mega-layout',
-      "x-component-props":{
-        grid:true
+  type: 'object',
+  properties: {
+    megalayout: {
+      type: 'object',
+      "x-component": 'mega-layout',
+      "x-component-props": {
+        grid: true
       },
-      properties:{
-        ctl:{
-          type:'object',
-          "x-component":"Children",
-          "x-component-props":{
-            children:"{{controllerBtns}}"
+      properties: {
+        ctl: {
+          type: 'object',
+          "x-component": "Children",
+          "x-component-props": {
+            children: "{{controllerBtns}}"
           }
         },
-        inquiryListNo:{//报价单号
-          type:'string',
-          "x-component":"Search",
-          "x-mega-props":{
+        inquiryListNo: {//报价单号
+          type: 'string',
+          "x-component": "Search",
+          "x-mega-props": {
 
           },
-          "x-component-props":{
-            placeholder:'报价单搜索'
+          "x-component-props": {
+            placeholder: '报价单搜索'
           }
         }
       }
     },
-    [FORM_FILTER_PATH]:{
-      type:'object',
-      "x-component":"flex-layout",
-      "x-component-props":{
-        rowStyle:{
-          flexWrap:'nowrap'
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      "x-component": "flex-layout",
+      "x-component-props": {
+        rowStyle: {
+          flexWrap: 'nowrap'
         },
-        colStyle:{
+        colStyle: {
           marginLeft: 20
         }
       },
-      properties:{
-        PRO_LAYOUT:{
-          type:'object',
-          "x-component":'mega-layout',
-          "x-mega-props":{
+      properties: {
+        PRO_LAYOUT: {
+          type: 'object',
+          "x-component": 'mega-layout',
+          "x-mega-props": {
             span: 5
           },
-          "x-component-props":{
+          "x-component-props": {
             inline: true
           },
-          properties:{
-            details:{
-              type:'string',
-              "x-component-props":{
-                placeholder:'询价单摘要'
+          properties: {
+            details: {
+              type: 'string',
+              "x-component-props": {
+                placeholder: '询价单摘要'
               }
             },
-            memberName:{
-              type:'string',
-              "x-component-props":{
-                placeholder:'被询价会员'
+            memberName: {
+              type: 'string',
+              "x-component-props": {
+                placeholder: '被询价会员'
               }
             },
-            voucherTime:{
-              type:'string',
+            voucherTime: {
+              type: 'string',
               default: 0,
-              "x-component-props":{
-                placeholder:'请选择单据时间'
+              "x-component-props": {
+                placeholder: '请选择单据时间'
               },
               enum: TimeList
             },
           }
         },
-        sumbit:{
-          "x-component":'Submit',
-          "x-mega-props":{
-            span:1 
+        sumbit: {
+          "x-component": 'Submit',
+          "x-mega-props": {
+            span: 1
           },
-          "x-component-props":{
-            children:'查询'
+          "x-component-props": {
+            children: '查询'
           }
         }
       }

src/pages/transaction/enquirySubmit/toSubmit/detail/index.tsx

@@ -4,6 +4,7 @@ const ToSubmitDetail: React.FC = () => {
   return (
     <AuditComponents 
       pagetype={3}
+      operation={1}
     />
   );
 };

src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx

@@ -59,8 +59,8 @@ const AddEnquiryOrder: React.FC<{}> = () => {
     },
     {
       title: '询价时间',
-      key: 'voucherTime',
-      dataIndex: 'voucherTime',
+      key: 'createTime',
+      dataIndex: 'createTime',
       render: (text: any) =>
         format(text)
     },

src/pages/transaction/goodsOffer/components/details.tsx

@@ -287,6 +287,11 @@ const Details: React.FC<parmas> = (props) => {
     return <>{name}</>
   }
 
+  /**下载 */
+  const onDownload = (file: any) => {
+    window.location.href = `/api/order/contractTemplate/downloadContract?contractName=${file.name}&contractUrl=${file.url}`
+  }
+
   return (
     <PageHeaderWrapper
       className={style.header}
@@ -442,7 +447,7 @@ const Details: React.FC<parmas> = (props) => {
           {
             data.enclosureUrls &&
             data.enclosureUrls.map((v, i) => (
-              <div key={i} className={style.upload_item}>
+              <div key={i} className={style.upload_item} onClick={() => onDownload(v)}>
                 <div className={style.upload_left}>
                   <LinkOutlined />
                   <span>{v.name}</span>

src/pages/transaction/goodsOffer/components/reviewList.tsx

@@ -74,8 +74,8 @@ const ReviewList: React.FC<parmas> = (props) => {
     },
     {
       title: '询价时间',
-      key: 'voucherTime',
-      dataIndex: 'voucherTime',
+      key: 'createTime',
+      dataIndex: 'createTime',
       render: (text: any, record: any) => format(text)
     },
     {

src/pages/transaction/goodsOffer/enquiryOrder/index.tsx

@@ -48,8 +48,8 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',

src/pages/transaction/goodsOffer/pendingReviewTwo/details.tsx

 import React from 'react';
-import { history } from 'umi';
 import Datails from '../components/details';
 import { PublicApi } from '@/services/api';
+import { history } from 'umi';
 
 const PendingReviewTwoDatails:React.FC<{}> = () => {
   //type: 1.待提交询价单,2.待审核询价单1级,3.待审核询价单2级,4.询价单查询,5.询价单查询,6.待新增报价单

src/pages/transaction/goodsOffer/pendingSubmit/index.tsx

@@ -56,8 +56,8 @@ const PendingSubmit: React.FC<{}> = () => {
     },
     {
       title: '询价时间',
-      key: 'voucherTime',
-      dataIndex: 'voucherTime',
+      key: 'createTime',
+      dataIndex: 'createTime',
       render: (text: any, record: any) => format(text)
     },
     {

src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx

@@ -53,8 +53,8 @@ const AddInquiryOrder: React.FC<{}> = () => {
     
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',

src/pages/transaction/inquiryQuote/components/details.tsx

@@ -318,6 +318,11 @@ const Details: React.FC<parmas> = (props) => {
     return name;
   }
 
+  /**下载 */
+  const onDownload = (file: any) => {
+    window.location.href = `/api/order/contractTemplate/downloadContract?contractName=${file.name}&contractUrl=${file.url}`
+  }
+
   return (
     <PageHeaderWrapper
       className={style.header}
@@ -500,7 +505,7 @@ const Details: React.FC<parmas> = (props) => {
           {
             data.enclosureUrls &&
             data.enclosureUrls.map((v, i) => (
-              <div key={i} className={style.upload_item}>
+              <div key={i} className={style.upload_item} onClick={() => onDownload(v)}>
                 <div className={style.upload_left}>
                   <LinkOutlined />
                   <span>{v.name}</span>

src/pages/transaction/inquiryQuote/components/reviewList.tsx

@@ -68,8 +68,8 @@ const ReviewList: React.FC<parmas> = (props) => {
     },
     {
       title: '询价时间',
-      key: 'voucherTime',
-      dataIndex: 'voucherTime',
+      key: 'createTime',
+      dataIndex: 'createTime',
       render: (text: any, record: any) => format(text)
     },
     {

src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx

@@ -49,8 +49,8 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '询价时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',

src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx

@@ -51,8 +51,8 @@ const PendingSubmit: React.FC<{}> = () => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',

src/pages/transaction/inquiryQuote/quoteOrder/index.tsx

@@ -49,8 +49,8 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
-    key: 'voucherTime',
-    dataIndex: 'voucherTime',
+    key: 'createTime',
+    dataIndex: 'createTime',
     render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',