2.11.11

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "haina-dashboard",
-  "version": "2.11.10",
+  "version": "2.11.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "haina-dashboard",
-      "version": "2.11.10",
+      "version": "2.11.11",
       "dependencies": {
         "@ant-design/charts": "^1.4.2",
         "@ant-design/pro-components": "^2.6.16",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haina-dashboard",
-  "version": "2.11.10",
+  "version": "2.11.11",
   "private": true,
   "dependencies": {
     "@ant-design/charts": "^1.4.2",

src/components/search/SearchForm.jsx

@@ -153,7 +153,7 @@ export default observer((props) => {
       ],
       'country': {
         key: 'country',
-        transform: (value) => value?.key || '',
+        transform: (value) => Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? (!isNaN(parseInt(value.key), 10) ? value.key : '') : '',
         default: '',
       },
       'city': {
@@ -506,7 +506,7 @@ function getFields(props) {
       'country',
       99,
       <Form.Item name={'country'}>
-        <SearchInput autoGet url="/service-Analyse2/GetCountryInfo" map={{ 'c_id': 'key', 'cn_name': 'label' }} resultkey={'result'} placeholder="输入搜索国籍: 中/英名字" />
+        <SearchInput {...fieldProps?.country || {}} autoGet url="/service-Analyse2/GetCountryInfo" map={{ 'c_id': 'key', 'cn_name': 'label' }} resultkey={'result'} placeholder="输入搜索国籍: 中/英名字" />
       </Form.Item>
     ),
     item(

src/stores/HotelCruise.js

@@ -157,9 +157,11 @@ class HotelCruise {
       {}
     );
     summaryDelta.RecommendRateDelta = queryParam.Compare === '0' ? undefined : fixTo2Decimals((summaryRow.RecommendRate - (summaryRow.CPRecommendRate || 0)) * 100);
+    const resfilter = resCP.map(row => ({text: row.CityName, value: row.CityName})).sort((a, b) => a.text.localeCompare(b.text));
     runInAction(() => {
       this.hotel.loading = false;
       this.hotel.dataSource = resCP;
+      this.hotel.filters = resfilter;
       this.hotel.summaryRow = { ...summaryRow, ...summaryDelta };
     });
   }
@@ -181,8 +183,8 @@ class HotelCruise {
     this.searchValuesToSub = obj;
   }
 
-  cruise = { loading: false, dataSource: [], summaryRow: {} };
-  hotel = { loading: false, dataSource: [], summaryRow: {} };
+  cruise = { loading: false, dataSource: [], summaryRow: {}, filters: [] };
+  hotel = { loading: false, dataSource: [], summaryRow: {}, filters: [] };
   resetData = () => {
     this.results.loading = false;
     for (const key of Object.keys(this.results)) {

src/stores/SalesCRMData.js

@@ -155,7 +155,7 @@ class SalesCRMData {
     // IncludeTickets: { key: '1', label: '含门票'},
     DepartmentList: [groupsMappedByCode.GH],
     operator: '-1',
-    IncludeTickets: '0',
+    IncludeTickets: { key: '0', value: '0', label: '不含门票' },
     opisn: '-1',
     date90: {
       Date1: moment().subtract(90, 'days').format(DATE_FORMAT),

src/views/Hotel.jsx

@@ -9,7 +9,7 @@ const { Text } = Typography;
 export default observer((props) => {
   const { date_picker_store: searchFormStore } = useContext(stores_Context);
   const { date_picker_store, HotelCruiseStore } = useContext(stores_Context);
-  const { loading, dataSource, summaryRow } = HotelCruiseStore.hotel;
+  const { loading, dataSource, summaryRow, filters } = HotelCruiseStore.hotel;
 
   const { formValues, siderBroken } = searchFormStore;
 
@@ -25,6 +25,9 @@ export default observer((props) => {
         title: '目的地',
         sorter: (a, b) => a.CityName.localeCompare(b.CityName, 'zh-CN'),
         children: [{ title: summaryRow.CityName, dataIndex: 'CityName', key: 'CityName' }],
+        filters: filters,
+        onFilter: (value, record) => record.CityName === value,
+        filterSearch: true,
       },
       {
         title: '总间夜',

src/views/Orders_sub.jsx

@@ -171,6 +171,12 @@ const Orders_sub = () => {
 		return result;
 	};
 
+	// 在逗号和分号处自动换行的函数
+	const addLineBreaksAtCommas = (text) => {
+		if (!text) return '';
+		return text.replace(/&/g, "&").replace(/，/g, '，\n').replace(/,/g, ',\n').replace(/；/g, '；\n').replace(/;/g, ';\n');
+	};
+
 	const table_data = format_data_detail(orders_store.orderCountData_Form_sub.ordercount1);
 	const table_data2 = format_data_detail(orders_store.orderCountData_Form_sub.ordercount2);
 	const table_data_p = format_data(orders_store.orderCountData_Form_sub.ordercount1);
@@ -192,7 +198,7 @@ const Orders_sub = () => {
             rowKey={record => record.key}
             expandable={{
               expandedRowRender: record => (
-                <pre>
+                <pre style={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word', fontSize: '16px' }}>
                   <Divider orientation="left" plain>
                     客户需求
                   </Divider>
@@ -200,7 +206,7 @@ const Orders_sub = () => {
                   <Divider orientation="left" plain>
                     订单内容
                   </Divider>
-                  {record.COLI_OrderDetailText}
+                  {addLineBreaksAtCommas(record.COLI_OrderDetailText)}
                 </pre>
               ),
             }}
@@ -224,7 +230,7 @@ const Orders_sub = () => {
             size="small"
             rowKey={record => record.key}
             expandable={{
-              expandedRowRender: record => <pre>{record.COLI_OrderDetailText}</pre>,
+              expandedRowRender: record => <pre style={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word', fontSize: '16px' }}>{record.COLI_OrderDetailText}</pre>,
             }}
           />
         </Col>

src/views/sales-crm/Process.jsx

@@ -232,11 +232,12 @@ export default observer((props) => {
                 ...formValues,
                 ...SalesCRMDataStore.searchValues,
               },
-              shows: ['DepartmentList', 'WebCode', 'DateType', 'dates', 'IncludeTickets'],
+              shows: ['DepartmentList', 'WebCode', 'DateType', 'dates', 'IncludeTickets', 'country'],
               fieldProps: {
                 DepartmentList: { show_all: false, mode: 'multiple', col: 5 },
                 WebCode: { show_all: false, mode: 'multiple', col: 5 },
                 dates: { hide_vs: true },
+                country: { show_all: false, mode: 'multiple', col: 5 },
               },
             }}
             onSubmit={(_err, obj, form, str) => {