fix：销售订单添加不接受物流单的状态，交易规则添加加工流程交易规则类型，处理采购下单删除已选商品提交数据报错，处理多次支付下单禁用到付

config/config.ts

@@ -34,6 +34,7 @@ const config: any = {
     ['import', { libraryName: 'antd', libraryDirectory: 'es', style: true }, 'antd'],
     ['import', { libraryName: 'god', libraryDirectory: 'es', style: true }, 'god'],
     ['import', { libraryName: '@umijs/hooks', libraryDirectory: 'lib', camel2DashComponentName: false }, '@umijs/hooks'],// 将下划线转化关闭
+    ['transform-remove-console', { "exclude": [ "error", "warn"] }], // 移除 console
   ],
   history: {
     type: 'browser', // 'brower' | 'hash'

src/constants/index.ts

@@ -927,6 +927,11 @@ export enum SaleOrderInsideWorkState {
    * 手工发货
    */
   HAND_DELEVED_ORDER,
+
+  /**
+   * 不接受物流单
+   */
+  NOT_ACCEPTED_DELIVERY,
 }
 
 // 支付外部状态
@@ -1039,7 +1044,8 @@ export const SaleOrderInsideWorkStateTexts = {
   24: '订单归档',
   25: '待审核发货单',
   26: '待确认物流单',
-  27: '待手工发货'
+  27: '待手工发货',
+  28: '不接受物流单',
 }
 
 // 订单流转记录外部状态

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

@@ -205,14 +205,15 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
             }
           } else {
             actions.setFieldState('usingElectronicContracts', state => {
-              state.value = 0
+              // state.value = 0
               state.props["x-component-props"] = {
                 disabled: true
               }
             })
+            actions.setFieldValue('usingElectronicContracts', data.usingElectronicContracts || 0)
           }
           $('onFieldValueChange', 'contractTemplateId').subscribe(state => {
-            console.log(state.props)
+            // console.log(state.props)
           })
         // })
       }}

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

@@ -153,7 +153,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
     if(qrCodeInfo.qrUrl) {
       // @ts-ignore
       PublicApi.getOrderPayResultsl({id, paymentInformationId: currentPayInfoId}).then(res => {
-        console.log(res)
         if(res.code === 1000) {
           if(res.data) {
             setOpenTimer(0)
@@ -170,14 +169,13 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
   }
 
   const handleConfirm = () => {
-    console.log(data,'data')
     if (current === 0) {
       if (checked.id) {
         if (checked.id === 5) { // 线下支付
           setCurrent(1)
           setPayStep(1)
-          // 获取账户信息
-          PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.supplyMembersId}).then(res => {
+          // 获取对公账户信息
+          PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.supplyMembersId, memberRoleId: data.supplyMembersRoleId}).then(res => {
             if(res.code === 1000) {
               setBlankAccountInfo(res.data)
             }
@@ -261,7 +259,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       handleSubmitPay()
     } else if (current === 2) {
       // 开始提交授信支付数据 (需要输入支付密码)
-      console.log('开始提交授信支付数据', payPrice)
       if(payPrice <= creditInfo.canUseQuota){
         setPayStep(2)
         setCurrent(1000)
@@ -270,7 +267,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       }
     } else if(current === 3) {
       // 开始提交余额支付数据 (需要输入支付密码)
-      console.log('开始提交余额支付数据', payPrice)
       if(payPrice <= balanceInfo){
         setPayStep(2)
         setCurrent(1000)
@@ -279,7 +275,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       }
     } else if(current === 5) {
       // 开始提交货到付款数据
-      console.log('开始提交货到付款数据', payPrice)
       handleSubmitPay()
     }
 

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

@@ -251,8 +251,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           history.goBack()
         }, 1000)
         // history.replace('/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder')
+      } else {
+        setBtnLoading(false)
       }
-      setBtnLoading(false)
     } catch (error) {
       setBtnLoading(false)
       error?.message && message.error(error.message)

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

@@ -87,6 +87,14 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
         if(options.filter(_item => _item.payType === 4).length)
           options.filter(_item => _item.payType === 4)[0].disabled = false
       }
+      // 多次支付也要禁用到付
+      if(ctx.getFieldValue('paymentInformationResponses').length > 1) {
+        if(options.filter(_item => _item.payType === 4).length)
+          options.filter(_item => _item.payType === 4)[0].disabled = true
+      } else {
+        if(options.filter(_item => _item.payType === 4).length)
+          options.filter(_item => _item.payType === 4)[0].disabled = false
+      }
     }
   }, [orderProducts, columns])
 

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

