From 43750214be8c11f0d1e02e91bc9d64a2e3928ce4 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 6 Nov 2023 09:45:25 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B8=82=E5=9C=BA>=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE:=20=E5=B0=8F=E7=BB=84=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/search/SearchForm.jsx | 10 +++++++---
 src/components/search/SiteSelect.jsx |  7 +++++--
 src/views/Orders.jsx                 |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index 786770b..47f7439 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -69,7 +69,7 @@ export default observer((props) => {
       'DepartmentList': {
         key: 'DepartmentList',
         transform: (value) => {
-          return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.key : '';
+          return isEmpty(value) ? 'ALL': Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.key : '';
         },
         default: '',
       },
@@ -259,7 +259,11 @@ function getFields(props) {
     item(
       'DepartmentList',
       99,
-      <Form.Item name={`DepartmentList`} initialValue={at(props, 'initialValue.DepartmentList')[0] || (fieldProps?.DepartmentList?.show_all ? { key: 'ALL', label: '所有小组' } : undefined)}>
+      <Form.Item
+        name={`DepartmentList`}
+        initialValue={at(props, 'initialValue.DepartmentList')[0] || (fieldProps?.DepartmentList?.show_all ? { key: 'ALL', label: '所有小组' } : undefined)}
+        rules={[{ required: true, message: '选择小组' }]}
+      >
         <GroupSelect {...fieldProps.DepartmentList} labelInValue={true} />
       </Form.Item>
     ),
@@ -323,7 +327,7 @@ function getFields(props) {
     item(
       'operator',
       99,
-      <Form.Item name={'operator'} dependencies={['DepartmentList']} >
+      <Form.Item name={'operator'} dependencies={['DepartmentList']}>
         <SearchInput
           autoGet
           url="/service-Analyse2/GetOperatorInfo"
diff --git a/src/components/search/SiteSelect.jsx b/src/components/search/SiteSelect.jsx
index 832b47e..d4595ad 100644
--- a/src/components/search/SiteSelect.jsx
+++ b/src/components/search/SiteSelect.jsx
@@ -13,13 +13,16 @@ class SiteSelect extends Component {
       const { store, mode, value, onChange, show_all, ...extProps } = this.props;
       const _mode = mode || store?.group_select_mode || null;
       const _show_all = ['tags', 'multiple'].includes(_mode) ? false : show_all;
-      const _value = !['tags', 'multiple'].includes(_mode) ? (value || store?.webcode || undefined) : (value || store?.webcode || []).filter(item => item.value !== 'ALL');
+      const __value = ['tags', 'multiple'].includes(_mode) ? (value.constructor === Object ? [value] : value) : undefined;
+      const _value = !['tags', 'multiple'].includes(_mode)
+        ? value || store?.webcode || undefined
+        : (__value || store?.webcode || []).filter((item) => String(item?.value || item.key).toLowerCase() !== 'all');
       return (
             <div>
                 <Select
                     mode={_mode}
                     style={{width: '100%'}}
-                    placeholder="选择来源"
+                    placeholder="所有来源"
                     value={_value}
                     onChange={(value) => {
                       if (typeof onChange === 'function') {
diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx
index 817a2c8..060179f 100644
--- a/src/views/Orders.jsx
+++ b/src/views/Orders.jsx
@@ -329,7 +329,7 @@ class Orders extends Component {
                 },
                 shows: ['DateType', 'DepartmentList', 'WebCode', 'IncludeTickets', 'dates'],
                 fieldProps: {
-                  DepartmentList: { show_all: false },
+                  DepartmentList: { show_all: false, mode: 'multiple' },
                   WebCode: { show_all: true },
                   years: { hide_vs: true },
                 },