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

src/pages/logistics/list/addCompany.tsx

 import * as React from 'react';
 import { useState, useRef, useEffect } from 'react';
-import { Row, Col, Tooltip, Form, Input, Select, Popconfirm, Button, Card, message, Modal } from 'antd';
-import { DeleteOutlined, FormOutlined, PlusCircleOutlined, LoadingOutlined, PlusOutlined, LinkOutlined } from '@ant-design/icons';
+import { Row, Col, Form, Input, Select, Popconfirm, Button, Card } from 'antd';
+import { LinkOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { ColumnType } from 'antd/lib/table/interface'
-import { StandardTable } from 'god'
 import { history } from 'umi'
 import ReutrnEle from '@/components/ReturnEle';
 import ModalTable from '@/components/ModalTable'
-import { PublicApi, CustomApi } from '@/services/api'
-import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
+import { PublicApi } from '@/services/api'
+import { PageStatus } from '@/hooks/usePageStatus'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { addCompany, updateCompany, getCompanyDetail } from '@/services/logistics/index'
-import style from "./addCompany.less"
 import { ISchema } from '@formily/antd';
 export interface companyProps {
 
@@ -64,19 +61,6 @@ const columns: ColumnType<any>[] = [
     align: 'center'
   }
 ]
-// 模拟请求
-// const fetchData = (params: any) => {
-//   return new Promise((resolve, reject) => {
-//     const queryResult = data.find(v => v.key === params.keywords)
-//     setTimeout(() => {
-//       resolve({
-//         code: 200,
-//         message: '',
-//         data: queryResult ? [queryResult] : data
-//       })
-//     }, 1000)
-//   })
-// }
 
 const fetchData = async (params) => {
   const res = await PublicApi.getMemberManageLowerPageBynamerole(params)
@@ -108,6 +92,7 @@ const company: React.FC<parmas> = (props) => {
   const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   useEffect(() => {
+    console.log(id, pageStatus, '100000')
     let _title = pageStatus === PageStatus.PREVIEW ? '查看' : id ? '编辑' : '新建'
     setHeaderTitle(`${_title}物流公司`)
     PublicApi.getMemberManageRoleList().then(res => {
@@ -136,6 +121,7 @@ const company: React.FC<parmas> = (props) => {
 
   const handleSubmitAllSetting = () => {
     menuForm.validateFields().then((values: any) => {
+      console.log(values, '嘿嘿嘿')
       if (id) {
         values.id = id
         setLoading(true)
@@ -250,13 +236,9 @@ const company: React.FC<parmas> = (props) => {
               (<Form
                 form={menuForm}
                 colon={false}
-
                 name="edit_infomation"
-                layout="horizontal"
                 labelAlign="left"
-                autoComplete="off"
                 {...layout}
-
               >
                 <Row gutter={24}>
                   <Col span={18}>
@@ -292,7 +274,7 @@ const company: React.FC<parmas> = (props) => {
                             }
                           ]}
                         >
-                          <Input disabled={isSee} className="input_addonAfter" disabled maxLength={20} addonAfter={selectBtn} />
+                          <Input disabled={isSee} className="input_addonAfter" maxLength={20} addonAfter={selectBtn} />
                         </Form.Item>
                         :
                         <Form.Item

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

@@ -91,7 +91,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
    */
   const formSubmit = (values) => {
     console.log(values)
-    let id = history.location.query.id //0新建 
+    // let id = history.location.query.id //0新建 
     let value = { ...values }
     value.isDefault = values.isDefault ? 1 : 0
     value.provinceCode = value.provinceCode.split('-').length > 1 ? value.provinceCode.split('-')[0] : value.provinceCode 
@@ -101,7 +101,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
     value.cityName = cityName
     value.districtName = districtName 
     if (type == 1) {
-      if (id == 0) {
+      if (!id) {
         setloading(true)
         PublicApi.postLogisticsShipperAddressAdd(value).then(res => {
           if (res.code == 1000) {
@@ -118,7 +118,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
         })
       }
     } else {
-      if (id == 0) {
+      if (!id) {
         setloading(true)
         PublicApi.postLogisticsReceiverAddressAdd(value).then(res => {
           if (res.code == 1000) {
@@ -176,8 +176,8 @@ const diaLogForm: React.FC<ListProps> = (props) => {
   useEffect(() => {
     const id = Number(history.location.query.id) 
     console.log(typeof(id))
-    let title = id === 0 ? '新建' : '编辑'
-    type === 1 ? setHeaderTitle(`${title}发货地址`) : setHeaderTitle(`${title}收货地址`)
+    // let title = id === 0 ? '新建' : '编辑'
+    // type === 1 ? setHeaderTitle(`${title}发货地址`) : setHeaderTitle(`${title}收货地址`)
     PublicApi.getManageCountryAreaGetTelCode().then(res => {
       res.data.forEach((item,index) => {
         TelCodeList.push({ label: item, value: (index).toString() })
@@ -306,7 +306,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
     <PageHeaderWrapper
       onBack={() => history.goBack()}
       backIcon={<ReutrnEle description="返回" />}
-      title={headerTitle}
+      // title={headerTitle}
     >
       <Card>
         <Row>
@@ -415,7 +415,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
                   x-component="TextArea"
                   x-component-props={{
                     placeholder: '请输入详细地址',
-                    autocomplete: 'off'
+                    autoComplete: 'off'
                   }}
                   x-rules= {[{
                     max: 30,

src/pages/logistics/receiptAddress/add.tsx

@@ -6,7 +6,6 @@ const AddShipingAddress:React.FC<{}> = () => {
   return(
     <AddressTemplate 
       type={2}
-      id={0}
     />
   )
 }

src/pages/systemSetting/collection/index.tsx

@@ -14,18 +14,22 @@ interface CollectionPropsType {
 
 const Collection: React.FC<CollectionPropsType> = (props) => {
   const { query: { type } } = props.location
-  const [defaultTab, setDefaultTab] = useState<string>("commodity")
+  const [tabKey, setTabKey] = useState<string>("commodity")
 
   useEffect(() => {
     if (type) {
-      setDefaultTab(type)
+      setTabKey(type)
     }
   }, [type])
 
+  const handleChange = (key) => {
+    setTabKey(key)
+  }
+
   return (
     <PageHeaderWrapper>
       <div className={styles.collection_wrap}>
-        <Tabs activeKey={defaultTab} className={styles.collection_tabs} >
+        <Tabs activeKey={tabKey} className={styles.collection_tabs} onChange={handleChange} >
           <TabPane tab="商品收藏" key="commodity">
             <Commodity />
           </TabPane>

src/pages/transaction/common/statusList.ts

@@ -287,3 +287,62 @@ export const searchFilterInteriorState = [
     label: '审核不通过', value: 6
   }
 ]
+
+/***********************需求报价******************************* */
+/**
+ * @description: 需求报价外部状态筛选
+ * @param {type} 外部状态:
+ * @return {type} 1.提交需求单 2.审核需求单  3.提交报价单  4.确认报价单 5.完成 6.审核不通过 7.取消报价单
+ */
+export const demandQuoteExternalState = [
+  {
+    label: '提交需求单', value: 1
+  },
+  {
+    label: '审核需求单', value: 2
+  },
+  {
+    label: '提交报价单', value: 3
+  },
+  {
+    label: '确认报价单', value: 4
+  },
+  {
+    label: '完成', value: 5
+  },
+  {
+    label: '审核不通过', value: 6
+  },
+  {
+    label: '取消报价单', value: 7
+  }
+]
+
+ /**
+ * @description: 需求报价内部状态筛选
+ * @param {type} 内部状态:
+ * @return {type} 1.新增需求单 2.审核需求单一级 3.审核需求单二级 4.提交需求单 5.完成 6.审核不通过 7.取消报价单
+ */
+export const demandQuoteInteriorState = [
+  {
+    label: '新增需求单', value: 1
+  },
+  {
+    label: '审核需求单一级', value: 2
+  },
+  {
+    label: '审核需求单二级', value: 3
+  },
+  {
+    label: '提交需求单', value: 4
+  },
+  {
+    label: '完成', value: 5
+  },
+  {
+    label: '审核不通过', value: 6
+  },
+  {
+    label: '取消报价单', value: 7
+  }
+]
\ No newline at end of file

src/pages/transaction/enquiryOffer/components/inquiryModalTable/index.tsx

@@ -17,7 +17,7 @@ export interface InquiryModalTableProps extends ModalTableProps {
  * @return {type} 
  */
 const fetchEqData = async (params: any) => {
-  const res = await PublicApi.getOrderQuotationRequisitionFormList(params);
+  const res = await PublicApi.getOrderQuotationRequisitionFormList({...params,externalState: 2});
   return res.data
 }
 const formTime = (text) => {

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

@@ -6,13 +6,12 @@
  * @LastEditTime: 2020-09-24 11:25:03
  */
 import React, { Component, useState, useRef, useEffect, useImperativeHandle } from 'react';
-import { Modal, Button, Space, Form, Radio, AutoComplete, Badge, Tabs, Input, Select, Checkbox } from 'antd'
+import { Modal, Button, Space, Form, Radio, AutoComplete, Badge, Tabs, Input, Select, Checkbox, message } from 'antd'
 import { PublicApi } from '@/services/api'
 import ModalTable from '@/components/ModalTable'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { PageStatus, usePageStatus } from '@/hooks/usePageStatus'
 import { ColumnType } from 'antd/lib/table/interface'
-import { ISchema } from '@formily/antd'
 import { LinkOutlined } from '@ant-design/icons'
 const { TabPane } = Tabs
 const { Option } = Select
@@ -192,7 +191,12 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
     Curform.validateFields().then(v => {
       props.onOK(v, commodityAttributedataSource)
       props.productAttributeJson(commodityAttributedataSource)
+      setcommodityAttributedataSource({})
+      productRowCtl.setSelectRow([]);
+      productRowCtl.setSelectedRowKeys([])
       Curform.resetFields()
+    }).catch(err => {
+      message.error('有必填选项没选择或填写,请检查！')
     })
   }
 
@@ -228,26 +232,6 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
     </Button>
   )
 
-  const formSearch: ISchema = {
-    type: 'object',
-    properties: {
-      name: {
-        type: 'string',
-        "x-component": "Search",
-        "x-component-props": {
-          placeholder: '输入关键字搜索'
-        }
-      },
-      roleId: {
-        type: 'string',
-        "x-component-props": {
-          placeholder: '选择会员角色'
-        },
-        enum: []
-      }
-    }
-  }
-
   const placeholderText = '请先选择对应需求单号'
   let ButtonList = [
     <Button onClick={() => props.onCancel()} >
@@ -262,6 +246,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
       <Modal
         title={headerTitle}
         width={800}
+        zIndex={999}
         visible={props.dialogVisible}
         onOk={() => handletOk()}
         onCancel={() => props.onCancel()}
@@ -426,11 +411,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
         columns={columns}
         rowSelection={productRowSelection}
         fetchTableData={params => fetchData(params)}
-        formilyProps={{
-          ctx: {
-            schema: formSearch
-          }
-        }}
+        modalType='productByMember'
         tableProps={{
           rowKey: 'id'
         }}

src/pages/transaction/enquiryOffer/enquirySearch/index.tsx

@@ -100,6 +100,12 @@ const List:React.FC<{listParams}> = (props) => {
       align:'left'
     },
     {
+      title:'需求会员',
+      key:'demandMembers',
+      dataIndex:'demandMembers',
+      align:'left'
+    },
+    {
       title:'交付日期',
       key:'deliveryTime',
       dataIndex:'deliveryTime',

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

 import { ISchema} from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
-import {TimeList} from '../../common/statusList'
+import {TimeList, demandQuoteExternalState , demandQuoteInteriorState} from '../../common/statusList'
 import TranactionRoute from 'config/routes/tranactionRoute'
 
 /**
@@ -143,7 +143,7 @@ export const enquierySearchSchema: ISchema = {
 
           },
           "x-component-props":{
-            placeholder:'搜索',
+            placeholder:'需求单号',
             align: 'flex-left',
           }
         }
@@ -172,34 +172,42 @@ export const enquierySearchSchema: ISchema = {
             inline: true
           },
           properties:{
+            details: {
+              type:'string',
+              "x-component-props":{
+                placeholder:'需求摘要'
+              }
+            },
             demandMembers:{
               type:'string',
               "x-component-props":{
-                placeholder:'询价会员'
+                placeholder:'需求会员'
               }
             },
-            // category:{
-            //   type:'string',
-            //   'x-component': 'CustomInputSearch',
-            //   'x-component-props': {
-            //     placeholder: '商品品类',
-            //     showSearch: true,
-            //     showArrow: true,
-            //     defaultActiveFirstOption: false,
-            //     filterOption: false,
-            //     notFoundContent: null,
-            //     style: { width: '174px', lineHeight: '32px' },
-            //     searchValue: null,
-            //     dataoption: []
-            //   }
-            //   // "x-component-props":{
-            //   //   placeholder:'请选择品类'
-            //   // },
-            //   // enum:[]
-            // },
+            category:{
+              type:'string',
+              'x-component': 'CustomInputSearch',
+              'x-component-props': {
+                placeholder: '品类',
+                showSearch: true,
+                showArrow: true,
+                defaultActiveFirstOption: false,
+                filterOption: false,
+                notFoundContent: null,
+                style: { width: '174px', lineHeight: '32px' },
+                searchValue: null,
+                dataoption: []
+              }
+            },
+            externalState:{
+              type:'string',
+              "x-component-props":{
+                placeholder:'外部状态'
+              },
+              enum: demandQuoteExternalState
+            },
             voucherTime:{
               type:'string',
-              default: 0,
               "x-component-props":{
                 placeholder:'请选择单据时间'
               },
@@ -242,7 +250,7 @@ export const enquieryOfferSearchSchema: ISchema = {
 
           },
           "x-component-props":{
-            placeholder:'搜索',
+            placeholder:'报价单号',
             align: 'flex-left',
           }
         }
@@ -274,43 +282,37 @@ export const enquieryOfferSearchSchema: ISchema = {
             requisitionFormNo:{
               type:'string',
               "x-component-props":{
-                placeholder:'对应需求单号'
+                placeholder:'需求单号'
               }
             },
             quotationSummary:{
               type:'string',
               "x-component-props":{
-                placeholder:'摘要'
+                placeholder:'报价单摘要'
               }
             },
             demandMembers:{
               type:'string',
               "x-component-props":{
-                placeholder:'报价会员'
+                placeholder:'需求会员'
               }
             },
-            // category:{
-            //   type:'string',
-            //   'x-component': 'CustomInputSearch',
-            //   'x-component-props': {
-            //     placeholder: '商品品类',
-            //     showSearch: true,
-            //     showArrow: true,
-            //     defaultActiveFirstOption: false,
-            //     filterOption: false,
-            //     notFoundContent: null,
-            //     style: { width: '174px', lineHeight: '32px' },
-            //     searchValue: null,
-            //     dataoption: []
-            //   }
-            //   // "x-component-props":{
-            //   //   placeholder:'请选择品类'
-            //   // },
-            //   // enum:[]
-            // },
             voucherTime:{
               type:'string',
-              default: 0,
+              "x-component-props":{
+                placeholder:'外部状态'
+              },
+              enum: demandQuoteExternalState
+            },
+            externalState:{
+              type:'string',
+              "x-component-props":{
+                placeholder:'内部状态'
+              },
+              enum: demandQuoteInteriorState
+            },
+            interiorState:{
+              type:'string',
               "x-component-props":{
                 placeholder:'请选择单据时间'
               },

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

@@ -398,10 +398,9 @@ const Detail: React.FC<{}> = () => {
    * @return {type} 
    */
   const hanldeDeleteModel = (index) => {
-    let list = productSource.slice(1, index)
-    // let ol = otherList.slice(1,index)
-    // setotherList([...ol])
-    setproductSource([...list])
+    const list = [...productSource];
+    list.splice(index, 1);
+    setproductSource(list)
   }
 
   const equiryColumns: ColumnType<any>[] = [
@@ -476,7 +475,15 @@ const Detail: React.FC<{}> = () => {
           setdialogVisible(true)
           setmode(1)
         }}>编辑</Button>
-        <Button type="link" onClick={(index) => hanldeDeleteModel(index)}>删除</Button>
+        <Popconfirm
+          title="确定要删除吗?"
+          okText="是"
+          cancelText="否"
+          onConfirm={() => hanldeDeleteModel(index)}
+        >
+          <Button type="link">删除</Button>
+        </Popconfirm>
+        
       </>
     },
   ]

src/pages/transaction/enquirySubmit/components/detail.tsx

@@ -51,13 +51,15 @@ interface parmas {
   freightPrice: number,
   settlementWay: string,
   pagetype?: any,
-  operation?: number
+  operation?: any
 }
 
 const detailInfo: React.FC<parmas> = (props) => {
   const ref = useRef<any>({})
-  const { pagetype, operation } = props;
-  // const [pagetype, setpagetype] = useState(history.location.query.page_type)
+  const { pagetype } = props;
+  const { pathname } = history.location;
+  const type = pathname.split('/')[pathname.split('/').length - 1];
+  const [operation, setoperation] = useState<Number>(0)
   let interiorStateList = []
   let [isextraOption, setIsextraOption] = useState(false)
   const [platType, setplatType] = useState(1) //需求对接类型
@@ -145,7 +147,7 @@ const detailInfo: React.FC<parmas> = (props) => {
       title: '交易条件',
       leftElem: [
         { title: '交付日期', key: 'shipmentOrderNo', value: moment(dataInfo.deliveryTime).format('YYYY-MM-DD HH:mm:ss') },
-        { title: '交付地址', key: '', value: shipperAddress },
+        { title: '交付地址', key: '', value: dataInfo.addres },
         { title: '物流要求', key: '', value: dataInfo.logistics }
       ],
       centerElem: [
@@ -293,8 +295,10 @@ const detailInfo: React.FC<parmas> = (props) => {
 
   //在这做逻辑判断  判断路由 是由哪个页面进来的
   useEffect(() => {
-    let pathname = history.location.pathname
     init()
+    if(type === 'detail') {
+      setoperation(1)
+    }
   }, [])
   const init = () => {
     PublicApi.getOrderRequisitionFormDetails({ id: id }).then(res => {
@@ -580,6 +584,7 @@ const detailInfo: React.FC<parmas> = (props) => {
           </div>
           <Row className={style['mainCol-rows']}>
             {
+              dataInfo.requisitionFormAddress &&
               dataInfo.requisitionFormAddress.length > 0 ?
 
                 dataInfo.requisitionFormAddress

src/pages/transaction/inquiryQuote/components/details.tsx

@@ -257,7 +257,6 @@ const Details: React.FC<parmas> = (props) => {
   }
   // 详情请求
   useEffect(() => {
-    console.log(type)
     if(type === 'rfq') {
       // 代表的是查看询价
       setview(1)