zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

feat: app verion && some field modify (printing & shipment)

Browse Source
This commit is contained in:
colaftc
2026-07-08 20:36:51 +08:00
parent ddbf798665
commit 36e4bb6de6
32 changed files with 3465 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
basic_info/admin.py
View File

@@ -122,6 +122,35 @@ class CustomerAdmin(AdminBase):
return '0 (动态逻辑字段待实现)'
@admin.register(models.CustomerAddress)
class CustomerAddressAdmin(AdminBase):
list_display = (
'customer',
'address',
'contact_name',
'contact_phone',
'area',
'is_default',
'deleted_at',
)
list_filter = ('is_default', 'deleted_at', 'area')
search_fields = (
'customer__name',
'address',
'contact_name',
'contact_phone',
'area',
)
def get_queryset(self, request):
qs = super().get_queryset(request).select_related('customer')
customer_qs = CustomerVisibilityService.filter_customers_for_employee(
models.Customer.objects.all(),
request.user,
)
return qs.filter(customer__in=customer_qs)
@admin.register(models.Employee)
class EmployeeAdmin(AdminBase):
list_display = ('name', 'mobile', 'status', 'position_display', 'sys_user')

41
basic_info/migrations/0028_customeraddress.py Normal file
View File

@@ -0,0 +1,41 @@
# Generated by Django 5.2.8 on 2026-07-07 12:30
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('basic_info', '0027_employee_wecom_user_id'),
]
operations = [
migrations.CreateModel(
name='CustomerAddress',
fields=[
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
('id', models.BigAutoField(primary_key=True, serialize=False)),
('address', models.CharField(max_length=255, verbose_name='地址')),
('contact_name', models.CharField(blank=True, default='', max_length=100, verbose_name='联系人')),
('contact_phone', models.CharField(blank=True, default='', max_length=50, verbose_name='联系电话')),
('area', models.CharField(blank=True, default='', max_length=100, verbose_name='地区')),
('coordinates', models.CharField(blank=True, help_text='经纬度字符串，格式由调用方决定', max_length=100, null=True, verbose_name='经纬度')),
('is_default', models.BooleanField(default=False, verbose_name='是否默认地址')),
('remark', models.CharField(blank=True, default='', max_length=200, verbose_name='备注')),
('extra', models.JSONField(blank=True, null=True, verbose_name='扩展信息')),
('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='删除时间')),
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='created_customer_addresses', to='basic_info.employee', verbose_name='创建者')),
('customer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='addresses', to='basic_info.customer', verbose_name='客户')),
('deleted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='deleted_customer_addresses', to='basic_info.employee', verbose_name='删除者')),
('merchant', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='customer_addresses', to='basic_info.merchant', verbose_name='所属商户')),
],
options={
'verbose_name': '客户地址',
'verbose_name_plural': '客户地址',
'ordering': ['-is_default', '-created_at', '-id'],
'indexes': [models.Index(fields=['merchant', 'customer'], name='basic_info__merchan_d9f31e_idx'), models.Index(fields=['deleted_at'], name='basic_info__deleted_a6a24f_idx'), models.Index(fields=['is_default'], name='basic_info__is_defa_487d27_idx')],
},
),
]

12
basic_info/migrations/0029_customeraddress_coordinates.py Normal file
View File

@@ -0,0 +1,12 @@
# Generated by OpenCode on 2026-07-07
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('basic_info', '0028_customeraddress'),
]
operations = []

60
basic_info/models.py
View File

@@ -450,6 +450,66 @@ class Customer(ModelBase):
]
class CustomerAddress(ModelBase):
id = models.BigAutoField(primary_key=True)
merchant = models.ForeignKey(
'Merchant',
on_delete=models.PROTECT,
related_name='customer_addresses',
verbose_name='所属商户',
)
customer = models.ForeignKey(
'Customer',
on_delete=models.PROTECT,
related_name='addresses',
verbose_name='客户',
)
address = models.CharField(max_length=255, verbose_name='地址')
contact_name = models.CharField(max_length=100, blank=True, default='', verbose_name='联系人')
contact_phone = models.CharField(max_length=50, blank=True, default='', verbose_name='联系电话')
area = models.CharField(max_length=100, blank=True, default='', verbose_name='地区')
coordinates = models.CharField(
max_length=100,
null=True,
blank=True,
verbose_name='经纬度',
help_text='经纬度字符串，格式由调用方决定',
)
is_default = models.BooleanField(default=False, verbose_name='是否默认地址')
remark = models.CharField(max_length=200, blank=True, default='', verbose_name='备注')
extra = models.JSONField(null=True, blank=True, verbose_name='扩展信息')
created_by = models.ForeignKey(
'Employee',
on_delete=models.PROTECT,
related_name='created_customer_addresses',
null=True,
blank=True,
verbose_name='创建者',
)
deleted_at = models.DateTimeField(null=True, blank=True, verbose_name='删除时间')
deleted_by = models.ForeignKey(
'Employee',
on_delete=models.SET_NULL,
related_name='deleted_customer_addresses',
null=True,
blank=True,
verbose_name='删除者',
)
def __str__(self):
return f'{self.customer.name} - {self.address}'
class Meta:
verbose_name = '客户地址'
verbose_name_plural = '客户地址'
ordering = ['-is_default', '-created_at', '-id']
indexes = [
models.Index(fields=['merchant', 'customer']),
models.Index(fields=['deleted_at']),
models.Index(fields=['is_default']),
]
class Employee(ModelBase):
id = models.BigAutoField(primary_key=True)
merchant = models.ForeignKey('Merchant', on_delete=models.PROTECT, related_name='employees', verbose_name='所属商户')