Merge branch 'fix-220418' into 'v2-220418'

src/locales/en-US/dealAbility.ts

@@ -133,4 +133,6 @@ export default {
   'dealAbility.huiyuandengji':'Membership level',
   'dealAbility.xuanzehuiyuan':'Select member',
   'dealAbility.qingshuruxunjiadanzhaiyao':'Please enter the summary of the inquiry form',
+  'dealAbility.dayubaojiajiezhi': 'Delivery date must be greater than Quote deadline',
+  'dealAbility.xiaoyujiaofushijian': 'The deadline for quotation must be less than the delivery time',
 }

src/locales/ko-KR/dealAbility.ts

@@ -134,4 +134,6 @@ export default {
   'dealAbility.huiyuandengji': '회원 등급',
   'dealAbility.xuanzehuiyuan': '회원 선택',
   'dealAbility.qingshuruxunjiadanzhaiyao': '문의서 요약을 입력하십시오.',
+  'dealAbility.dayubaojiajiezhi': '배송 날짜는 견적 마감 시간보다 커야 합니다.',
+  'dealAbility.xiaoyujiaofushijian': '견적 마감 시간은 제공 시간보다 작아야 합니다.',
 }

src/locales/zh-CN/dealAbility.ts

@@ -134,4 +134,7 @@ export default {
   'dealAbility.huiyuandengji': '会员等级',
   'dealAbility.xuanzehuiyuan': '选择会员',
   'dealAbility.qingshuruxunjiadanzhaiyao': '请输入询价单摘要',
+  'dealAbility.dayubaojiajiezhi': '交付日期必须大于报价截止时间',
+  'dealAbility.xiaoyujiaofushijian': '报价截止时间必须小于交付时间',
+
 }

src/pages/content/advertisement/advertisementInfo.tsx

@@ -61,7 +61,8 @@ const AdvertisementInfo: React.FC = () => {
     serviceActions(postData).then((data) => {
       setSubmitLoading(false);
       if(data.code === 1000) {
-        history.push('/content/advertisement')
+        history.push('/memberCenter/contentAbility/advertisement')
+
       }
     })
   }
