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

src/pages/logistics/list/components/templateForm.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-15 10:31:55
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-10-14 15:16:33
+ * @LastEditTime: 2020-10-16 14:51:25
  */
 import React, { Component, useState, useEffect } from 'react';
 import ReactDOM from 'react-dom'
@@ -141,16 +141,28 @@ const diaLogForm: React.FC<ListProps> = (props) => {
   const FormSumbit = (values: any) => {
     let id = history.location.query.id
     let value = { ...values }
+    if(value.designateList.length === 1 && JSON.stringify(value.designateList[0])  === '{}'){
+      delete value.designateList
+    }
     if (id == 0) {
-      PublicApi.postLogisticsFreightTemplateAdd(value).then(res => { })
+      PublicApi.postLogisticsFreightTemplateAdd(value).then(res => { 
+        if(res.code === 1000){
+          setTimeout(() => {
+            history.goBack()
+          }, 1000)
+        }
+      })
 
     } else {
       value.id = Number(id)
-      PublicApi.postLogisticsFreightTemplateUpdate(value).then(res => { })
+      PublicApi.postLogisticsFreightTemplateUpdate(value).then(res => { 
+        if(res.code === 1000){
+          setTimeout(() => {
+            history.goBack()
+          }, 1000)
+        }
+      })
     }
-    setTimeout(() => {
-      history.goBack()
-    }, 1000)
   }
 
   const onSearch = () => {

src/pages/logistics/list/template.tsx

-EyePreview/*
+/*
  * @Author: LeeJiancong
  * @Date: 2020-07-14 15:07:34
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-19 11:03:37
+ * @LastEditTime: 2020-10-16 14:29:56
  */
 import React, { Component, ReactNode, useRef, useState } from 'react'
 import { history } from 'umi'

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

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:39:11
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-28 14:35:22
+ * @LastEditTime: 2020-10-15 15:11:34
  */
 /**
  * @description: 组件描述: 一级 二级 待提交报价单