Merge branch 'jinfa-0518-order' into 'jinfa-0518'

src/pages/transaction/purchaseOrder/orderCollectSrm/components/contractModalTable/index.tsx

@@ -78,10 +78,10 @@ const ContractModalTable:React.FC<ContractModalTableProps> = (props) => {
       // 币别
       schemaAction.setFieldValue('currencyType', item.currencyType)
       // 付款方式
-      schemaAction.setFieldValue('paymentType', item.paymentType || 1)
+      schemaAction.setFieldValue('paymentType', item.paymentType)
       schemaAction.setFieldValue('paymentTypeName', item.paymentTypeName)
       // 付款条件
-      schemaAction.setFieldValue('paymentClauseType', item.paymentClauseType || 1)
+      schemaAction.setFieldValue('paymentClauseType', item.paymentClauseType)
       schemaAction.setFieldValue('paymentClauseTypeName', item.paymentClauseTypeName)
       // 到货区域
       schemaAction.setFieldValue('arrivalArea', item.arrivalArea)

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

@@ -161,6 +161,23 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
         setTimeout(() => {
           addSchemaAction.setFieldValue('products', _orderProductRequests)
           addSchemaAction.setFieldValue('contract', {...data.contract})
+          // 订单分类
+          addSchemaAction.setFieldValue('sapOrderType', data.sapOrderType)
+          // 业务类型
+          addSchemaAction.setFieldValue('businessType', data.businessType)
+          addSchemaAction.setFieldValue('businessTypeName', data.businessTypeName)
+          // 币别
+          addSchemaAction.setFieldValue('currencyType', data.currencyType)
+          // 付款方式
+          addSchemaAction.setFieldValue('paymentType', data.paymentType)
+          addSchemaAction.setFieldValue('paymentTypeName', data.paymentTypeName)
+          // 付款条件
+          addSchemaAction.setFieldValue('paymentClauseType', data.paymentClauseType)
+          addSchemaAction.setFieldValue('paymentClauseTypeName', data.paymentClauseTypeName)
+          // 到货区域
+          addSchemaAction.setFieldValue('arrivalArea', data.arrivalArea)
+          // 到货港口
+          addSchemaAction.setFieldValue('arrivalPort', data.arrivalPort)
           addSchemaAction.setFieldState('products', productState => {
             const columns = data.orderMode === OrderModalType.PURCHASE_REQUISITION_CONTRACT_ORDER
               ? materialColumnsByRequisition