diff --git a/apps/ofm/migrations/0024_auto_20251022_1005.py b/apps/ofm/migrations/0024_auto_20251022_1005.py new file mode 100644 index 00000000..0cc0a98c --- /dev/null +++ b/apps/ofm/migrations/0024_auto_20251022_1005.py @@ -0,0 +1,95 @@ +# Generated by Django 3.2.12 on 2025-10-22 02:05 + +import apps.ofm.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ofm', '0023_patentinfo'), + ] + + operations = [ + migrations.RemoveField( + model_name='patentinfo', + name='applied_to_production', + ), + migrations.RemoveField( + model_name='patentinfo', + name='diagrams_or_photos_pages', + ), + migrations.RemoveField( + model_name='patentinfo', + name='exhibited', + ), + migrations.RemoveField( + model_name='patentinfo', + name='identified', + ), + migrations.RemoveField( + model_name='patentinfo', + name='novelty_report_pages', + ), + migrations.RemoveField( + model_name='patentinfo', + name='participated_in_exchange', + ), + migrations.RemoveField( + model_name='patentinfo', + name='published_article', + ), + migrations.RemoveField( + model_name='patentinfo', + name='tech_background_pages', + ), + migrations.RemoveField( + model_name='patentinfo', + name='tech_disclosure_pages', + ), + migrations.AddField( + model_name='patentinfo', + name='other_area', + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='其它申请地域'), + ), + migrations.AddField( + model_name='patentinfo', + name='tech_file', + field=models.JSONField(default=list, help_text='技术文件信息列表,每个条目包含name(名称)page(页数)字段', verbose_name='技术文件'), + ), + migrations.AddField( + model_name='patentinfo', + name='tech_status', + field=models.JSONField(blank=True, default=apps.ofm.models.PatentInfo.default_document_state, help_text='技术状态信息列表,每个条目包含name(名称)、status(状态)、file(文件)字段', verbose_name='技术状态'), + ), + migrations.AlterField( + model_name='borrowrecord', + name='remark', + field=models.JSONField(default=list, help_text="['借阅', '复印', '查阅']", verbose_name='用途'), + ), + migrations.AlterField( + model_name='publicity', + name='channel', + field=models.JSONField(default=list, help_text="['互联网', '信息平台', '官微', '公开发行物', '其它']", verbose_name='发布渠道'), + ), + migrations.AlterField( + model_name='publicity', + name='content', + field=models.JSONField(default=list, help_text="['武器装备科研生产综合事项', '其它']", verbose_name='稿件内容涉及'), + ), + migrations.AlterField( + model_name='publicity', + name='dept_opinion', + field=models.JSONField(blank=True, default=list, help_text="['同意', '不同意']", null=True, verbose_name='部门负责人意见'), + ), + migrations.AlterField( + model_name='publicity', + name='level', + field=models.JSONField(default=list, help_text="['重要', '一般', '非涉密']", verbose_name='涉密等级'), + ), + migrations.AlterField( + model_name='publicity', + name='review', + field=models.JSONField(blank=True, default=list, help_text="['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布']", null=True, verbose_name='第一撰稿人自审'), + ), + ] diff --git a/apps/ofm/models.py b/apps/ofm/models.py index 252ab6ea..afb322e0 100644 --- a/apps/ofm/models.py +++ b/apps/ofm/models.py @@ -112,7 +112,7 @@ class BorrowRecord(CommonBDModel): borrow_date = models.DateField('借阅日期', null=True, blank=True) return_date = models.DateField('归还日期', null=True, blank=True) contacts = models.CharField('借阅人电话', max_length=50, validators=[phone_validator], null=True, blank=True) - remark = models.JSONField('用途', default=list, help_text=['借阅', '复印', '查阅']) + remark = models.JSONField('用途', default=list, help_text=str(['借阅', '复印', '查阅'])) ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, related_name='borrow_ticket', null=True, blank=True, db_constraint=False) @@ -124,18 +124,18 @@ class Publicity(CommonBDModel): participants = models.CharField('所有撰稿人', max_length=50) pub_dept = models.CharField('部室/研究院', null=True, blank=True, max_length=50) pfile = models.CharField('稿件路径', null=True, blank=True, max_length=100) - level = models.JSONField('涉密等级', default=list, help_text=['重要', '一般', '非涉密']) - content = models.JSONField('稿件内容涉及', default=list, help_text=[ + level = models.JSONField('涉密等级', default=list, help_text=str(['重要', '一般', '非涉密'])) + content = models.JSONField('稿件内容涉及', default=list, help_text=str([ "武器装备科研生产综合事项", "其它" - ]) + ])) other_content = models.CharField('其它内容', max_length=100, blank=True, null=True) report_purpose = models.CharField('宣传报道目的', max_length=100, blank=True, null=True) - channel = models.JSONField('发布渠道', default=list, help_text=['互联网', '信息平台', '官微', '公开发行物', '其它']) + channel = models.JSONField('发布渠道', default=list, help_text=str(['互联网', '信息平台', '官微', '公开发行物', '其它'])) other_channel = models.CharField('其它渠道', max_length=50, blank=True, null=True) report_name = models.CharField('报道名称', max_length=50, blank=True, null=True) - review = models.JSONField('第一撰稿人自审', default=list, help_text=['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布'], null=True,blank=True) - dept_opinion = models.JSONField('部门负责人意见', default=list, help_text=['同意', '不同意'], null=True, blank=True) + review = models.JSONField('第一撰稿人自审', default=list, help_text=str(['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布']), null=True,blank=True) + dept_opinion = models.JSONField('部门负责人意见', default=list, help_text=str(['同意', '不同意']), null=True, blank=True) secret_period = models.CharField('秘密期限', max_length=50, blank=True, null=True) dept_opinion_review = models.CharField('部门审查意见', max_length=100, blank=True, null=True) publicity_opinion = models.CharField('宣传报道意见', max_length=100, blank=True, null=True) @@ -170,23 +170,21 @@ class PatentInfo(CommonBDModel): ('Foreign', '国外申请'), (' PCT', 'PCT申请'), ) + + def default_document_state(self): + return [] + name = models.CharField('拟申请专利名称', max_length=100) author = models.CharField('发明人(设计人)', max_length=100) type = models.CharField('专利类型', max_length=50, choices=PATENT_TYPE_CHOICES, default='invention') is_public = models.BooleanField('是否公开', default=False) area = models.CharField('拟申请地域', max_length=50, choices=APPLY_AREAS, default='Domestic') - identified = models.BooleanField('是否进行过科技成果鉴定', default=False) - published_article = models.BooleanField('是否发表过文章', default=False) - exhibited = models.BooleanField('是否参与过展会展出', default=False) - applied_to_production = models.BooleanField('是否参与应用于生产/销售', default=False) - participated_in_exchange = models.BooleanField('是否参与过技术交流', default=False) - tech_background_pages = models.PositiveIntegerField('技术背景材料页数', null=True, blank=True) - tech_disclosure_pages = models.PositiveIntegerField('技术交底材料页数', null=True, blank=True) - novelty_report_pages = models.PositiveIntegerField('查新检索报告页数', null=True, blank=True) - diagrams_or_photos_pages = models.PositiveIntegerField('图/照片页数或张数', null=True, blank=True) + other_area = models.CharField('其它申请地域', max_length=50, blank=True, null=True) + tech_status = models.JSONField('技术状态', default=default_document_state, blank=True, help_text='技术状态信息列表,每个条目包含name(名称)、status(状态)、file(文件)字段') + tech_file = models.JSONField('技术文件', default=list, help_text='技术文件信息列表,每个条目包含name(名称)page(页数)字段') ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, related_name='patentInfo_ticket', null=True, blank=True, db_constraint=False) - + # class PaperOfm(CommonADModel): # """TN: 论文申密审批表单""" # PAPER_TYPE_CHOICES = ( diff --git a/apps/ofm/serializers.py b/apps/ofm/serializers.py index 01e57d87..ec1c85f6 100644 --- a/apps/ofm/serializers.py +++ b/apps/ofm/serializers.py @@ -123,6 +123,9 @@ class PublicitySerializer(CustomModelSerializer): class PatentInfoSerializer(CustomModelSerializer): + create_by_name = serializers.CharField(source='create_by.name', read_only=True) + belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) + ticket_ = TicketSimpleSerializer(source='ticket', read_only=True) class Meta: model = PatentInfo fields = '__all__'