@@ -78,14 +79,14 @@ const AdvertisementInfo: React.FC = () => {
       console.log(options);
       actions.setFieldState('columnType', (state) => {
         state.props["enum"] = options;
-       
+
       })
     // onFieldValueChange$('channel').subscribe(fieldState => {
-      
+
     // })
   }
   const handleCancel = () => {
-    history.push('/content/advertisement')
+    history.push('/memberCenter/contentAbility/advertisement')
   }
 
   return (

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

@@ -63,22 +63,22 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
 
   const columns: any = [
     {
-      title: intl.formatMessage({id: 'dealAbility.xuhao'}),
+      title: intl.formatMessage({ id: 'dealAbility.xuhao' }),
       dataIndex: 'userId',
       key: 'userId',
     },
     {
-      title: intl.formatMessage({id: 'dealAbility.yonghuxingming'}),
+      title: intl.formatMessage({ id: 'dealAbility.yonghuxingming' }),
       dataIndex: 'name',
       key: 'name',
     },
     {
-      title: intl.formatMessage({id: 'dealAbility.shoujihao'}),
+      title: intl.formatMessage({ id: 'dealAbility.shoujihao' }),
       dataIndex: 'phone',
       key: 'phone',
     },
     {
-      title: intl.formatMessage({id: 'dealAbility.suoshujigou'}),
+      title: intl.formatMessage({ id: 'dealAbility.suoshujigou' }),
       dataIndex: 'orgName',
       key: 'orgName',
     },
@@ -117,18 +117,34 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
   return (
     <Card
       id="tradeTermsLayout"
-      title={intl.formatMessage({id: 'dealAbility.jiaoyitiaojian'})}
+      title={intl.formatMessage({ id: 'dealAbility.jiaoyitiaojian' })}
     >
       <Row gutter={[48, 24]}>
         <Col span={12}>
-          <Form.Item label={intl.formatMessage({id: 'dealAbility.jiaofuriqi'})} name='deliveryTime' rules={[{ required: true, message: intl.formatMessage({id: 'dealAbility.qingxuanzejiaofuriqi'}) }]}>
+          <Form.Item
+            label={intl.formatMessage({ id: 'dealAbility.jiaofuriqi' })}
+            dependencies={['quotationAsTime']}
+            name='deliveryTime'
+            rules={[
+              { required: true, message: intl.formatMessage({ id: 'dealAbility.qingxuanzejiaofuriqi' }) },
+              ({ getFieldValue }) => ({
+                validator: (_rule, value) => {
+                  const _startTime = getFieldValue('quotationAsTime');
+                  if (_startTime && !moment(value).isAfter(_startTime)) {
+                    return Promise.reject(new Error(`${intl.formatMessage({ id: 'dealAbility.dayubaojiajiezhi' })}`));
+                  }
+                  return Promise.resolve();
+                }
+              })
+            ]}
+          >
             <DatePicker
               style={{ width: '100%' }}
               disabledDate={disabledDate}
               format="YYYY-MM-DD HH:mm:ss"
             />
           </Form.Item>
-          <Form.Item label={intl.formatMessage({id: 'dealAbility.jiaofudizhi'})} className={style.address_style}>
+          <Form.Item label={intl.formatMessage({ id: 'dealAbility.jiaofudizhi' })} className={style.address_style}>
             <AddressSelect
               echo={isDefault}
               value={isDefault ? fullAddress.fullAddress : address}
@@ -138,7 +154,23 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
               onChange={getFullAddress}
             />
           </Form.Item>
-          <Form.Item label={intl.formatMessage({id: 'dealAbility.baojiajiezhishijian'})} name='quotationAsTime' rules={[{ required: true, message: intl.formatMessage({id: 'dealAbility.qingxuanzebaojiajiezhishi'}) }]}>
+          <Form.Item
+            label={intl.formatMessage({ id: 'dealAbility.baojiajiezhishijian' })}
+            name='quotationAsTime'
+            dependencies={['deliveryTime']}
+            rules={[
+              { required: true, message: intl.formatMessage({ id: 'dealAbility.qingxuanzebaojiajiezhishi' }) },
+              ({ getFieldValue }) => ({
+                validator: (_rule, value) => {
+                  const _startTime = getFieldValue('deliveryTime');
+                  if (_startTime && !moment(value).isBefore(_startTime)) {
+                    return Promise.reject(new Error(`${intl.formatMessage({ id: 'dealAbility.xiaoyujiaofushijian' })}`));
+                  }
+                  return Promise.resolve();
+                }
+              })
+            ]}
+          >
             <DatePicker
               style={{ width: '100%' }}
               disabledDate={disabledDate}
@@ -146,14 +178,14 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
             />
           </Form.Item>
           <Form.Item
-            label={intl.formatMessage({id: 'dealAbility.xunjialianxiren'})}
+            label={intl.formatMessage({ id: 'dealAbility.xunjialianxiren' })}
             name='contactName'
-            rules={[{ required: true, message: intl.formatMessage({id: 'dealAbility.qingxuanzexunjialianxiren'}) }]}
+            rules={[{ required: true, message: intl.formatMessage({ id: 'dealAbility.qingxuanzexunjialianxiren' }) }]}
           >
-            <Input.Search onSearch={() => toggle(true)} readOnly enterButton={<Button style={{ height: '31.19px' }} icon={<LinkOutlined />}>{intl.formatMessage({id: 'dealAbility.xuanze'})}</Button>} />
+            <Input.Search onSearch={() => toggle(true)} readOnly enterButton={<Button style={{ height: '31.19px' }} icon={<LinkOutlined />}>{intl.formatMessage({ id: 'dealAbility.xuanze' })}</Button>} />
           </Form.Item>
           <Form.Item
-            label={intl.formatMessage({id: 'dealAbility.lianxirendianhua'})}
+            label={intl.formatMessage({ id: 'dealAbility.lianxirendianhua' })}
             required
             style={{ marginBottom: '0px' }}
           >
@@ -161,7 +193,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
               <Col span={8}>
                 <Form.Item
                   name='phoneCode'
-                  rules={[{ required: true, message: intl.formatMessage({id: 'dealAbility.qingxuanze'}) }]}
+                  rules={[{ required: true, message: intl.formatMessage({ id: 'dealAbility.qingxuanze' }) }]}
                   initialValue={telCode[0]}
                 >
                   <Select>
@@ -174,7 +206,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
               <Col span={16}>
                 <Form.Item
                   name='contactPhone'
-                  rules={[{ required: true, message: intl.formatMessage({id: 'dealAbility.qingxuanze'}) }]}
+                  rules={[{ required: true, message: intl.formatMessage({ id: 'dealAbility.qingxuanze' }) }]}
                 >
                   <Input type='number' maxLength={11} />
                 </Form.Item>
@@ -182,7 +214,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
             </Row>
           </Form.Item>
           <Form.Item label={intl.formatMessage({ id: 'dealAbility.fukuanfangshi' })
-} name='paymentType'>
+          } name='paymentType'>
             <Input.TextArea maxLength={50} autoSize placeholder={intl.formatMessage({ id: 'dealAbility.zuichang100gezifu50ge' })} />
           </Form.Item>
         </Col>
@@ -208,7 +240,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
       <TableModal
         modalType="Drawer"
         visible={visible}
-        title={intl.formatMessage({id: 'dealAbility.xuanzeyonghu'})}
+        title={intl.formatMessage({ id: 'dealAbility.xuanzeyonghu' })}
         mode="radio"
         tableProps={{
           rowKey: 'userId',
@@ -236,7 +268,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
 
                   },
                   "x-component-props": {
-                    placeholder: intl.formatMessage({id: 'dealAbility.yonghuxingming'}),
+                    placeholder: intl.formatMessage({ id: 'dealAbility.yonghuxingming' }),
                     align: 'flex-left',
                   }
                 }
@@ -268,7 +300,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
                     orgName: {
                       type: 'string',
                       "x-component-props": {
-                        placeholder: intl.formatMessage({id: 'dealAbility.suoshujigou'})
+                        placeholder: intl.formatMessage({ id: 'dealAbility.suoshujigou' })
                       }
                     },
                   }
@@ -279,7 +311,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
                     span: 1
                   },
                   "x-component-props": {
-                    children: intl.formatMessage({id: 'dealAbility.chaxun'})
+                    children: intl.formatMessage({ id: 'dealAbility.chaxun' })
                   }
                 }
               }

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

