询价和需求报价添加商品加上图片链接， 运费模板弹框BUG修复， 修改询价报价附件编辑添加附件把之前的搞没得问题

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

@@ -65,6 +65,7 @@ const { ON_FORM_SUBMIT } = LifeCycleTypes //拿到Form提交API
 const onFormSubmit$ = FormEffectHooks
 const { Option } = ISelect;
 const diaLogForm: React.FC<ListProps> = (props) => {
+  const [formIsHalfFilledOut, setFormIsHalfFilledOut] = useState(true)
   const [provinceList, setProvinceList] = useState([])
   const [editable, setEditable] = useState<boolean>(true)
   const [headerTitle, setHeaderTitle] = useState('')
@@ -163,6 +164,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
         }
       })
     }
+    setFormIsHalfFilledOut(false)
   }
 
   const onSearch = () => {
@@ -443,7 +445,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
           </Col>
         </Row>
       </Card>
-      <Prompt message="您还有未保存的内容，是否确定要离开" />
+      <Prompt when={formIsHalfFilledOut}  message="您还有未保存的内容，是否确定要离开" />
     </PageHeaderWrapper>
   )
 }

src/pages/transaction/common/tableStatusList.tsx

@@ -266,7 +266,7 @@ export const demandQuoteInteriorState = (text:any) => {
 // 询价查询， 询价报价， 确认询价报价单 通用外部状态
 export const generalExternalState = (status:any) => {
   let component: ReactNode = null;
-  PublicApi.getOrderQuotationExternalStateEnum({}).then(res => {
+  PublicApi.getOrderQuotationExternalStateEnum().then(res => {
     if(res.code === 1000) {
       console.log(res.data)
     }

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

@@ -158,7 +158,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
         productName: name,//商品名称
         brand: brandName,
         category: customerCategoryName,
-        productId: id
+        productId: id,
       })
       //查询属性 
       GetCommodityAttribute(id)
@@ -193,7 +193,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
    */
   const handletOk = () => {
     Curform.validateFields().then(v => {
-      props.onOK(v, commodityAttributedataSource)
+      props.onOK(v, commodityAttributedataSource, productRowCtl.selectRow[0])
       props.productAttributeJson(commodityAttributedataSource)
       setcommodityAttributedataSource({})
       productRowCtl.setSelectRow([]);

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

@@ -778,6 +778,10 @@ const Detail: React.FC<{}> = () => {
         item.purchaseQuantity = v.purchaseQuantity //数量
         item.productId = v.productId //商品ID 选择的
         item.requisitionFormNo = values.requisitionFormNo
+        item.memberId = v.memberId
+        item.memberRoleId = v.memberRoleId
+        item.logistics = v.logistics
+        item.imgUrl = v.imgUrl
         let _otherList = []
         Object.keys(v).forEach(child => {
           otherList.forEach(j => {
@@ -826,27 +830,11 @@ const Detail: React.FC<{}> = () => {
    * @param {type} 
    * @return {type} 
    */
-  const handleSubmit = (values: any, sourData: any) => {
-    console.log('弹窗内容', values, sourData)
+  const handleSubmit = (values: any, sourData: any, selectRow:any) => {
+    console.log('弹窗内容',selectRow)
+    
     let item = {}
     let list = []
-
-    //先循环所有 再循环有值的
-    // otherList.forEach((vitem: any) => {
-    //   Object.keys(values).forEach((key) => {
-    //     console.log('key', key)
-    //     if (vitem.title == key) {
-    //       console.log('vitem.title:', vitem.title)
-    //       console.log('value', values[vitem.title])
-    //       item[key] = values[vitem.title]
-    //     } else {
-    //       item[key] = values[key]
-    //     }
-    //   })
-    // })
-    // list.push(item)
-    // console.log('list', list)
-
     let source = []
     let otherColumnkey = []//动态列的展示
     let data = sourData
@@ -860,10 +848,13 @@ const Detail: React.FC<{}> = () => {
     });
     obj['category'] = values.category
     obj['specifications'] = values.model
+    obj['memberId'] = selectRow.memberId
+    obj['memberRoleId'] = selectRow.memberRoleId
+    obj['logistics'] = selectRow.logistics
+    obj['imgUrl'] = selectRow.mainPic
     //动态
     data.forEach((v) => {
       if (JSON.stringify(v.customerAttribute) != '{}') {
-
         //获取列头
         otherColumnkey.push({
           title: v.customerAttribute.name,
@@ -881,8 +872,8 @@ const Detail: React.FC<{}> = () => {
     })
     source.push(obj)
     console.log([...source])
+    
     setotherList([...otherColumnkey])//生成列
-
     setproductSource([...productSource, ...source])//新增就要合并
     setdialogVisible(false)
   }
@@ -1186,7 +1177,7 @@ const Detail: React.FC<{}> = () => {
           mode={mode}
           initialValues={RroductinitialValues}
           productAttributeJson={productAttributeJson}
-          onOK={(values: any, data) => handleSubmit(values, data)}
+          onOK={(values: any, data, selectRow) => handleSubmit(values, data, selectRow)}
           onCancel={() => setdialogVisible(false)}
         >
         </RroductModal>

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -51,8 +51,8 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
         purchaseCount: 1,
         logistics: v.logistics,
         memberId: v.memberId,
-        memberRoleId: v.memberRoleId
-
+        memberRoleId: v.memberRoleId,
+        imgUrl: v.mainPic
       })
       setinquiryGoods(inquiry);
       setgoodsList(arr);

src/pages/transaction/goodsOffer/schema/index.tsx

@@ -63,7 +63,7 @@ export const commonEnquieryOfferSchema: ISchema = {
                 placeholder:'询价单摘要'
               }
             },
-            inquiryListMemberName:{
+            memberName:{
               type:'string',
               "x-component-props":{
                 placeholder:'被询价会员'

src/pages/transaction/inquiryQuote/addInquiryOrder/addForm.tsx

@@ -38,7 +38,7 @@ const AddQuotes: React.FC<parmas> = (props) => {
           setenclosureUrls(res.data.enclosureUrls)
         }
       })
-    } else if( id && type === 3) {
+    } else if (id && type === 3) {
       // 报价
       PublicApi.getOrderProductInquiryDetails({ id }).then(res => {
         if (res.code === 1000) {
@@ -57,38 +57,33 @@ const AddQuotes: React.FC<parmas> = (props) => {
   const onSumbit = async (params: any) => {
     setloading(true);
     const basicInfo = await basicInfoRef.current.validateFields();
-    if (count === '3') {
-      const tradingConditions = await tradingConditionsRef.current.validateFields();
-      const basicInfoData = basicInfo.data;
-      const tradingConditionsData = tradingConditions.data;
-      if (basicInfo.state && tradingConditions.state) {
-        const parmas = {
-          inquiryListProductRequests: goodsList, // 商品列表 ,InquiryListProductRequest
-          ...basicInfoData,
-          ...tradingConditionsData,
-          enclosureUrls,
-          inquiryListNo: inquiryNo.orderNo,
-          inquiryListId: inquiryNo.orderId
-        }
-        if (id && type === 2) {
-          parmas.id = editData.id;
-          await PublicApi.postOrderProductQuotationUpdate(parmas).then(res => {
-            if (res.code === 1000) {
-              history.goBack();
-            } else {setloading(false);}
-          })
-        } else {
-          await PublicApi.postOrderProductQuotationAdd(parmas).then(res => {
-            if (res.code === 1000) {
-              history.goBack();
-            } else {setloading(false);}
-          })
-        }
+    const tradingConditions = await tradingConditionsRef.current.validateFields();
+    const basicInfoData = basicInfo.data;
+    const tradingConditionsData = tradingConditions.data;
+    if (basicInfo.state && tradingConditions.state) {
+      const parmas = {
+        inquiryListProductRequests: goodsList, // 商品列表 ,InquiryListProductRequest
+        ...basicInfoData,
+        ...tradingConditionsData,
+        enclosureUrls,
+        inquiryListNo: inquiryNo.orderNo,
+        inquiryListId: inquiryNo.orderId
+      }
+      if (id && type === 2) {
+        parmas.id = editData.id;
+        await PublicApi.postOrderProductQuotationUpdate(parmas).then(res => {
+          if (res.code === 1000) {
+            history.goBack();
+          } else { setloading(false); }
+        })
       } else {
-        message.error('有必填字段没选择，请检查！');
-        setloading(false);
+        await PublicApi.postOrderProductQuotationAdd(parmas).then(res => {
+          if (res.code === 1000) {
+            history.goBack();
+          } else { setloading(false); }
+        })
       }
-    }else {
+    } else {
       message.error('有必填字段没选择，请检查！');
       setloading(false);
     }
@@ -144,13 +139,13 @@ const AddQuotes: React.FC<parmas> = (props) => {
             />
           </TabPane>
           <TabPane tab="附件" key="4" forceRender>
-            <Attached 
+            <Attached
               editData={editData}
               handleGetEnclosureUrls={handleGetEnclosureUrls}
             />
           </TabPane>
           <TabPane tab="流转记录" key="5" forceRender>
-            <FlowRecord 
+            <FlowRecord
               editData={editData}
             />
           </TabPane>

src/pages/transaction/inquiryQuote/addInquiryOrder/components/attached.tsx

@@ -28,19 +28,17 @@ const Attached: React.FC<parmas> = (props) => {
     return isLt20M;
   }
   // 上传回调
-  const handleChange = ({ fileList }) => {
+  const handleChange = ({ file }) => {
     const arr: any = [];
-    fileList.forEach(v => {
-      if (v.response) {
-        if (v.response.code === 1000) {
-          arr.push({
-            name: v.name,
-            url: v.response.data
-          })
-        }
+    if (file.response) {
+      if (file.response.code === 1000) {
+        arr.push({
+          name: file.name,
+          url: file.response.data
+        })
       }
-    })
-    setFiles(arr)
+    }
+    setFiles([...files, ...arr])
     handleGetEnclosureUrls(arr);
   }
   // 删除附件
@@ -51,12 +49,12 @@ const Attached: React.FC<parmas> = (props) => {
     handleGetEnclosureUrls(arr);
   }
   useEffect(() => {
-    if(Object.keys(editData).length > 0) {
+    if (Object.keys(editData).length > 0) {
       setFiles(editData.enclosureUrls)
     }
   }, [editData])
 
-
+  console.log(files, 10086)
   return (
     <Form
       {...layout}