fix: 处理简单流程采购下单和签署合同整合为一次提交，处理编辑订单发票信息无法回显

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -241,7 +241,13 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
   /* 构建表格列和data */
   const constructedCallback = () => {
     let _col = [];
-    let col_productName = { title: '商品名称', dataIndex: '商品名称', key: '商品名称' }
+    let col_productName = {
+      title: '商品名称',
+      dataIndex: '商品名称',
+      key: '商品名称',
+      width: "30%",
+      // ellipsis: true,
+    }
     _col.push(col_productName)
     let _priceAttribute = productSelectAttribute.filter(_item=>_item.isPrice)
 

src/pages/commodity/products/addProductsItem/productAttributeForm.tsx

 import React, { useState, useEffect, useRef } from 'react'
 import {history} from 'umi'
-import { Form, Select, Checkbox, Tabs, Input, DatePicker } from 'antd'
+import { Form, Select, Checkbox, Tabs, Input, DatePicker, Row, Col } from 'antd'
 
 import { inject, observer } from 'mobx-react'
 import { store } from '@/store'
@@ -208,12 +208,17 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
               <Checkbox.Group
                 onChange={(v)=>onChange(v, attrItem)}
                 disabled={_isDisabled}
+                style={{width: "100%"}}
               >
+                <Row>
                   {
                     attrItem?.customerAttributeValueList.length > 0 && attrItem.customerAttributeValueList.map((item: any, index: string) => (
-                    <Checkbox key={item.id} value={item.id}>{item.value}</Checkbox>
+                      <Col span={6} key={item.id}>
+                        <Checkbox value={item.id}>{item.value}</Checkbox>
+                      </Col>
                     ))
                   }
+                </Row>
               </Checkbox.Group>
             </Form.Item>
           )

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

@@ -66,6 +66,9 @@ const InvoiceModal:React.FC<InvoiceModalProps> = (props) => {
       actions={schemaActions}
       schema={addressSchema}
       onSubmit={handleSubmit}
+      modalProps={{
+        destroyOnClose: true
+      }}
     />
   )
 }

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

@@ -61,7 +61,7 @@ const SimpleElectronModal:React.FC<SimpleElectronModalProps> = (props) => {
           signatureState.current = null
           setVisible(false)
           schemaAction.setFieldValue("signatureLogId", res.data.signatureLogId)
-          message.success("操作成功")
+          // message.success("操作成功")
         }
       }, 2000)
     }

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

@@ -156,9 +156,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   )
   const { productAddButton, productRef, productColumns, productComponents, ...sectionProps } = useProductTable(addSchemaAction)
 
+  let timerSignature = null
   // 页面进入时， 当前所处的下单模式
-
-
   useEffect(() => {
     if (id) {
       setFormLoading(true)
@@ -185,7 +184,13 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
       }
     }
 
+    return () => {
+      clearInterval(timerSignature)
+      timerSignature = null
+    }
+
   }, [])
+
   const handleSubmit = async (value) => {
     let _orderProductRequests = JSON.parse(JSON.stringify(value.orderProductRequests))
     let processEnum = value['processEnum']
@@ -194,6 +199,15 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
     let electronicContractId = value['electronicContractId']
     if(processEnum === 24 && usingElectronicContracts && !signatureLogId) {
       setBtnLoading(true)
+      // 监听 是否完成签合同 提交订单
+      timerSignature = setInterval(() => {
+        let __signatureLogId = addSchemaAction.getFieldValue("signatureLogId")
+        if(__signatureLogId) {
+          clearInterval(timerSignature)
+          timerSignature = null
+          addSchemaAction.submit()
+        }
+      }, 1000)
       // 生成并签署合同
       if(electronicContractId) {
         fetchOrderApi.createContract({
@@ -213,7 +227,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           orderModel: value['orderModel'],
           deliveryAddresId: value['deliveryAddresId']["id"],
         }).then(_data => {
-          setBtnLoading(false)
+          // setBtnLoading(false)
           if(_data?.contractName) {
             addSchemaAction.setFieldState("usingElectronicContracts", state => {
               state.props["x-component-props"].contract = { contractTemplateId: electronicContractId, ..._data, }