- {title}
+ {isPermitted(PERM_PRODUCTS_OFFER_AUDIT) ? (
+
+ ) : (
+ activeAgency.travel_agency_name
+ )}
- {(use_year || '').replace('all', '')}
+
+ {/*
+ {(use_year || '').replace('all', '')} */}
{/*
*/}
{/*
*/}
-
+
{t('Edit')}
-
@@ -60,7 +103,7 @@ const Header = ({ title, agency, refresh, ...props }) => {
{t('products:auditStateAction.Approved')}
*/}
-
@@ -216,27 +259,22 @@ const TypesPanels = (props) => {
const onCollapseChange = (_activeKey) => {
setActiveKey(_activeKey);
};
- return
;
+ return isEmpty(agencyProducts) ?
:
;
};
const Audit = ({ ...props }) => {
const { travel_agency_id, use_year, audit_state } = useParams();
const [loading, activeAgency, getAgencyProducts] = useProductsStore((state) => [state.loading, state.activeAgency, state.getAgencyProducts]);
- const handleGetAgencyProducts = () => {
- getAgencyProducts({ travel_agency_id, use_year, audit_state });
+ const handleGetAgencyProducts = ({pick_year, pick_agency}={}) => {
+ const year = pick_year || use_year;
+ const agency = pick_agency || travel_agency_id;
+ getAgencyProducts({ travel_agency_id: agency, use_year: year, audit_state });
};
- useEffect(() => {
- handleGetAgencyProducts();
-
- return () => {};
- }, [travel_agency_id]);
-
return (
<>
-
} loading={loading} >
- {/* debug: 0 */}
+
} loading={loading} backTo={`/products`}>
{/*
*/}
diff --git a/src/views/products/Detail/CopyProducts.jsx b/src/views/products/Detail/CopyProducts.jsx
index 6b4d151..af2ed57 100644
--- a/src/views/products/Detail/CopyProducts.jsx
+++ b/src/views/products/Detail/CopyProducts.jsx
@@ -1,11 +1,12 @@
import { useState, useEffect } from 'react';
-import { App, Form, Modal, DatePicker, Divider } from 'antd';
+import { App, Form, Modal, DatePicker, Divider, Switch } from 'antd';
import { isEmpty, objectMapper } from '@/utils/commons';
import { useTranslation } from 'react-i18next';
import SearchInput from '@/components/SearchInput';
import DeptSelector from '@/components/DeptSelector';
-import ProductsTypesSelector, { fetchVendorList } from '@/components/ProductsTypesSelector';
+import ProductsTypesSelector from '@/components/ProductsTypesSelector';
+import { fetchVendorList } from '@/components/VendorSelector';
import dayjs from 'dayjs';
import arraySupport from 'dayjs/plugin/arraySupport';
import { copyAgencyDataAction } from '@/stores/Products/Index';
@@ -28,7 +29,7 @@ export const CopyProductsForm = ({ action, initialValues, onFormInstanceReady, s
const onValuesChange = (changeValues, allValues) => {};
return (
-
);
@@ -68,7 +73,7 @@ const formValuesMapper = (values) => {
'products_types': {
key: 'products_types',
transform: (value) => {
- return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.value : '';
+ return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.value : '-1';
},
},
'dept': {
@@ -77,6 +82,7 @@ const formValuesMapper = (values) => {
return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.value : '';
},
},
+ 'with_quote': { key: 'with_quote', transform: (value) => (value ? 1 : 0) },
};
let dest = {};
const { agency, year, ...omittedValue } = values;
diff --git a/src/views/products/Manage.jsx b/src/views/products/Manage.jsx
index 1aa105c..4b2f2b6 100644
--- a/src/views/products/Manage.jsx
+++ b/src/views/products/Manage.jsx
@@ -6,9 +6,12 @@ import dayjs from 'dayjs';
import arraySupport from 'dayjs/plugin/arraySupport';
import { useTranslation } from 'react-i18next';
import useProductsStore, { copyAgencyDataAction } from '@/stores/Products/Index';
+import { useProductsTypes, useProductsAuditStatesMapVal } from '@/hooks/useProductsSets';
import useFormStore from '@/stores/Form';
import { objectMapper } from '@/utils/commons';
import CopyProductsFormModal from './Detail/CopyProducts';
+import useAuthStore from '@/stores/Auth';
+import RequireAuth from '@/components/RequireAuth';
dayjs.extend(arraySupport);
@@ -20,6 +23,8 @@ function Index() {
const [searchValues, setSearchValues] = useProductsStore((state) => [state.searchValues, state.setSearchValues]);
const formValuesToSub = useFormStore(state => state.formValuesToSub);
+ const stateMapVal = useProductsAuditStatesMapVal();
+
const useYear = formValuesToSub.year;
const handleSearchAgency = (formVal = undefined) => {
@@ -60,7 +65,15 @@ function Index() {
{ title: t('products:Vendor'), key: 'vendor', dataIndex: 'travel_agency_name' },
{ title: t('products:CreatedBy'), key: 'poster_by', dataIndex: 'poster_name' },
{ title: t('products:CreateDate'), key: 'poster_date', dataIndex: 'poster_date' },
- { title: t('products:AuState'), key: 'audit_state', dataIndex: 'audit_state' },
+ {
+ title: t('products:AuState'),
+ key: 'audit_state',
+ dataIndex: 'audit_state',
+ render: (_, r) => {
+ const stateCls = ` text-${stateMapVal[`${r.audit_state_id}`]?.color} `;
+ return
{stateMapVal[`${r.audit_state_id}`]?.label};
+ },
+ },
{ title: t('products:AuditedBy'), key: 'audited_by', dataIndex: 'audited_by_name' },
{ title: t('products:AuditDate'), key: 'audit_date', dataIndex: 'audit_date' },
{
@@ -69,9 +82,15 @@ function Index() {
render: (_, r) => (
{t('Edit')}
- {t('Audit')}
-
-
+ {r.audit_state_id >= 0 ? (
+ {t('Audit')}
+ ) : (
+ {t('Audit')}
+ )}
+
+ {/* */}
),
},
@@ -102,6 +121,7 @@ function Index() {
{/* 复制弹窗 */}