-
-
+
+
+
+
+
+
+
+
@@ -3193,6 +3234,7 @@
let editSelectedSpec = [];
let editSelectedProvince = '';
let editSelectedCity = '';
+ let editSelectedDistrict = '';
let editAllSourceTypes = ['平台货源', '鸡场直销', '第三方货源'];
let editFilteredSourceTypes = [...editAllSourceTypes];
let editSelectedSourceType = '';
@@ -5527,6 +5569,7 @@
let selectedProvince = '';
let selectedCity = '';
+ let selectedDistrict = '';
let filteredProvinces = [...allRegionOptions];
// 显示地区选择弹窗
@@ -5535,8 +5578,26 @@
regionSelectModal.classList.add('active');
// 重置搜索输入
document.getElementById('regionSearchInput').value = '';
+ // 重置过滤条件，保持当前选择
filteredProvinces = [...allRegionOptions];
+ // 生成地区选项
generateRegionOptions();
+ // 更新显示
+ updateRegionDisplay();
+
+ // 如果有选中的省份，生成城市和区县选项
+ if (selectedProvince) {
+ const province = allRegionOptions.find(p => p.province === selectedProvince);
+ if (province) {
+ generateCityOptions(province.cities);
+ if (selectedCity) {
+ const city = province.cities.find(c => c.city === selectedCity);
+ if (city) {
+ generateDistrictOptions(city.districts || []);
+ }
+ }
+ }
+ }
}
// 隐藏地区选择弹窗
@@ -5548,6 +5609,8 @@
// 生成地区选项
function generateRegionOptions() {
const provinceList = document.getElementById('provinceList');
+ const cityList = document.getElementById('cityList');
+ const districtList = document.getElementById('districtList');
// 使用文档片段减少DOM重绘
const provinceFragment = document.createDocumentFragment();
@@ -5556,17 +5619,23 @@
filteredProvinces.forEach(province => {
const option = document.createElement('div');
option.className = 'select-item';
+ if (province.province === selectedProvince) {
+ option.classList.add('selected');
+ }
option.textContent = province.province;
option.onclick = () => {
selectedProvince = province.province;
selectedCity = '';
+ selectedDistrict = '';
updateRegionDisplay();
- // 直接确认选择
- const regionString = selectedProvince;
- document.getElementById('regionDisplayText').textContent = regionString;
- document.getElementById('regionValue').value = regionString;
- hideRegionSelectModal();
- saveFormData();
+ // 生成城市选项
+ generateCityOptions(province.cities);
+ // 清空区县选项
+ districtList.innerHTML = '';
+ // 直接滚动城市列表到顶部
+ setTimeout(() => {
+ cityList.scrollTop = 0;
+ }, 100);
};
provinceFragment.appendChild(option);
});
@@ -5577,14 +5646,118 @@
}
// 生成城市选项
-
-
+ function generateCityOptions(cities) {
+ const cityList = document.getElementById('cityList');
+ const districtList = document.getElementById('districtList');
+ const searchInput = document.getElementById('regionSearchInput');
+ const searchKeyword = searchInput.value.toLowerCase();
+
+ // 对城市进行排序：匹配的城市排在前面
+ const sortedCities = [...cities].sort((a, b) => {
+ const aMatch = a.city.toLowerCase().includes(searchKeyword);
+ const bMatch = b.city.toLowerCase().includes(searchKeyword);
+
+ if (aMatch && !bMatch) return -1;
+ if (!aMatch && bMatch) return 1;
+
+ // 如果都匹配或都不匹配，按城市名称排序
+ return a.city.localeCompare(b.city);
+ });
+
+ // 使用文档片段减少DOM重绘
+ const cityFragment = document.createDocumentFragment();
+
+ sortedCities.forEach(city => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ if (city.city === selectedCity) {
+ option.classList.add('selected');
+ }
+ option.textContent = city.city;
+ option.onclick = () => {
+ selectedCity = city.city;
+ selectedDistrict = '';
+ updateRegionDisplay();
+ // 生成区县选项
+ generateDistrictOptions(city.districts || []);
+ // 直接滚动区县列表到顶部
+ setTimeout(() => {
+ districtList.scrollTop = 0;
+ }, 100);
+ };
+ cityFragment.appendChild(option);
+ });
+
+ // 一次性添加到DOM，减少重绘
+ cityList.innerHTML = '';
+ cityList.appendChild(cityFragment);
+
+ // 使用scrollIntoView滚动到第一个城市
+ setTimeout(() => {
+ const firstCity = cityList.querySelector('.select-item');
+ if (firstCity) {
+ firstCity.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
+
+ // 生成区县选项
+ function generateDistrictOptions(districts) {
+ const districtList = document.getElementById('districtList');
+ const searchInput = document.getElementById('regionSearchInput');
+ const searchKeyword = searchInput.value.toLowerCase();
+
+ // 对区县进行排序：匹配的区县排在前面
+ const sortedDistricts = [...districts].sort((a, b) => {
+ const aMatch = a.toLowerCase().includes(searchKeyword);
+ const bMatch = b.toLowerCase().includes(searchKeyword);
+
+ if (aMatch && !bMatch) return -1;
+ if (!aMatch && bMatch) return 1;
+
+ // 如果都匹配或都不匹配，按区县名称排序
+ return a.localeCompare(b);
+ });
+
+ // 使用文档片段减少DOM重绘
+ const districtFragment = document.createDocumentFragment();
+
+ sortedDistricts.forEach(district => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ if (district === selectedDistrict) {
+ option.classList.add('selected');
+ }
+ option.textContent = district;
+ option.onclick = () => {
+ selectedDistrict = district;
+ updateRegionDisplay();
+ };
+ districtFragment.appendChild(option);
+ });
+
+ // 一次性添加到DOM，减少重绘
+ districtList.innerHTML = '';
+ districtList.appendChild(districtFragment);
+
+ // 使用scrollIntoView滚动到第一个区县
+ setTimeout(() => {
+ const firstDistrict = districtList.querySelector('.select-item');
+ if (firstDistrict) {
+ firstDistrict.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
// 更新地区显示
function updateRegionDisplay() {
const currentRegion = document.getElementById('currentRegion');
let displayText = '当前选择: ';
- if (selectedProvince) {
+ if (selectedProvince && selectedCity && selectedDistrict) {
+ displayText += `${selectedProvince} ${selectedCity} ${selectedDistrict}`;
+ } else if (selectedProvince && selectedCity) {
+ displayText += `${selectedProvince} ${selectedCity}`;
+ } else if (selectedProvince) {
displayText += selectedProvince;
} else {
displayText += '未选择';
@@ -5592,7 +5765,7 @@
currentRegion.textContent = displayText;
}
- // 过滤地区选项
+ // 过滤地区选项并自动填充
function filterRegionOptions() {
const searchInput = document.getElementById('regionSearchInput');
const searchKeyword = searchInput.value.toLowerCase();
@@ -5600,21 +5773,152 @@
// 重置选择
selectedProvince = '';
selectedCity = '';
-
- if (!searchKeyword) {
- // 如果搜索关键词为空，显示所有省份
- filteredProvinces = [...allRegionOptions];
- generateRegionOptions();
- updateRegionDisplay();
- return;
+ selectedDistrict = '';
+
+ // 先尝试直接查找区县
+ let foundDistrict = false;
+ for (let i = 0; i < allRegionOptions.length; i++) {
+ const province = allRegionOptions[i];
+ for (let j = 0; j < province.cities.length; j++) {
+ const city = province.cities[j];
+ if (city.districts) {
+ for (let k = 0; k < city.districts.length; k++) {
+ const district = city.districts[k];
+ if (district.toLowerCase().includes(searchKeyword)) {
+ // 找到匹配的区县，自动填充省市区
+ selectedProvince = province.province;
+ selectedCity = city.city;
+ selectedDistrict = district;
+ foundDistrict = true;
+ break;
+ }
+ }
+ }
+ if (foundDistrict) break;
+ }
+ if (foundDistrict) break;
+ }
+
+ if (!foundDistrict) {
+ // 尝试查找城市
+ let foundCity = false;
+ for (let i = 0; i < allRegionOptions.length; i++) {
+ const province = allRegionOptions[i];
+ for (let j = 0; j < province.cities.length; j++) {
+ const city = province.cities[j];
+ if (city.city.toLowerCase().includes(searchKeyword)) {
+ // 找到匹配的城市，自动填充省市
+ selectedProvince = province.province;
+ selectedCity = city.city;
+ foundCity = true;
+ break;
+ }
+ }
+ if (foundCity) break;
+ }
}
- // 只根据省份名称过滤
+ if (selectedProvince) {
+ // 如果找到匹配项，只显示对应的省份
+ filteredProvinces = allRegionOptions.filter(province => province.province === selectedProvince);
+ generateRegionOptions();
+
+ // 自动生成城市选项
+ const cityList = document.getElementById('cityList');
+ cityList.innerHTML = '';
+ const province = allRegionOptions.find(p => p.province === selectedProvince);
+ if (province) {
+ province.cities.forEach(city => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ option.textContent = city.city;
+ if (city.city === selectedCity) {
+ option.classList.add('selected');
+ }
+ option.onclick = () => {
+ selectedCity = city.city;
+ selectedDistrict = '';
+ updateRegionDisplay();
+ generateDistrictOptions(city.districts || []);
+ };
+ cityList.appendChild(option);
+ });
+
+ // 如果有选中的城市，生成区县选项
+ if (selectedCity) {
+ const selectedCityObj = province.cities.find(c => c.city === selectedCity);
+ if (selectedCityObj) {
+ // 生成区县选项并高亮显示匹配的区县
+ const districtList = document.getElementById('districtList');
+ districtList.innerHTML = '';
+ selectedCityObj.districts.forEach(district => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ option.textContent = district;
+ if (district === selectedDistrict) {
+ option.classList.add('selected');
+ }
+ option.onclick = () => {
+ selectedDistrict = district;
+ updateRegionDisplay();
+ };
+ districtList.appendChild(option);
+ });
+
+ // 使用scrollIntoView滚动到第一个区县
+ setTimeout(() => {
+ const firstDistrict = districtList.querySelector('.select-item');
+ if (firstDistrict) {
+ firstDistrict.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
+ } else {
+ document.getElementById('districtList').innerHTML = '';
+ }
+ }
+ } else {
+ // 否则按原逻辑过滤并排序
filteredProvinces = allRegionOptions.filter(province => {
- return province.province.toLowerCase().includes(searchKeyword);
+ return province.province.toLowerCase().includes(searchKeyword) ||
+ province.cities.some(city => {
+ return city.city.toLowerCase().includes(searchKeyword) ||
+ (city.districts && city.districts.some(district =>
+ district.toLowerCase().includes(searchKeyword)
+ ));
+ });
+ }).sort((a, b) => {
+ // 优先排序：省份名称匹配 > 城市名称匹配 > 区县名称匹配
+ const aProvinceMatch = a.province.toLowerCase().includes(searchKeyword);
+ const bProvinceMatch = b.province.toLowerCase().includes(searchKeyword);
+
+ if (aProvinceMatch && !bProvinceMatch) return -1;
+ if (!aProvinceMatch && bProvinceMatch) return 1;
+
+ // 如果省份匹配情况相同，比较城市匹配
+ const aCityMatch = a.cities.some(city => city.city.toLowerCase().includes(searchKeyword));
+ const bCityMatch = b.cities.some(city => city.city.toLowerCase().includes(searchKeyword));
+
+ if (aCityMatch && !bCityMatch) return -1;
+ if (!aCityMatch && bCityMatch) return 1;
+
+ // 如果城市匹配情况相同，比较区县匹配
+ const aDistrictMatch = a.cities.some(city => city.districts && city.districts.some(district => district.toLowerCase().includes(searchKeyword)));
+ const bDistrictMatch = b.cities.some(city => city.districts && city.districts.some(district => district.toLowerCase().includes(searchKeyword)));
+
+ if (aDistrictMatch && !bDistrictMatch) return -1;
+ if (!aDistrictMatch && bDistrictMatch) return 1;
+
+ // 如果都匹配或都不匹配，保持原有顺序
+ return 0;
});
+
+ generateRegionOptions();
+ // 清空城市和区县选项
+ document.getElementById('cityList').innerHTML = '';
+ document.getElementById('districtList').innerHTML = '';
+ }
- generateRegionOptions();
updateRegionDisplay();
}
@@ -5623,11 +5927,28 @@
if (selectedProvince) {
const regionDisplayText = document.getElementById('regionDisplayText');
const regionValue = document.getElementById('regionValue');
- regionDisplayText.textContent = selectedProvince;
- regionValue.value = selectedProvince;
+ const detailAddress = document.getElementById('detailAddress').value;
+
+ let regionText = selectedProvince;
+ if (selectedCity) {
+ regionText += ` ${selectedCity}`;
+ if (selectedDistrict) {
+ regionText += ` ${selectedDistrict}`;
+ }
+ }
+
+ // 添加详细地址
+ if (detailAddress) {
+ regionText += ` ${detailAddress}`;
+ }
+
+ regionDisplayText.textContent = regionText;
+ regionValue.value = regionText;
saveFormData();
+ hideRegionSelectModal();
+ } else {
+ alert('请选择省份');
}
- hideRegionSelectModal();
}
// 加载联系人数据
@@ -7651,6 +7972,9 @@
description: description ? description.value : '',
region: regionValue ? regionValue.value : '',
regionDisplay: regionDisplayText ? regionDisplayText.textContent : '请选择地区',
+ selectedProvince: selectedProvince || '',
+ selectedCity: selectedCity || '',
+ selectedDistrict: selectedDistrict || '',
contactId: contactId ? contactId.value : '',
// 保存其他自定义下拉框显示文本
sourceTypeDisplay: sourceTypeDisplayText ? sourceTypeDisplayText.textContent : '请选择货源类型',
@@ -7663,7 +7987,6 @@
imageUrls: Array.isArray(supplyData.uploadedImages) ? [...supplyData.uploadedImages] : [],
// 保存自定义选择状态
selectedSpec: selectedSpec || '',
- selectedProvince: selectedProvince || '',
selectedCity: selectedCity || '',
selectedSourceType: selectedSourceType || '',
selectedProductName: selectedProductName || '',
@@ -7862,6 +8185,7 @@
regionDisplayElement.textContent = formData.regionDisplay || '请选择地区';
selectedProvince = formData.selectedProvince || '';
selectedCity = formData.selectedCity || '';
+ selectedDistrict = formData.selectedDistrict || '';
}
}
@@ -7976,7 +8300,21 @@
supplyStatus: document.getElementById('supplyStatus').value,
sourceType: document.getElementById('sourceType').value,
description: document.getElementById('description').value,
- region: document.getElementById('regionValue').value,
+ region: (function() {
+ // 重新计算包含最新详细地址的region值
+ const regionValue = document.getElementById('regionValue').value;
+ const detailAddress = document.getElementById('detailAddress').value;
+
+ // 提取省市区部分（前三个部分）
+ const parts = regionValue.split(' ');
+ const provinceCityDistrict = parts.slice(0, 3).join(' ');
+
+ // 重新组合region值，包含最新的详细地址
+ if (detailAddress) {
+ return `${provinceCityDistrict} ${detailAddress}`;
+ }
+ return provinceCityDistrict;
+ })(),
contactId: document.getElementById('contactId').value,
freshness: document.getElementById('freshness').value,
imageUrls: supplyData.uploadedImages,
@@ -8063,6 +8401,7 @@
submitBtn.disabled = true;
submitBtn.textContent = '创建中...';
+ // 只等待创建货源的核心操作
const response = await fetch('/api/supplies/create', {
method: 'POST',
headers: {
@@ -8076,18 +8415,23 @@
// 创建成功，清除保存的表单数据
localStorage.removeItem('supplyFormDraft');
console.log('创建成功，已清除保存的表单数据');
+
+ // 重置表单状态，确保下次打开时是空白状态
+ resetForm();
+ hideAddSupplyModal();
+
+ // 显示成功提示
alert('货源创建成功');
+ // 非阻塞式处理后续操作
// 记录创建货源日志
const userInfo = checkLogin();
if (userInfo) {
- await logSupplyOperation('创建', result.data.id, null, result.data);
+ logSupplyOperation('创建', result.data.id, null, result.data).catch(error => {
+ console.error('记录日志失败:', error);
+ });
}
- // 重置表单状态，确保下次打开时是空白状态
- resetForm();
- hideAddSupplyModal();
-
// 向WebSocket服务器发送消息，通知其他客户端有新的货源创建
sendWebSocketMessage({
type: 'supply_create',
@@ -8096,7 +8440,10 @@
data: result.data
});
- loadSupplies(true); // 强制刷新，跳过缓存
+ // 延迟刷新数据，避免阻塞UI
+ setTimeout(() => {
+ loadSupplies(true); // 强制刷新，跳过缓存
+ }, 500);
} else {
// 创建失败，保持保存的数据
alert('创建失败: ' + (result.message || '未知错误'));
@@ -9548,19 +9895,78 @@
}
// 编辑地区选择功能
+ // 从地区字符串解析省市区信息
+ function parseRegionString(regionStr) {
+ if (!regionStr) return { province: '', city: '', district: '' };
+
+ // 移除详细地址部分（如果有）
+ let regionParts = regionStr.split(' ');
+ let province = '';
+ let city = '';
+ let district = '';
+
+ // 遍历地区数据，尝试匹配
+ for (let i = 0; i < allRegionOptions.length; i++) {
+ const p = allRegionOptions[i];
+ if (regionStr.includes(p.province)) {
+ province = p.province;
+ // 查找城市
+ for (let j = 0; j < p.cities.length; j++) {
+ const c = p.cities[j];
+ if (regionStr.includes(c.city)) {
+ city = c.city;
+ // 查找区县
+ if (c.districts) {
+ for (let k = 0; k < c.districts.length; k++) {
+ const d = c.districts[k];
+ if (regionStr.includes(d)) {
+ district = d;
+ break;
+ }
+ }
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ return { province, city, district };
+ }
+
// 显示编辑地区选择弹窗
function showEditRegionSelectModal() {
const regionSelectModal = document.getElementById('editRegionSelectModal');
regionSelectModal.classList.add('active');
// 重置搜索输入
document.getElementById('editRegionSearchInput').value = '';
- // 重置选择
- editSelectedProvince = '';
- editSelectedCity = '';
+
+ // 从现有地区值解析省市区信息
+ const regionValue = document.getElementById('editRegionValue').value;
+ const parsedRegion = parseRegionString(regionValue);
+ editSelectedProvince = parsedRegion.province;
+ editSelectedCity = parsedRegion.city;
+ editSelectedDistrict = parsedRegion.district;
+
// 更新显示
updateEditRegionDisplay();
// 生成地区选项
generateEditRegionOptions();
+
+ // 如果有选中的省份，生成城市和区县选项
+ if (editSelectedProvince) {
+ const province = allRegionOptions.find(p => p.province === editSelectedProvince);
+ if (province) {
+ generateEditCityOptions(province.cities);
+ if (editSelectedCity) {
+ const city = province.cities.find(c => c.city === editSelectedCity);
+ if (city) {
+ generateEditDistrictOptions(city.districts || []);
+ }
+ }
+ }
+ }
}
// 隐藏编辑地区选择弹窗
@@ -9572,38 +9978,139 @@
// 生成编辑地区选项
function generateEditRegionOptions() {
const provinceList = document.getElementById('editProvinceList');
+ const cityList = document.getElementById('editCityList');
+ const districtList = document.getElementById('editDistrictList');
// 生成省份选项
provinceList.innerHTML = '';
allRegionOptions.forEach(province => {
const option = document.createElement('div');
option.className = 'select-item';
- option.textContent = province.province;
if (province.province === editSelectedProvince) {
option.classList.add('selected');
}
+ option.textContent = province.province;
option.onclick = () => {
editSelectedProvince = province.province;
editSelectedCity = '';
+ editSelectedDistrict = '';
updateEditRegionDisplay();
- // 直接确认选择
- const regionString = editSelectedProvince;
- document.getElementById('editRegionDisplayText').textContent = regionString;
- document.getElementById('editRegionValue').value = regionString;
- hideEditRegionSelectModal();
- saveFormData();
+ // 生成城市选项
+ generateEditCityOptions(province.cities);
+ // 清空区县选项
+ districtList.innerHTML = '';
+ // 直接滚动城市列表到顶部
+ setTimeout(() => {
+ cityList.scrollTop = 0;
+ }, 100);
};
provinceList.appendChild(option);
});
}
// 生成编辑城市选项
+ function generateEditCityOptions(cities) {
+ const cityList = document.getElementById('editCityList');
+ const districtList = document.getElementById('editDistrictList');
+ const searchInput = document.getElementById('editRegionSearchInput');
+ const searchKeyword = searchInput.value.toLowerCase();
+
+ // 对城市进行排序：匹配的城市排在前面
+ const sortedCities = [...cities].sort((a, b) => {
+ const aMatch = a.city.toLowerCase().includes(searchKeyword);
+ const bMatch = b.city.toLowerCase().includes(searchKeyword);
+
+ if (aMatch && !bMatch) return -1;
+ if (!aMatch && bMatch) return 1;
+
+ // 如果都匹配或都不匹配，按城市名称排序
+ return a.city.localeCompare(b.city);
+ });
+
+ // 生成城市选项
+ cityList.innerHTML = '';
+ sortedCities.forEach(city => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ if (city.city === editSelectedCity) {
+ option.classList.add('selected');
+ }
+ option.textContent = city.city;
+ option.onclick = () => {
+ editSelectedCity = city.city;
+ editSelectedDistrict = '';
+ updateEditRegionDisplay();
+ // 生成区县选项
+ generateEditDistrictOptions(city.districts || []);
+ // 直接滚动区县列表到顶部
+ setTimeout(() => {
+ districtList.scrollTop = 0;
+ }, 100);
+ };
+ cityList.appendChild(option);
+ });
+
+ // 使用scrollIntoView滚动到第一个城市
+ setTimeout(() => {
+ const firstCity = cityList.querySelector('.select-item');
+ if (firstCity) {
+ firstCity.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
+
+ // 生成编辑区县选项
+ function generateEditDistrictOptions(districts) {
+ const districtList = document.getElementById('editDistrictList');
+ const searchInput = document.getElementById('editRegionSearchInput');
+ const searchKeyword = searchInput.value.toLowerCase();
+
+ // 对区县进行排序：匹配的区县排在前面
+ const sortedDistricts = [...districts].sort((a, b) => {
+ const aMatch = a.toLowerCase().includes(searchKeyword);
+ const bMatch = b.toLowerCase().includes(searchKeyword);
+
+ if (aMatch && !bMatch) return -1;
+ if (!aMatch && bMatch) return 1;
+
+ // 如果都匹配或都不匹配，按区县名称排序
+ return a.localeCompare(b);
+ });
+
+ // 生成区县选项
+ districtList.innerHTML = '';
+ sortedDistricts.forEach(district => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ if (district === editSelectedDistrict) {
+ option.classList.add('selected');
+ }
+ option.textContent = district;
+ option.onclick = () => {
+ editSelectedDistrict = district;
+ updateEditRegionDisplay();
+ };
+ districtList.appendChild(option);
+ });
+
+ // 使用scrollIntoView滚动到第一个区县
+ setTimeout(() => {
+ const firstDistrict = districtList.querySelector('.select-item');
+ if (firstDistrict) {
+ firstDistrict.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
// 更新编辑地区显示
function updateEditRegionDisplay() {
const currentRegion = document.getElementById('editCurrentRegion');
let displayText = '当前选择: ';
- if (editSelectedProvince) {
+ if (editSelectedProvince && editSelectedCity && editSelectedDistrict) {
+ displayText += `${editSelectedProvince} ${editSelectedCity} ${editSelectedDistrict}`;
+ } else if (editSelectedProvince && editSelectedCity) {
+ displayText += `${editSelectedProvince} ${editSelectedCity}`;
+ } else if (editSelectedProvince) {
displayText += editSelectedProvince;
} else {
displayText += '未选择';
@@ -9619,43 +10126,185 @@
// 重置选择
editSelectedProvince = '';
editSelectedCity = '';
-
- if (!searchKeyword) {
- // 如果搜索关键词为空，显示所有省份
- generateEditRegionOptions();
- updateEditRegionDisplay();
- return;
+ editSelectedDistrict = '';
+
+ // 先尝试直接查找区县
+ let foundDistrict = false;
+ for (let i = 0; i < allRegionOptions.length; i++) {
+ const province = allRegionOptions[i];
+ for (let j = 0; j < province.cities.length; j++) {
+ const city = province.cities[j];
+ if (city.districts) {
+ for (let k = 0; k < city.districts.length; k++) {
+ const district = city.districts[k];
+ if (district.toLowerCase().includes(searchKeyword)) {
+ // 找到匹配的区县，自动填充省市区
+ editSelectedProvince = province.province;
+ editSelectedCity = city.city;
+ editSelectedDistrict = district;
+ foundDistrict = true;
+ break;
+ }
+ }
+ }
+ if (foundDistrict) break;
+ }
+ if (foundDistrict) break;
+ }
+
+ if (!foundDistrict) {
+ // 尝试查找城市
+ let foundCity = false;
+ for (let i = 0; i < allRegionOptions.length; i++) {
+ const province = allRegionOptions[i];
+ for (let j = 0; j < province.cities.length; j++) {
+ const city = province.cities[j];
+ if (city.city.toLowerCase().includes(searchKeyword)) {
+ // 找到匹配的城市，自动填充省市
+ editSelectedProvince = province.province;
+ editSelectedCity = city.city;
+ foundCity = true;
+ break;
+ }
+ }
+ if (foundCity) break;
+ }
}
- // 过滤省份
- const filteredProvinces = allRegionOptions.filter(province => {
- // 检查省份名称是否匹配
- return province.province.toLowerCase().includes(searchKeyword);
- });
-
- // 生成省份选项
- const provinceList = document.getElementById('editProvinceList');
- provinceList.innerHTML = '';
- filteredProvinces.forEach(province => {
- const option = document.createElement('div');
- option.className = 'select-item';
- option.textContent = province.province;
- if (province.province === editSelectedProvince) {
- option.classList.add('selected');
+ if (editSelectedProvince) {
+ // 如果找到匹配项，只显示对应的省份
+ const provinceList = document.getElementById('editProvinceList');
+ provinceList.innerHTML = '';
+ const province = allRegionOptions.find(p => p.province === editSelectedProvince);
+ if (province) {
+ const option = document.createElement('div');
+ option.className = 'select-item selected';
+ option.textContent = province.province;
+ option.onclick = () => {
+ editSelectedProvince = province.province;
+ editSelectedCity = '';
+ editSelectedDistrict = '';
+ updateEditRegionDisplay();
+ generateEditCityOptions(province.cities);
+ document.getElementById('editDistrictList').innerHTML = '';
+ };
+ provinceList.appendChild(option);
+
+ // 自动生成城市选项
+ const cityList = document.getElementById('editCityList');
+ cityList.innerHTML = '';
+ province.cities.forEach(city => {
+ const cityOption = document.createElement('div');
+ cityOption.className = 'select-item';
+ cityOption.textContent = city.city;
+ if (city.city === editSelectedCity) {
+ cityOption.classList.add('selected');
+ }
+ cityOption.onclick = () => {
+ editSelectedCity = city.city;
+ editSelectedDistrict = '';
+ updateEditRegionDisplay();
+ generateEditDistrictOptions(city.districts || []);
+ };
+ cityList.appendChild(cityOption);
+ });
+
+ // 如果有选中的城市，生成区县选项
+ if (editSelectedCity) {
+ const selectedCityObj = province.cities.find(c => c.city === editSelectedCity);
+ if (selectedCityObj) {
+ // 生成区县选项并高亮显示匹配的区县
+ const districtList = document.getElementById('editDistrictList');
+ districtList.innerHTML = '';
+ selectedCityObj.districts.forEach(district => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ option.textContent = district;
+ if (district === editSelectedDistrict) {
+ option.classList.add('selected');
+ }
+ option.onclick = () => {
+ editSelectedDistrict = district;
+ updateEditRegionDisplay();
+ };
+ districtList.appendChild(option);
+ });
+
+ // 使用scrollIntoView滚动到第一个区县
+ setTimeout(() => {
+ const firstDistrict = districtList.querySelector('.select-item');
+ if (firstDistrict) {
+ firstDistrict.scrollIntoView({ behavior: 'auto', block: 'start' });
+ }
+ }, 50);
+ }
+ } else {
+ document.getElementById('editDistrictList').innerHTML = '';
+ }
}
- option.onclick = () => {
- editSelectedProvince = province.province;
- editSelectedCity = '';
- updateEditRegionDisplay();
- // 直接确认选择
- const regionString = editSelectedProvince;
- document.getElementById('editRegionDisplayText').textContent = regionString;
- document.getElementById('editRegionValue').value = regionString;
- hideEditRegionSelectModal();
- saveFormData();
- };
- provinceList.appendChild(option);
- });
+ } else {
+ // 否则按原逻辑过滤并排序
+ const filteredProvinces = allRegionOptions.filter(province => {
+ return province.province.toLowerCase().includes(searchKeyword) ||
+ province.cities.some(city => {
+ return city.city.toLowerCase().includes(searchKeyword) ||
+ (city.districts && city.districts.some(district =>
+ district.toLowerCase().includes(searchKeyword)
+ ));
+ });
+ }).sort((a, b) => {
+ // 优先排序：省份名称匹配 > 城市名称匹配 > 区县名称匹配
+ const aProvinceMatch = a.province.toLowerCase().includes(searchKeyword);
+ const bProvinceMatch = b.province.toLowerCase().includes(searchKeyword);
+
+ if (aProvinceMatch && !bProvinceMatch) return -1;
+ if (!aProvinceMatch && bProvinceMatch) return 1;
+
+ // 如果省份匹配情况相同，比较城市匹配
+ const aCityMatch = a.cities.some(city => city.city.toLowerCase().includes(searchKeyword));
+ const bCityMatch = b.cities.some(city => city.city.toLowerCase().includes(searchKeyword));
+
+ if (aCityMatch && !bCityMatch) return -1;
+ if (!aCityMatch && bCityMatch) return 1;
+
+ // 如果城市匹配情况相同，比较区县匹配
+ const aDistrictMatch = a.cities.some(city => city.districts && city.districts.some(district => district.toLowerCase().includes(searchKeyword)));
+ const bDistrictMatch = b.cities.some(city => city.districts && city.districts.some(district => district.toLowerCase().includes(searchKeyword)));
+
+ if (aDistrictMatch && !bDistrictMatch) return -1;
+ if (!aDistrictMatch && bDistrictMatch) return 1;
+
+ // 如果都匹配或都不匹配，保持原有顺序
+ return 0;
+ });
+
+ // 生成省份选项
+ const provinceList = document.getElementById('editProvinceList');
+ provinceList.innerHTML = '';
+ filteredProvinces.forEach(province => {
+ const option = document.createElement('div');
+ option.className = 'select-item';
+ option.textContent = province.province;
+ if (province.province === editSelectedProvince) {
+ option.classList.add('selected');
+ }
+ option.onclick = () => {
+ editSelectedProvince = province.province;
+ editSelectedCity = '';
+ editSelectedDistrict = '';
+ updateEditRegionDisplay();
+ generateEditCityOptions(province.cities);
+ document.getElementById('editDistrictList').innerHTML = '';
+ };
+ provinceList.appendChild(option);
+ });
+
+ // 清空城市和区县选项
+ document.getElementById('editCityList').innerHTML = '';
+ document.getElementById('editDistrictList').innerHTML = '';
+ }
+
+ updateEditRegionDisplay();
}
// 确认编辑地区选择
@@ -9663,8 +10312,23 @@
if (editSelectedProvince) {
const regionDisplayText = document.getElementById('editRegionDisplayText');
const regionValue = document.getElementById('editRegionValue');
- regionDisplayText.textContent = editSelectedProvince;
- regionValue.value = editSelectedProvince;
+ const detailAddress = document.getElementById('editDetailAddress').value;
+
+ let regionText = editSelectedProvince;
+ if (editSelectedCity) {
+ regionText += ` ${editSelectedCity}`;
+ if (editSelectedDistrict) {
+ regionText += ` ${editSelectedDistrict}`;
+ }
+ }
+
+ // 添加详细地址
+ if (detailAddress) {
+ regionText += ` ${detailAddress}`;
+ }
+
+ regionDisplayText.textContent = regionText;
+ regionValue.value = regionText;
saveFormData();
hideEditRegionSelectModal();
} else {
@@ -10129,7 +10793,21 @@
producting: document.getElementById('editProductingValue').value,
supplyStatus: document.getElementById('editSupplyStatus').value,
description: document.getElementById('editDescription').value,
- region: document.getElementById('editRegionValue').value,
+ region: (function() {
+ // 重新计算包含最新详细地址的region值
+ const regionValue = document.getElementById('editRegionValue').value;
+ const detailAddress = document.getElementById('editDetailAddress').value;
+
+ // 提取省市区部分（前三个部分）
+ const parts = regionValue.split(' ');
+ const provinceCityDistrict = parts.slice(0, 3).join(' ');
+
+ // 重新组合region值，包含最新的详细地址
+ if (detailAddress) {
+ return `${provinceCityDistrict} ${detailAddress}`;
+ }
+ return provinceCityDistrict;
+ })(),
contactId: document.getElementById('editContactId').value,
freshness: document.getElementById('editFreshness').value,
imageUrls: editCurrentImages, // 添加编辑后的图片列表
diff --git a/supply2.html b/supply2.html
new file mode 100644
index 0000000..568f80a
--- /dev/null
+++ b/supply2.html
@@ -0,0 +1,10240 @@
+
+
+
+
+
+ 货源管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已上架货源 (0)
+ ▼
+
+
+ 暂无已上架的货源
+
+
+
+
+ 下架状态货源 (0)
+ ▼
+
+
+ 暂无下架状态的货源
+
+
+
+
+
+
+
+
+ 选择新鲜程度
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择新鲜程度
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择货源类型
+ +
+
+ 平台货源: 直接包场货源
+ 鸡场直销: 鸡场直销货源
+ 第三方货源: 贸易商货源
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择商品名称
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择蛋黄类型
+ +
+
+ 请按实际情况选择蛋黄颜色,对于脏次或者冻库蛋不知道蛋黄颜色的情况下可以填写未知
+ (如果有色卡可以在货源描述里面填写色度)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择联系人
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择规格
+ +
+
+
+ 按重量选择该批次货最多的重量区间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择地区
+ +
+
+
+ 当前选择: 未选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择种类
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择产品包装
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择规格
+ +
+
+
+ 按重量选择该批次货最多的重量区间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择货源类型
+ +
+
+ 平台货源: 直接包场货源
+ 鸡场直销: 鸡场直销货源
+ 第三方货源: 贸易商货源
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择种类
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择商品名称
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择蛋黄类型
+ +
+
+ 请按实际情况选择蛋黄颜色,对于脏次或者冻库蛋不知道蛋黄颜色的情况下可以填写未知
+ (如果有色卡可以在货源描述里面填写色度)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择联系人
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择产品包装
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+
+
+ 选择地区
+ +
+
+
+ 当前选择: 未选择
+
+
+
+
+
+
+
+
+