Merge branch 'main' of github.com:hainatravel/dashboard into main

src/stores/CustomerServices.js

@@ -18,6 +18,7 @@ class CustomerServices {
       this.selectedAgent = '';
       this.selectedTeam = '';
       this.selectedCountry = '';
+      this.selectedOrderStatus = '-1';
       makeAutoObservable(this);
     }
 
@@ -284,6 +285,7 @@ class CustomerServices {
         .append('OldDate2', this.endDateString)
         .append('DepList', this.selectedTeam)
         .append('Country', this.selectedCountry)
+        .append('OrderStatus', this.selectedOrderStatus)
         .build();
       req.fetchJSON(fetchUrl)
         .then(json => {
@@ -464,6 +466,10 @@ class CustomerServices {
       this.selectedCountry = country;
     }
 
+    selectStatus(status) {
+      this.selectedOrderStatus = status;
+    }
+
     startDate;
     endDate;
     startDateString;
@@ -472,6 +478,7 @@ class CustomerServices {
     selectedAgent;
     selectedTeam;
     selectedCountry;
+    selectedOrderStatus;
     inProgress;
 
     agentList = [];

src/views/DestinationGroupCount.js

@@ -57,7 +57,7 @@ const DestinationGroupCount = () => {
               <Select.Option key="31" value="31">花梨鹰</Select.Option>
             </Select>
           </Col>
-          <Col span={4}>
+          <Col span={2}>
             <Select value={customerServicesStore.selectedCountry} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectCountry(value)}>
               <Select.Option key="china" value="china">
                 国内
@@ -67,6 +67,19 @@ const DestinationGroupCount = () => {
               </Select.Option>
             </Select>
           </Col>
+          <Col span={2}>
+            <Select value={customerServicesStore.selectedOrderStatus} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectStatus(value)}>
+              <Select.Option key="所有" value="-1">
+              所有
+              </Select.Option>
+              <Select.Option key="已成行" value="1">
+              已成行
+              </Select.Option>
+              <Select.Option key="未成行" value="0">
+              未成行
+              </Select.Option>
+            </Select>
+          </Col>
           <Col span={4}>
             <Select value={dateType} style={{ width: "95%" }} onChange={(value) => customerServicesStore.selectDateType(value)}>
               <Select.Option key="startDate" value="startDate">