|
|
@@ -594,9 +594,13 @@ export default {
|
|
|
})
|
|
|
.then(async () => {
|
|
|
try {
|
|
|
- await this.http().delete(`/limit_purchase/rule/${row.id}`)
|
|
|
- this.$message.success('删除成功')
|
|
|
- this.fetchRuleList()
|
|
|
+ const {code,msg} = await this.http().delete(`/limit_purchase/rule/${row.id}`)
|
|
|
+ if (code === 0 || code === 200) {
|
|
|
+ this.$message.success('删除成功')
|
|
|
+ this.fetchRuleList()
|
|
|
+ } else {
|
|
|
+ this.$message.error(msg || '删除失败')
|
|
|
+ }
|
|
|
} catch (e) {
|
|
|
console.error(e)
|
|
|
this.$message.error('删除失败')
|
|
|
@@ -676,8 +680,8 @@ export default {
|
|
|
province_name: this.selectedProvince,
|
|
|
city_id: cityObj ? cityObj.code : null,
|
|
|
city_name: this.selectedCity || null,
|
|
|
- district_id: areaObj ? areaObj.code : null,
|
|
|
- district_name: this.selectedArea || null
|
|
|
+ area_id: areaObj ? areaObj.code : null,
|
|
|
+ area_name: this.selectedArea || null
|
|
|
};
|
|
|
|
|
|
// 去重:检查是否已经存在相同或更广范围的地区
|
|
|
@@ -691,13 +695,13 @@ export default {
|
|
|
}
|
|
|
|
|
|
// 如果当前添加的是市级规则
|
|
|
- if (region.city_name && !region.district_name) {
|
|
|
- return item.city_name === region.city_name && !item.district_name;
|
|
|
+ if (region.city_name && !region.area_name) {
|
|
|
+ return item.city_name === region.city_name && !item.area_name;
|
|
|
}
|
|
|
|
|
|
// 如果当前添加的是区级规则
|
|
|
- if (region.city_name && region.district_name) {
|
|
|
- return item.city_name === region.city_name && item.district_name === region.district_name;
|
|
|
+ if (region.city_name && region.area_name) {
|
|
|
+ return item.city_name === region.city_name && item.area_name === region.area_name;
|
|
|
}
|
|
|
|
|
|
return false;
|
|
|
@@ -729,7 +733,7 @@ export default {
|
|
|
const parts = []
|
|
|
if (region.province_name) parts.push(region.province_name)
|
|
|
if (region.city_name) parts.push(region.city_name)
|
|
|
- if (region.district_name) parts.push(region.district_name)
|
|
|
+ if (region.area_name) parts.push(region.area_name)
|
|
|
return parts.join(' - ') || '未知地区'
|
|
|
}
|
|
|
}
|