fix: 处理订单详情发货信息显示异常，处理询价下单简单流程签署合同异常

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

@@ -104,7 +104,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
             </Row>
             <Row className={style['card-list']}>
               <Col span={6}><p>发货时间: </p></Col>
-              <Col><p>{moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
+              <Col><p>{data?.deliverTime && moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
             </Row>
             <Row className={style['card-list']}>
               <Col span={6}><p>物流单号: </p></Col>

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

@@ -42,11 +42,13 @@ const SimpleElectronModal:React.FC<SimpleElectronModalProps> = (props) => {
     const res = await PublicApi.postOrderSignatureOrderSettleSign(contracts, { ctlType: "none" })
     if(res.code === 1000) {
       timer = setInterval(() => {
-        console.log(signatureState.current, 'signatureState')
         if (signatureState.current !== 4) {
           PublicApi.getOrderSignatureOrderSettleSignDetail({signatureLogId: res.data.signatureLogId + ''}).then(_res => {
             if(_res.code === 1000) {
               signatureState.current = _res.data.state
+              if(_res.data.state === 4) {
+                schemaAction.setFieldValue("electronicContractUrl", _res.data.contractUrl)
+              }
             } else {
               clearInterval(timer)
               timer = null

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -256,7 +256,8 @@ export const useInvoiceList = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
 // 查询工作流获取电子合同
 export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsyncActions) => {
   let params: any = {};
-  params['productId'] = ctx.getFieldValue('orderProductRequests')[0]['id']
+  // 商品数据有commodityId为手动下单 不存在为询价等下单
+  params['productId'] = ctx.getFieldValue('orderProductRequests')[0]['commodityId'] ? ctx.getFieldValue('orderProductRequests')[0]['id'] : ctx.getFieldValue('orderProductRequests')[0]['productId']
   params['orderModelId'] = ctx.getFieldValue('orderModel')
   params['memberId'] = ctx.getFieldValue('supplyMembersId')
   params['memberRoleId'] = ctx.getFieldValue('supplyMembersRoleId')
@@ -276,6 +277,7 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
           ctx.setFieldState("usingElectronicContracts", state => {
             state.props["x-component-props"].contract = { contractTemplateId: data['electronicContractId'], ..._data, }
           })
+          ctx.setFieldValue("electronicContractName", _data.contractName)
         })
       }
     })

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

@@ -189,7 +189,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
     let processEnum = addSchemaAction.getFieldValue('processEnum')
     let usingElectronicContracts = addSchemaAction.getFieldValue('usingElectronicContracts')
     let signatureLogId = addSchemaAction.getFieldValue("signatureLogId")
-    console.log(processEnum, usingElectronicContracts, signatureLogId)
     if(processEnum === 24 && usingElectronicContracts && !signatureLogId) {
       contractRef.current.setVisible(true)
       return ;

src/pages/transaction/purchaseOrder/orderCollect/schema/index.ts

@@ -425,6 +425,16 @@ const ortherInfo: ISchema = {
           title: '合同签署记录id',
           visible: false
         },
+        electronicContractUrl: {
+          type: "string",
+          title: '合同URL',
+          visible: false
+        },
+        electronicContractName: {
+          type: "string",
+          title: '合同Name',
+          visible: false
+        },
       }
     }
   }