Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
This commit is contained in:
commit
e07a1fdc4c
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.2.12 on 2025-11-25 08:16
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('srm', '0008_alter_patentrecord_status'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='paperrecord',
|
||||
name='organization',
|
||||
field=models.CharField(max_length=100, verbose_name='申请部门'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='paperrecord',
|
||||
name='status',
|
||||
field=models.CharField(blank=True, choices=[('审稿中', '审稿中'), ('一修', '一修'), ('二修', '二修'), ('接收', '接收'), ('发表', '发表')], max_length=20, null=True, verbose_name='状态'),
|
||||
),
|
||||
]
|
||||
|
|
@ -93,7 +93,7 @@ class PaperRecord(CommonADModel):
|
|||
paper_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="论文编号(投稿后补登)")
|
||||
paper = models.ForeignKey('Papersecret', verbose_name="论文名称", on_delete=models.CASCADE, related_name='paper_record')
|
||||
pa_type = models.CharField('论文类型', max_length=50, choices=PAPER_TYPE_CHOICES, default='invention')
|
||||
organization = models.CharField(max_length=100, verbose_name="单位")
|
||||
organization = models.CharField(max_length=100, verbose_name="申请部门")
|
||||
author = models.CharField(max_length=100, verbose_name="作者")
|
||||
cor_author = models.CharField(max_length=100, verbose_name="通讯作者")
|
||||
affiliated_platforms = models.CharField(max_length=255, blank=True, verbose_name="归属平台")
|
||||
|
|
@ -111,7 +111,9 @@ class PaperRecord(CommonADModel):
|
|||
("接收", "接收"),
|
||||
("发表", "发表"),
|
||||
],
|
||||
verbose_name="状态"
|
||||
verbose_name="状态",
|
||||
null=True,
|
||||
blank=True
|
||||
)
|
||||
award_info = models.TextField(null=True, blank=True, verbose_name="报奖情况")
|
||||
bonus_amount = models.DecimalField(max_digits=10,decimal_places=2, null=True,blank=True,verbose_name="奖金金额(元)")
|
||||
|
|
|
|||
Loading…
Reference in New Issue