diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index b6ee01a..232a3ad 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -379,6 +379,21 @@ function getFields(props) {
,
3
),
+ item(
+ 'IncludeInternal',
+ 99,
+
+
+ ,
+ 3
+ ),
item(
'countryArea',
99,
diff --git a/src/views/biz/BizOrder.jsx b/src/views/biz/BizOrder.jsx
index f7f7a32..b5a99b8 100644
--- a/src/views/biz/BizOrder.jsx
+++ b/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: (
+
+
+ 服务类型
+
+ ),
+ },
{
key: 'Form',
label: (
diff --git a/src/views/biz/BizOrderSub.jsx b/src/views/biz/BizOrderSub.jsx
index b7d896e..40df6ea 100644
--- a/src/views/biz/BizOrderSub.jsx
+++ b/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' },
diff --git a/src/zustand/BizOrder.js b/src/zustand/BizOrder.js
index 0304b0a..5a837f8 100644
--- a/src/zustand/BizOrder.js
+++ b/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,