@@ -178,24 +178,26 @@ const WaitAddInquiry = () => {
                   icon={<PlusOutlined />}
                   onClick={() => history.push(`/memberCenter/tranactionAbility/productInquiry/waitAddInquiry/add`)}
                 >
-                  {intl.formatMessage({ id: 'dealAbility.add' })}
+                  {intl.formatMessage({ id: 'dealAbility.xinjian' })}
                 </Button>
               </AuthButton>
               <AuthButton btnCode='waitAddInquiry.batch' >
-                <Button
-                  loading={loading}
-                  onClick={() => fetchSubmitBatch()}
-                  disabled={rowkeys.length === 0}
-                >
-                  {intl.formatMessage({ id: 'dealAbility.piliangtijiaoshenhe' })}
-                </Button>
-                <Button
-                  icon={<DeleteOutlined />}
-                  onClick={() => fetchDeleteBatch()}
-                  disabled={rowkeys.length === 0}
-                >
-                  {intl.formatMessage({ id: 'dealAbility.piliangshanchu' })}
-                </Button>
+                <Space direction="horizontal" size={16}>
+                  <Button
+                    loading={loading}
+                    onClick={() => fetchSubmitBatch()}
+                    disabled={rowkeys.length === 0}
+                  >
+                    {intl.formatMessage({ id: 'dealAbility.piliangtijiaoshenhe' })}
+                  </Button>
+                  <Button
+                    icon={<DeleteOutlined />}
+                    onClick={() => fetchDeleteBatch()}
+                    disabled={rowkeys.length === 0}
+                  >
+                    {intl.formatMessage({ id: 'dealAbility.piliangshanchu' })}
+                  </Button>
+                </Space>
               </AuthButton>
 
             </Space>

src/pages/transaction/marketingAbility/selfManagement/search/index.tsx

@@ -133,13 +133,6 @@ const Search = () => {
       }).catch(err => {
         console.warn(err)
       })
-      /** 外部状态 */
-      getMarketingMerchantActivityGetOuterStatusList().then(res => {
-        const _enum = res.data.map((item) => { return { label: item.name, value: item.status } });
-        linkage.enum('outerStatus', _enum);
-      }).catch(err => {
-        console.warn(err)
-      })
       /** 内部状态 */
       getMarketingMerchantActivityGetInnerStatusList().then(res => {
         const _enum = res.data.map((item) => { return { label: item.name, value: item.status } })
@@ -242,16 +235,6 @@ const Search = () => {
                       },
                       enum: [],
                     },
-                    outerStatus: {
-                      type: 'string',
-                      'x-component-props': {
-                        placeholder: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
-                        style: {
-                          width: 160,
-                        },
-                      },
-                      enum: [],
-                    },
                     innerStatus: {
                       type: 'string',
                       'x-component-props': {

src/pages/transaction/purchaseAbility/purchaseBid/detail/index.tsx

@@ -236,9 +236,15 @@ const SearchDetail = () => {
   }
 
   const fetchDataSource = async () => {
-    let shopList = GlobalConfig.web.shopInfo.filter(v => v.type == 6).map(
-      v => v
-    )
+    // let shopList = GlobalConfig.web.shopInfo.filter(v => v.type == 6).map(
+    //   v => v
+    // )
+    /**
+     * 待新增商城采购竞价单要的是商城类型为企业商城
+     * 新增采购竞价单要的是采购门户
+     * 所以去掉过滤了 反正详情shopId是后端返回的 新增的时候应该做处理了
+     * */
+    let shopList = GlobalConfig.web.shopInfo;
     const params = {
       id,
       number,

src/pages/transaction/salesPerformanceStatistics/performanceDetail/index.tsx

@@ -29,7 +29,7 @@ const PerformanceDetail: React.FC = () => {
       title: intl.formatMessage({
         id: 'salesPerformanceStatistics.salesOrder',
       }),
-      dataIndex: 'orderId',
+      dataIndex: 'orderNo',
       sorter: (a, b) => a.orderId - b.orderId,
       align: 'center',
     },
@@ -158,7 +158,7 @@ const PerformanceDetail: React.FC = () => {
 
   /**业务员列表 */
   const getOrganizationList = async ()=>{
-    let res = await getMemberFeignAbilitySalesChannelList() 
+    let res = await getMemberFeignAbilitySalesChannelList()
     const list = res.data?.map((i)=>({
       value:i.userId,
       label:i.userName
@@ -203,7 +203,7 @@ const PerformanceDetail: React.FC = () => {
             setParamsData({...params})
             return fetchListData(params)
           }}
-          
+
           formilyLayouts={{
             justify: 'space-between'
           }}
@@ -271,7 +271,7 @@ const PerformanceDetail: React.FC = () => {
                       allowClear:true
                     }
                   },
-                 
+
                 }
               }
             }