Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/srm/migrations/0007_auto_20251125_1454.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.12 on 2025-11-25 06:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srm', '0006_platstanding_platinfo'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='platstanding',
+            name='name',
+        ),
+        migrations.AddField(
+            model_name='patentinfo',
+            name='organization',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='申请部门'),
+        ),
+        migrations.AddField(
+            model_name='platform',
+            name='name',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='名称'),
+        ),
+        migrations.AlterField(
+            model_name='patentrecord',
+            name='application_number',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='申请号（交局后补登）'),
+        ),
+    ]

apps/srm/migrations/0008_alter_patentrecord_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2025-11-25 07:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srm', '0007_auto_20251125_1454'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='patentrecord',
+            name='status',
+            field=models.CharField(blank=True, choices=[('not_disclosed', '未公开'), ('under_examination', '实审中'), ('first_office_action', '一通'), ('second_office_action', '二通'), ('rejected', '驳回'), ('reexamination', '复审'), ('authorized', '授权')], max_length=20, null=True, verbose_name='状态'),
+        ),
+    ]

apps/srm/models.py

@@ -21,6 +21,7 @@ class PatentInfo(CommonBDModel):
     )
 
     name = models.CharField('拟申请专利名称', max_length=100)
+    organization = models.CharField(max_length=100,blank=True, null=True, verbose_name="申请部门")
     author = models.CharField('发明人（设计人）', max_length=100)
     type = models.CharField('专利类型', max_length=50, choices=PATENT_TYPE_CHOICES, default='invention')
     is_public = models.BooleanField('是否公开', default=False)
@@ -52,7 +53,7 @@ class PatentRecord(CommonADModel):
     ('design', '外观设计专利'),
     )
     volume_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="卷号")
-    application_number = models.CharField(max_length=50, verbose_name="申请号（交局后补登）")
+    application_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="申请号（交局后补登）")
     patent = models.ForeignKey('PatentInfo', verbose_name="专利名称", on_delete=models.CASCADE, related_name='patent_record')
     pc_type = models.CharField('专利类型', max_length=50, choices=PATENT_TYPE_CHOICES, default='invention')
     organization = models.CharField(max_length=100, verbose_name="单位")
@@ -76,6 +77,8 @@ class PatentRecord(CommonADModel):
             ("reexamination", "复审"),
             ("authorized", "授权")
         ],
+        null=True,
+        blank=True,
         verbose_name="状态"
     )
     award_info = models.TextField(null=True, blank=True, verbose_name="报奖情况")