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

src/pages/afterService/exchangeGoods/orderPreview/index.tsx

@@ -6,7 +6,7 @@ import OrderProcess from './components/orderProcess'
 import ReplaceGoods from './components/replaceGoods'
 import ReturnGoods from './components/returnGoods'
 import ReplaceDetail from './components/replaceDetail'
-import HistoryLog from './components/HistoryLog'
+import HistoryLog from './components/historyLog'
 
 interface OrderPreviewPropsType { }
 

src/pages/transaction/enquiryOffer/components/confirmModal.tsx

@@ -27,13 +27,13 @@ const comfirmDialog: React.FC<Params> = (props) => {
     value.id = Number(props.id)
     console.log('value',value)
     if(props.type == 1){
-      PublicApi.postOrderRequisitionFormAudit(value).then(res => {
+      PublicApi.postOrderQuotationDocumentsReview(value).then(res => {
         if (res.code === 1000) {
           props.onOK()
         }
       })
     }else if(props.type == 2){
-      PublicApi.postOrderRequisitionFormAuditTwo(value).then(res => {
+      PublicApi.postOrderQuotationDocumentsReviewTwo(value).then(res => {
         if (res.code === 1000) {
           props.onOK()
         }

src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx

@@ -572,10 +572,7 @@ const Detail: React.FC<{}> = () => {
           let areaCodeList = []
           setdataInfo(data)//总
           //地区
-          setinitialValues({
-            quotationSummary: data,
-            
-          })
+          setinitialValues(data)
           getOrderProductAll(data.requisitionFormId) //查询规格 赋值弹窗单位和采购数量
           tabForm.resetFields()
         }