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

src/pages/afterService/exchangeManage/exchangePrDeliver/verify.tsx

@@ -79,7 +79,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
               value={{
                 productList: (
                   info?.goodsDetailList
-                    .filter((item) => item.deliveryCount > 0)
+                    .filter((item) => item.noDeliveryCount > 0)
                     .map((item) => {
                       // 从换货统计里边找到对应的商品，
                       const current = info?.replaceStatisticsList.find((statisticsItem) => statisticsItem.productId === item.productId);

src/pages/transaction/dealAbility/inquiryOffer/inquirySearch/index.tsx

@@ -24,6 +24,8 @@ const InquirySearch = () => {
   const [isModalVisible, setVisible] = useState<boolean>(false);
   const [orderId, setOrderId] = useState<string>('');
   const [isId, setIsId] = useState<number>()
+  const [memberRoleName, setMemberRoleName] = useState<string>('');
+
 
   const format = (text, fmt?: string) => {
     return <>{moment(text).format(fmt || "YYYY-MM-DD HH:mm:ss")}</>
@@ -49,6 +51,7 @@ const InquirySearch = () => {
     const userInfo: any = getAuth() || {};
     const roles = userInfo.roles.filter(_item => _item.roleType === 2);
     setRole(roles);
+    setMemberRoleName(roles[0].memberRoleName)
     setOrderId(orderId);
     setIsId(id)
     if (!isEmpty(roles)) {
@@ -175,7 +178,7 @@ const InquirySearch = () => {
             layout='vertical'
           >
             <Form.Item>
-              当前询价单<Typography.Text type='danger'>{orderId}</Typography.Text>二次询价生成的询价单可通过会员角色：<Typography.Text type='danger'>{role[0].memberRoleName}</Typography.Text>进行查看。
+              当前询价单<Typography.Text type='danger'>{orderId}</Typography.Text>二次询价生成的询价单可通过会员角色：<Typography.Text type='danger'>{memberRoleName}</Typography.Text>进行查看。
             </Form.Item>
             <Form.Item
               label='会员角色'
@@ -183,7 +186,7 @@ const InquirySearch = () => {
               name='memberRoleId'
               rules={[{ required: true, message: '请选择会员角色' }]}
             >
-              <Select>
+              <Select onChange={(_e, option: any) => setMemberRoleName(option.children)}>
                 {role.map((_item, _i) => (
                   <Select.Option key={`role${_i}`} value={_item.memberRoleId}>{_item.memberRoleName}</Select.Option>
                 ))}

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/addForm.tsx

@@ -312,7 +312,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
             }}
           >
             <BasicInfoLatyout getMemberInfo={getMemberInfo} memb={memberInfo} isEdit={spam || two} />
-            <InquiryProductLayout form={form} getInquiryProduct={getInquiryProduct} member={memberInfo} setInquiryProduct={inquiryProduct} />
+            <InquiryProductLayout isEdit={two} form={form} getInquiryProduct={getInquiryProduct} member={memberInfo} setInquiryProduct={inquiryProduct} />
             <TradeTermsLayout isEdit={two} getFullAddress={getFullAddress} getContacts={getContacts} fullAddress={fullAddress} />
             <AttachLayout enclosureUrls={enclosureUrls} getEnclosureUrls={getEnclosureUrls} removeEnclosureUrls={removeEnclosureUrls} />
           </Form>

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/inquiryProduct.tsx

@@ -22,10 +22,12 @@ interface InquiryProductLayoutProps {
   member?: number,
   /** form */
   form?: any,
+  /** 二次询价 */
+  isEdit?: boolean,
 }
 
 const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) => {
-  const { getInquiryProduct, setInquiryProduct, member, form } = props;
+  const { getInquiryProduct, setInquiryProduct, member, form, isEdit } = props;
   const [visible, setVisible] = useState<boolean>(false);
   const [dataSource, setDataSource] = useState<any[]>([]);
   const [memberId, setMemberId] = useState<number>();
@@ -95,7 +97,7 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
       key: "operate",
       dataIndex: "operate",
       render: (_text, _data, index) => (
-        <Button type="link" onClick={() => handleDeleted(index)}>删除</Button>
+        <Button disabled={isEdit} type="link" onClick={() => handleDeleted(index)}>删除</Button>
       )
     },
   ]

src/pages/transaction/logisticsAbility/logisticsBillSubmit/addLogistics/components/ModalTableOrder.tsx

@@ -191,7 +191,7 @@ const ModalTableOrder: React.FC<ModalTableProps> = (props) => {
       return new Promise(resolve => {
         switch (type) {
           case 1:
-            PublicApi.getOrderLogisticsOrderList({ ...parmas }).then(res => {
+            PublicApi.getOrderCommonLogisticsPage({ ...parmas }).then(res => {
               if (res.code === 1000) {
                 res.data.data.forEach((item: any) => {
                   item.applyNo = item.orderNo

src/pages/transaction/logisticsAbility/logisticsBillSubmit/addLogistics/index.tsx

@@ -406,7 +406,7 @@ const AddLogistics: React.FC<{}> = () => {
                 console.warn(error)
               })
             } else {
-              PublicApi.getOrderProcurementOrderProductList({ ...params, id: query.relevanceOrderId, orderNo: query.relevanceOrderCode }).then((res: any) => {
+              PublicApi.getOrderCommonProductLogisticsPage({ ...params, id: query.relevanceOrderId, orderNo: query.relevanceOrderCode }).then((res: any) => {
                 if (res.code === 1000) {
                   resolve(res)
                 }
@@ -782,6 +782,22 @@ const AddLogistics: React.FC<{}> = () => {
     }
   }
 
+  /** 查看对应发货单详情 */
+  const handleOrderDetail = (id: number) => {
+    if (id) {
+      switch (Number(createType)) {
+        case 6:
+          window.open(`/memberCenter/afterService/returnApplication/returnPrAddDeliver/deliverDetail?id=${id}`)
+          break;
+        default:
+          window.open(`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${id}&preview=1`)
+          break
+      }
+    } else {
+      message.error('此订单id不存在！')
+    }
+  }
+
   return (
     <PageHeaderWrapper
       onBack={() => history.goBack()}
@@ -812,13 +828,13 @@ const AddLogistics: React.FC<{}> = () => {
               {query.logisticsOrderNo && <Form.Item label="物流单号" name='receiverName1'><span>{query.logisticsOrderNo}</span></Form.Item>}
 
               <Form.Item label='对应发货单号' name='shipmentOrderCode'>
-                <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.shipmentOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} />
+                <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.shipmentOrderCode : undefined} enterButton={<div style={{ backgroundColor: '#6b778c !important', color: '#fff !important' }}><LinkOutlined /> 选择</div>} onSearch={() => setshippingvisible(true)} />
                 {query.shipmentOrderCode && <Button type='link'
-                  onClick={() => window.open(`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${query.shipmentOrderId}&preview=1`)}
+                  onClick={() => handleOrderDetail(query.shipmentOrderId)}
                 >查看单号详情</Button>}
               </Form.Item>
               <Form.Item label='对应订单号/售后单' name='relevanceOrderCode'>
-                <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.relevanceOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setinvoicesvisible(true)} />
+                <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.relevanceOrderCode : undefined} enterButton={<div style={{ backgroundColor: '#6b778c !important', color: '#fff !important' }}><LinkOutlined /> 选择</div>} onSearch={() => setinvoicesvisible(true)} />
                 {query.relevanceOrderCode && <Button type='link' onClick={() => jumpOrderDetail(query.relevanceOrderId)}>查看单号详情</Button>}
               </Form.Item>
               <Form.Item label="收货方" name='receiverName'><span>{query.receiverName}/{query.receiverPhone}</span></Form.Item>

src/pages/transaction/marketingAbility/components/dateModal/index.tsx

@@ -36,11 +36,12 @@ const DateModalLayout: React.FC<DateModalProps> = (props: any) => {
           return
         }
         onSubmit();
+        setLoading(false)
+        form.resetFields();
       }).catch(err => {
         setLoading(false)
       })
     })
-    form.resetFields();
   }, [id])
 
   return (