diff --git a/src/components/MultiCitySelector.jsx b/src/components/MultiCitySelector.jsx
new file mode 100644
index 0000000..3851f87
--- /dev/null
+++ b/src/components/MultiCitySelector.jsx
@@ -0,0 +1,29 @@
+import { createContext, useEffect, useState } from 'react';
+import {} from 'antd';
+import SearchInput from './SearchInput';
+import { fetchJSON } from '@/utils/request';
+import { HT_HOST } from '@/config';
+import { useTranslation } from 'react-i18next';
+
+//供应商列表
+export const fetchCityList = async (q) => {
+ const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/search_cities`, { q });
+ return errcode !== 0 ? [] : result;
+};
+
+const MultiCitySelector = ({ ...props }) => {
+ const { t } = useTranslation();
+ return (
+ <>
+
+ >
+ );
+};
+export default MultiCitySelector;
diff --git a/src/hooks/useProductsSets.js b/src/hooks/useProductsSets.js
index c291cbf..c063c58 100644
--- a/src/hooks/useProductsSets.js
+++ b/src/hooks/useProductsSets.js
@@ -100,7 +100,7 @@ export const useProductsAuditStatesMapVal = (value) => {
*/
export const useProductsTypesFieldsets = (type) => {
const [isPermitted] = useAuthStore((state) => [state.isPermitted]);
- const infoDefault = [['city'], ['title']];
+ const infoDefault = [['city', 'city_list'], ['title']];
const infoAdmin = ['title', 'product_title', 'code', 'remarks', 'dept']; // 'display_to_c'
const infoDisplay = isPermitted(PERM_PRODUCTS_MANAGEMENT) ? ['display_to_c', 'sort_order'] : [];
const infoRecDisplay = isPermitted(PERM_PRODUCTS_MANAGEMENT) ? ['recommends_rate'] : [];
diff --git a/src/stores/Products/Index.js b/src/stores/Products/Index.js
index 64ef53c..8d3fdab 100644
--- a/src/stores/Products/Index.js
+++ b/src/stores/Products/Index.js
@@ -329,7 +329,7 @@ export const useProductsStore = create(
weekdays: definition.weekend.join(','),
WPI_SN: editingProduct.info.id,
WPP_VEI_SN: activeAgency.travel_agency_id,
- lastedit_changed: '',
+ lastedit_changed: {},
audit_state_id: -1,
key: generateId(),
fresh: false
@@ -369,13 +369,14 @@ export const useProductsStore = create(
if (prevQuotation.key === formValues.key) {
const changedObject = {}
for (const [key, value] of Object.entries(formValues)) {
- if (key === 'use_dates' || key === 'id' || key === 'key' || key === 'weekdayList') continue
+ if (key === 'use_dates' || key === 'id' || key === 'key' || key === 'weekdayList'
+ || key === 'WPI_SN' || key === 'WPP_VEI_SN') continue
const preValue = prevQuotation[key]
const hasChanged = preValue !== value
if (hasChanged) {
- changedObject[key] = value
+ changedObject[key] = preValue
}
}
diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx
index 1df2fd8..3c10dba 100644
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@@ -223,14 +223,6 @@ function getFields(props) {
,
fieldProps?.city?.col || midCol
),
- item(
- 'city_list',
- 99,
-
-
- ,
- fieldProps?.city_list?.col || midCol
- ),
item(
'dept',
99,
@@ -248,6 +240,14 @@ function getFields(props) {
,
fieldProps?.duration?.col || midCol
),
+ item(
+ 'city_list',
+ 99,
+
+
+ ,
+ fieldProps?.city_list?.col || midCol
+ ),
item(
'km',
99,