perf: 商务数据: +IncludeInternal

src/components/search/SearchForm.jsx

@@ -379,6 +379,21 @@ function getFields(props) {
       </Form.Item>,
       3
     ),
+    item(
+      'IncludeInternal',
+      99,
+      <Form.Item name={`IncludeInternal`} initialValue={at(props, 'initialValue.IncludeInternal')[0] || { key: '1', label: '含内部订单' }}>
+        <Select style={{ width: '100%' }} placeholder="是否含内部订单" labelInValue>
+          <Option key="1" value="1">
+            含内部订单
+          </Option>
+          <Option key="0" value="0">
+            不含内部
+          </Option>
+        </Select>
+      </Form.Item>,
+      3
+    ),
     item(
       'countryArea',
       99,

src/views/biz/BizOrder.jsx

@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { Row, Col, Tabs, Table, Divider, Spin } from 'antd';
-import { ContainerOutlined, BlockOutlined, SmileOutlined, MobileOutlined } from '@ant-design/icons';
+import { ContainerOutlined, BlockOutlined, SmileOutlined, MobileOutlined, CustomerServiceOutlined } from '@ant-design/icons';
 import { Line } from '@ant-design/charts';
 import { NavLink } from 'react-router-dom';
 import * as comm from '../../utils/commons';
@@ -216,7 +216,8 @@ const BizOrder = observer(() => {
                   ...searchFormStore.formValues,
                   ...searchValues,
                 },
-                shows: ['DateType', 'DepartmentList', 'WebCode', 'IncludeTickets', 'dates'],
+                // 'WebCode','IncludeTickets',
+                shows: ['DateType', 'DepartmentList', 'IncludeInternal', 'dates'],
                 fieldProps: {
                   DepartmentList: { show_all: false, mode: 'multiple' },
                   WebCode: { show_all: false, mode: 'multiple' },
@@ -253,6 +254,15 @@ const BizOrder = observer(() => {
               activeKey={activeTab}
               onChange={(active_key) => onTabChange(active_key)}
               items={[
+                {
+                  key: 'servicetype',
+                  label: (
+                    <span>
+                      <CustomerServiceOutlined />
+                      服务类型
+                    </span>
+                  ),
+                },
                 {
                   key: 'Form',
                   label: (

src/views/biz/BizOrderSub.jsx

@@ -232,7 +232,8 @@ const BizOrderSub = observer(({ ...props }) => {
                 ...searchFormStore.formValues,
                 ...searchValues,
               },
-              shows: ['DateType', 'DepartmentList', 'WebCode', 'IncludeTickets', 'dates'],
+              // 'WebCode', 'IncludeTickets',
+              shows: ['DateType', 'DepartmentList', 'IncludeInternal', 'dates'],
               fieldProps: {
                 DepartmentList: { show_all: false, mode: 'multiple' },
                 WebCode: { show_all: false, mode: 'multiple' },

src/zustand/BizOrder.js

@@ -7,8 +7,11 @@ import { HT_HOST } from '../config';
 import { resultDataCb } from '../components/DateGroupRadio/date';
 import { isEmpty } from '../utils/commons';
 
+const defaultParams = { WebCode: 'all', IncludeTickets: 1, IncludeInternal: 1, };
+
 export const fetchBizOrderCount = async (params, type='', typeVal='') => {
   const { errcode, errmsg, ...result } = await fetchJSON(HT_HOST + '/service-web/QueryData/GetOrderCount_biz', {
+    ...defaultParams,
     ...params,
     COLI_ApplyDate1: params.Date1,
     COLI_ApplyDate2: params.Date2,
@@ -38,6 +41,7 @@ const _typeRes = {
 };
 export const fetchBizOrderCountByType = async (type, params) => {
   const { errcode, errmsg, ...result } = await fetchJSON(HT_HOST + '/service-web/QueryData/GetOrderCountByType_biz', {
+    ...defaultParams,
     ...params,
     COLI_ApplyDate1: params.Date1,
     COLI_ApplyDate2: params.Date2,
@@ -60,6 +64,7 @@ export const fetchBizOrderCountByType = async (type, params) => {
 const _detailRes = { ordercount1: [], ordercount2: [] };
 export const fetchBizOrderDetailByType = async (params, type='', typeVal='', orderContent='detail') => {
   const { errcode, errmsg, ...result } = await fetchJSON(HT_HOST + '/service-web/QueryData/GetOrderCountByType_Sub_biz', {
+    ...defaultParams,
     SubOrderType: orderContent,
     ...params,
     COLI_ApplyDate1: params.Date1,