@@ -66,6 +66,11 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
     rowSelectionCtl.setSelectRow(newData)
     rowSelectionCtl.setSelectedRowKeys(newData.map(v => v.id))
     ctx.setFieldValue('orderProductRequests', newData)
+
+    // 商品行数变动 清空之前的支付信息
+    if (pageStatus === PageStatus.ADD) {
+      ctx.setFieldValue('paymentInformationResponses', [])
+    }
   }
   const [productColumns, setProductColumns] = useState(() => {
     if (pageStatus === PageStatus.ADD) {

src/pages/transaction/transactionRules/components/selectProcesss/index.tsx

-import React, { useState, useRef, useEffect } from 'react'
-import styled from 'styled-components'
-import { ISchemaFormProps, ISchemaFieldProps, ISchemaFieldComponentProps, createFormActions, useFieldState } from '@formily/antd'
-import { Button, Space, Row, Col, Tag } from 'antd'
-import { PlusOutlined, DeleteColumnOutlined, EditOutlined, DeleteOutlined, CaretUpOutlined, CaretDownOutlined, EyeOutlined } from '@ant-design/icons'
-import cx from 'classnames'
-import { PublicApi } from '@/services/api'
-
-const SelectStyles = styled((props) => <div className='select-list' {...props}></div>)`
-  .select_style_border {
-    border: 1px solid #EEF0F3;
-    margin-top: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 14px;
-    cursor: pointer;
-    line-height: 28px;
-    position:relative;
-  }
-  
-  .select_style_border.active {
-    border: 1px solid #00B382;
-  }
-  .select_style_border.active::after {
-    content: '';
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-bottom: 12px solid #00B37A;
-    border-left: 12px solid transparent;
-    bottom: 0;
-    right: 0;
-    z-index: 5;
-  }
-`
-
-enum ProcessTagColor {
-  'red',
-  'orange',
-  'purple',
-  'blue'
-}
-
-enum ProcessTagType {
-  '订单交易流程',
-  '售后换货流程',
-  '售后退货流程',
-  '售后维修流程'
-}
-
-const SelectProcesss = (props: ISchemaFieldComponentProps) => {
-  const [formInitValue, setFormInitValue] = useState<any>(null)
-  const [state, setFieldState] = useFieldState({
-    dataSource: [],
-    showMore: false
-  })
-  const { dataSource, showMore } = state
-  const { value, mutators, editable } = props
-
-  useEffect(() => {
-    PublicApi.getOrderTradingRulesTransactionProcessList().then(res => {
-      setFieldState({
-        dataSource: res.data,
-        showMore
-      })
-    })
-  }, [])
-
-  const showDataSource = showMore ? dataSource : [...dataSource].splice(0, 3)
-
-  const handleCheck = (id) => {
-    if (editable) {
-      mutators.change(id)
-    }
-  }
-
-  const toogleMore = () => {
-    setFieldState({
-      dataSource,
-      showMore: !showMore
-    })
-  }
-
-  const renderProcessType = (v: any) => {
-    return <Tag color={ProcessTagColor[v.type - 1]}>
-      {ProcessTagType[v.type - 1]}
-    </Tag>
-  }
-
-  return (
-    <div style={{ width: '100%' }}>
-      <SelectStyles>
-        {
-          showDataSource.map(v => <div key={v.id} onClick={() => handleCheck(v.id)} className={cx('select_style_border', value === v.id ? 'active' : '')}>
-            <div>
-              <Row style={{ color: '#303133' }}>
-                <Col>{v.name}</Col>
-                <Col style={{ marginLeft: 6 }}>
-                  {
-                    renderProcessType(v)
-                  }
-                </Col>
-              </Row>
-              <div style={{ color: '#909399' }}>{v.explain}</div>
-            </div>
-          </div>)
-        }
-      </SelectStyles>
-      {dataSource.length > 3 &&
-        <div onClick={toogleMore} style={{ textAlign: 'center', cursor: 'pointer' }}>
-          显示更多{showMore ? <CaretDownOutlined /> : <CaretUpOutlined />}
-        </div>
-      }
-    </div>
-  )
-}
-
-SelectProcesss.defaultProps = {}
-
-SelectProcesss.isFieldComponent = true;
-
-export default SelectProcesss
\ No newline at end of file
+import React, { useState, useRef, useEffect } from 'react'
+import styled from 'styled-components'
+import { ISchemaFormProps, ISchemaFieldProps, ISchemaFieldComponentProps, createFormActions, useFieldState } from '@formily/antd'
+import { Button, Space, Row, Col, Tag } from 'antd'
+import { PlusOutlined, DeleteColumnOutlined, EditOutlined, DeleteOutlined, CaretUpOutlined, CaretDownOutlined, EyeOutlined } from '@ant-design/icons'
+import cx from 'classnames'
+import { PublicApi } from '@/services/api'
+
+const SelectStyles = styled((props) => <div className='select-list' {...props}></div>)`
+  .select_style_border {
+    border: 1px solid #EEF0F3;
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 8px 14px;
+    cursor: pointer;
+    line-height: 28px;
+    position:relative;
+  }
+
+  .select_style_border.active {
+    border: 1px solid #00B382;
+  }
+  .select_style_border.active::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-bottom: 12px solid #00B37A;
+    border-left: 12px solid transparent;
+    bottom: 0;
+    right: 0;
+    z-index: 5;
+  }
+`
+
+enum ProcessTagColor {
+  'red',
+  'orange',
+  'purple',
+  'blue',
+  'green'
+}
+
+enum ProcessTagType {
+  '订单交易流程',
+  '售后换货流程',
+  '售后退货流程',
+  '售后维修流程',
+  '加工生产流程'
+}
+
+const SelectProcesss = (props: ISchemaFieldComponentProps) => {
+  const [formInitValue, setFormInitValue] = useState<any>(null)
+  const [state, setFieldState] = useFieldState({
+    dataSource: [],
+    showMore: false
+  })
+  const { dataSource, showMore } = state
+  const { value, mutators, editable } = props
+
+  useEffect(() => {
+    PublicApi.getOrderTradingRulesTransactionProcessList().then(res => {
+      setFieldState({
+        dataSource: res.data,
+        showMore
+      })
+    })
+  }, [])
+
+  const showDataSource = showMore ? dataSource : [...dataSource].splice(0, 3)
+
+  const handleCheck = (id) => {
+    if (editable) {
+      mutators.change(id)
+    }
+  }
+
+  const toogleMore = () => {
+    setFieldState({
+      dataSource,
+      showMore: !showMore
+    })
+  }
+
+  const renderProcessType = (v: any) => {
+    return <Tag color={ProcessTagColor[v.type - 1]}>
+      {ProcessTagType[v.type - 1]}
+    </Tag>
+  }
+
+  return (
+    <div style={{ width: '100%' }}>
+      <SelectStyles>
+        {
+          showDataSource.map(v => <div key={v.id} onClick={() => handleCheck(v.id)} className={cx('select_style_border', value === v.id ? 'active' : '')}>
+            <div>
+              <Row style={{ color: '#303133' }}>
+                <Col>{v.name}</Col>
+                <Col style={{ marginLeft: 6 }}>
+                  {
+                    renderProcessType(v)
+                  }
+                </Col>
+              </Row>
+              <div style={{ color: '#909399' }}>{v.explain}</div>
+            </div>
+          </div>)
+        }
+      </SelectStyles>
+      {dataSource.length > 3 &&
+        <div onClick={toogleMore} style={{ textAlign: 'center', cursor: 'pointer' }}>
+          显示更多{showMore ? <CaretDownOutlined /> : <CaretUpOutlined />}
+        </div>
+      }
+    </div>
+  )
+}
+
+SelectProcesss.defaultProps = {}
+
+SelectProcesss.isFieldComponent = true;
+
+export default SelectProcesss