Merge branch 'main' into feature/2.0

src/libs/ht.js

@@ -42,7 +42,7 @@ export const sites = [
   { key: '163', label: 'GH', code: 'GH' },
   { key: '28', label: '客运中国', code: 'GHKYZG' },
   { key: '7', label: '客运海外', code: 'GHKYHW' },
-  { key: '172', label: 'B业务', code: 'GHTOB' },
+  { key: '172', label: 'ToB业务', code: 'GHTOB' },
   { key: '11,12,20,21,10,18', label: '国际（入境）', code: 'JP,VAC,IT,GM,RU,VC' },
   { key: '122,200,211,100,188', label: '国际（海外）', code: 'VACHW,ITHW,GMHW,RUHW,VCHW' },
   { key: '11', label: '日语', code: 'JP' },

src/stores/CustomerStore.js

@@ -15,7 +15,7 @@ class CustomerStore {
         this.potential_data.loading = true;
         const date_picker_store = this.rootStore.date_picker_store;
         let url = '/service-tourdesign/PotentialCusOrder';
-        url += '?Website=' + this.potential_data.webcode + '&DEI_SNList=' + this.potential_data.groups.toString();
+        url += '?Website=' + this.potential_data.webcode.toString() + '&DEI_SNList=' + this.potential_data.groups.toString();
         if (this.potential_data.date_type == 'applyDate') {
             url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
         } else if(this.potential_data.date_type == 'ConfirmDate'){
@@ -70,7 +70,7 @@ class CustomerStore {
         data: [],
         data_detail: [],
         webcode: 'GHKYZG',
-        site_select_mode: false,// 站点是否多选
+        site_select_mode: 'multiple',// 站点是否多选
         group_select_mode: 'multiple',// 是否多选分组
         groups: ['1', '2',  '7'],
         date_type: 'applyDate',
@@ -88,7 +88,7 @@ class CustomerStore {
         this.regular_data.loading = true;
         const date_picker_store = this.rootStore.date_picker_store;
         let url = '/service-tourdesign/RegularCusOrder';
-        url += '?Website=' + this.regular_data.webcode + '&DEI_SNList=' + this.regular_data.groups.toString();
+        url += '?Website=' + this.regular_data.webcode.toString() + '&DEI_SNList=' + this.regular_data.groups.toString();
         if (this.regular_data.date_type == 'applyDate') {
             url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
         } else if(this.regular_data.date_type == 'ConfirmDate'){
@@ -143,7 +143,7 @@ class CustomerStore {
         data: [],
         data_detail: [],
         webcode: 'ALL',
-        site_select_mode: false,// 站点是否多选
+        site_select_mode: 'multiple',// 站点是否多选
         group_select_mode: 'multiple',// 是否多选分组
         groups: ['1', '2', '28', '7'],
         date_type: 'applyDate',
@@ -161,7 +161,7 @@ class CustomerStore {
         this.inchina_data.loading = true;
         const date_picker_store = this.rootStore.date_picker_store;
         let url = '/service-tourdesign/RegularCusInChinaOrder';
-        url += '?Website=' + this.inchina_data.webcode + '&DEI_SNList=' + this.inchina_data.groups.toString();
+        url += '?Website=' + this.inchina_data.webcode.toString() + '&DEI_SNList=' + this.inchina_data.groups.toString();
         if (this.inchina_data.date_type == 'applyDate') {
             url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
         } else if(this.inchina_data.date_type == 'ConfirmDate'){
@@ -216,7 +216,7 @@ class CustomerStore {
         data: [],
         data_detail: [],
         webcode: 'ALL',
-        site_select_mode: false,// 站点是否多选
+        site_select_mode: 'multiple',// 站点是否多选
         group_select_mode: 'multiple',// 是否多选分组
         groups: ['1', '2', '28', '7'],
         date_type: 'applyDate',

src/views/AgentGroupCount.jsx

@@ -36,8 +36,8 @@ const AgentGroupCount = () => {
   return (
     <>
       <Space direction="vertical" style={{ width: '100%' }}>
-        <Row gutter={{ md: 24 }} justify="end">
-          <Col span={4}>
+        <Row gutter={{  sm: 16, lg: 32 }} justify="end">
+        <Col md={24} lg={8} xxl={8}>
             <Select
               value={customerServicesStore.selectedAgent}
               style={{ width: '95%' }}
@@ -56,13 +56,13 @@ const AgentGroupCount = () => {
               {agentList.map(renderAgentItem)}
             </Select>
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <GroupSelect value={customerServicesStore.selectedTeam}
               onChange={(value) => customerServicesStore.selectTeam(value)}
               style={{ width: '95%' }} show_all={true}
             />
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <Select
               value={customerServicesStore.selectedCountry}
               style={{ width: '95%' }}
@@ -79,7 +79,7 @@ const AgentGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <Select
               value={dateType}
               style={{ width: '95%' }}
@@ -93,7 +93,7 @@ const AgentGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <DatePicker.RangePicker
               format={config.DATE_FORMAT}
               locale={zhCNlocale}
@@ -120,7 +120,7 @@ const AgentGroupCount = () => {
               }}
             />
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <Button
               type="primary"
               icon={<SearchOutlined />}

src/views/DestinationGroupCount.jsx

@@ -30,14 +30,14 @@ const DestinationGroupCount = () => {
   return (
     <>
       <Space direction="vertical" style={{ width: '100%' }}>
-        <Row gutter={{ md: 24 }} justify="end">
-          <Col span={4}>
+        <Row gutter={{  sm: 16, lg: 32 }} justify="end">
+        <Col md={24} lg={8} xxl={8}>
             <GroupSelect value={customerServicesStore.selectedTeam}
               onChange={(value) => customerServicesStore.selectTeam(value)}
               style={{ width: '95%' }} show_all={true}
             />
           </Col>
-          <Col span={2}>
+          <Col md={24} lg={8} xxl={8}>
             <Select value={customerServicesStore.selectedCountry} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectCountry(value)}>
               <Select.Option key="china" value="china">
                 国内
@@ -47,7 +47,7 @@ const DestinationGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
-          <Col span={2}>
+          <Col md={24} lg={8} xxl={8}>
             <Select value={customerServicesStore.selectedOrderStatus} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectStatus(value)}>
               <Select.Option key="所有" value="-1">
               所有
@@ -60,7 +60,7 @@ const DestinationGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <Select value={dateType} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectDateType(value)}>
               <Select.Option key="startDate" value="startDate">
                 走团日期
@@ -70,7 +70,7 @@ const DestinationGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <DatePicker.RangePicker
               format={config.DATE_FORMAT} locale={zhCNlocale}
               allowClear={false}
@@ -88,7 +88,7 @@ const DestinationGroupCount = () => {
               }}
             />
           </Col>
-          <Col span={4}>
+          <Col md={24} lg={8} xxl={8}>
             <Button
               type="primary"
               icon={<SearchOutlined />}