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

e47aa1b2 · XieZhiXiong · 149aaed6 · 6e21b722 · e47aa1b2 · e47aa1b2
Commit e47aa1b2 authored Feb 20, 2021 by XieZhiXiong
6 changed files
--- a/src/components/ModalTable/schema/index.ts
+++ b/src/components/ModalTable/schema/index.ts
@@ -325,11 +325,11 @@ export const memberModalSchema: ISchema = {
 export const inquirySchema: ISchema = {
  type: 'object',
  properties: {
-    name: {
+    quotationNo: {
      type: 'string',
      'x-component': 'ModalSearch',
      'x-component-props': {
-        placeholder: '报价单号/需求单号/报价单摘要',
+        placeholder: '报价单号',
        align: 'flex-left',
      },
    },
@@ -338,9 +338,10 @@ export const inquirySchema: ISchema = {
      'x-component': 'flex-layout',
      'x-component-props': {
        rowStyle: {
-          flexWrap: 'nowrap',
+          // flexWrap: 'nowrap',
+          justifyContent: 'flex-start',
          style: {
-            marginRight: 0
+            marginRight: 0,
          }
        },
        colStyle: {
@@ -349,13 +350,40 @@ export const inquirySchema: ISchema = {
      },
      properties: {
        // @todo 需调整字段名
-        categoryId: {
+        // categoryId: {
+        //   type: 'string',
+        //   "x-component": 'SearchSelect',
+        //   "x-component-props": {
+        //     placeholder: '报价会员（全部）',
+        //     className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
+        //     fetchSearch: PublicApi.getProductSelectGetSelectCategory,
+        //     style: {
+        //       width: 160
+        //     }
+        //   }
+        // },
+        offerMemberName: {
          type: 'string',
-          "x-component": 'SearchSelect',
          "x-component-props": {
-            placeholder: '报价会员（全部）',
-            className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
-            fetchSearch: PublicApi.getProductSelectGetSelectCategory,
+            placeholder: '报价会员',
+            style: {
+              width: 160
+            }
+          }
+        },
+        details: {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '报价单摘要',
+            style: {
+              width: 160
+            }
+          }
+        },
+        inquiryListNo: {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '询价单编号',
            style: {
              width: 160
            }
@@ -450,11 +478,11 @@ export const enquirySchema: ISchema = {
 export const demandSchema: ISchema = {
  type: 'object',
  properties: {
-    name: {
+    quotationNo: {
      type: 'string',
      'x-component': 'ModalSearch',
      'x-component-props': {
-        placeholder: '报价单号/需求单号/报价单摘要',
+        placeholder: '报价单号',
        align: 'flex-left',
      },
    },
@@ -463,9 +491,10 @@ export const demandSchema: ISchema = {
      'x-component': 'flex-layout',
      'x-component-props': {
        rowStyle: {
-          flexWrap: 'nowrap',
+          // flexWrap: 'nowrap',
+          justifyContent: 'flex-start',
          style: {
-            marginRight: 0
+            marginRight: 0,
          }
        },
        colStyle: {
@@ -473,14 +502,41 @@ export const demandSchema: ISchema = {
        },
      },
      properties: {
-        // @todo 需调整字段名
-        categoryId: {
+        // // @todo 需调整字段名
+        // categoryId: {
+        //   type: 'string',
+        //   "x-component": 'SearchSelect',
+        //   "x-component-props": {
+        //     placeholder: '报价会员（全部）',
+        //     className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
+        //     fetchSearch: PublicApi.getProductSelectGetSelectCategory,
+        //     style: {
+        //       width: 160
+        //     }
+        //   }
+        // },
+        demandMembers: {
          type: 'string',
-          "x-component": 'SearchSelect',
          "x-component-props": {
-            placeholder: '报价会员（全部）',
-            className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
-            fetchSearch: PublicApi.getProductSelectGetSelectCategory,
+            placeholder: '需求会员',
+            style: {
+              width: 160
+            }
+          }
+        },
+        quotationSummary: {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '报价单摘要',
+            style: {
+              width: 160
+            }
+          }
+        },
+        requisitionFormNo: {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '需求单编号',
            style: {
              width: 160
            }

--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1007,7 +1007,7 @@ export const OrderTypeMap = {
 // 订单外部显示文案
 export const PurchaseOrderOutWorkStateTexts = {
  "-1": "取消订单",
-  0: '订单完成',
+  // 0: '订单完成',
  1: '待提交订单',
  2: '待确认订单',
  3: '待确认电子合同',

--- a/src/pages/priceManage/priceStrategy/setStrategy.tsx
+++ b/src/pages/priceManage/priceStrategy/setStrategy.tsx
@@ -31,6 +31,7 @@ const SetStrategy: React.FC<{}> = () => {

    if(!values['commodityMemberList'] && !values['commodityMemberList']?.length) {
      message.error('请选择指定适用会员')
+      setBtnLoading(false)
    } else {
      const { params } = transformParamsForApi(values, addSchemaAction)


--- a/src/pages/transaction/components/orderPayTabs/index.tsx
+++ b/src/pages/transaction/components/orderPayTabs/index.tsx
@@ -17,13 +17,24 @@ export interface OrderPayTabsProps {}

 const TabPane = Tabs.TabPane

-// 支付信息
-
-const payTextList = ["积分支付",
+// 支付方式
+const payTextList = [
+  "积分支付",
  '线上支付',
  '线下支付',
  '授信支付',
-  '货到付款'
+  '货到付款',
+]
+// 支付渠道
+const payChannel = [
+  "积分支付",
+  "支付宝",
+  "微信",
+  "银联",
+  "余额支付",
+  "线下支付线上确认",
+  "授信额度支付",
+  "货到付款",
 ]

 const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
@@ -49,6 +60,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {


  const TabHeader = ({dataSource}) => {
+    console.log(dataSource.payPrice, 'data')
    return <Row justify='space-between' style={{minWidth: 216}}>
      <Col>
        <div className={style.fontGray}>支付比例</div>
@@ -57,11 +69,11 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
          {dataSource.channel !== 0 && '￥'}
          {dataSource.payPrice || 0}
          {
-            dataSource.refundPrice && <>&nbsp;
+            dataSource.refundPrice ? <>&nbsp;
              <Tooltip title={`本次实际支付金额(￥${dataSource.payPrice})=本次订单待支付金额(￥${dataSource.payPrice+dataSource.refundPrice})-售后待退款金额(￥${dataSource.refundPrice})`}>
                <QuestionCircleOutlined />
              </Tooltip>
-            </>
+            </> : null
          }
        </div>
      </Col>
@@ -94,7 +106,8 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
                </Row>
                <Row>
                  <Col className={style.fontGray} span={4}>支付渠道: </Col>
-                  <Col>{payList.find(j => j.id === v.channel)?.way || (v.channel === 0 && '积分支付')}</Col>
+                  {/* <Col>{payList.find(j => j.id === v.channel)?.way || (v.channel === 0 && '积分支付')}</Col> */}
+                  <Col>{payChannel[v.channel]}</Col>
                </Row>
            </TabPane>) }
          </Tabs>

--- a/src/pages/transaction/purchaseOrder/orderCollect/components/demandModalTable/index.tsx
+++ b/src/pages/transaction/purchaseOrder/orderCollect/components/demandModalTable/index.tsx
@@ -68,6 +68,7 @@ const DemandModalTable:React.FC<DemandModalTableProps> = (props) => {
      fetchTableData={async (params) => (await PublicApi.getOrderConfirmationQuotationList({...params, externalState: 5})).data}
      rowSelection={rowSelection}
      modalType='demandByDefault'
+      searchName="quotationNo"
      tableProps={{
        rowKey: 'id'
      }}

--- a/src/pages/transaction/purchaseOrder/orderCollect/components/inquiryModalTable/index.tsx
+++ b/src/pages/transaction/purchaseOrder/orderCollect/components/inquiryModalTable/index.tsx
@@ -44,7 +44,6 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
        productIds: data.map(item => item.productId),
        orderModel: schemaAction.getFieldValue('orderModel')
      }, { ctlType: 'none' })
-      console.log(res, 'res')

      // 将询价报价单的id字段 冗余给商品列表
      // schemaAction.setFieldValue('orderProductRequests', data.map((v: any) => {
@@ -78,6 +77,7 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
      fetchTableData={async (params) => (await PublicApi.getOrderNotarizeEnquiryProductQuotationList({...params, externalState: 4}, {useCache: true, ttl: 10 * 1000})).data}
      rowSelection={rowSelection}
      modalType='inquiryByDefault'
+      searchName="quotationNo"
      tableProps={{
        rowKey: 'id'
      }}