add : ofm-create-model-patent 新建专利申请 curd
This commit is contained in:
parent
a3416cfc0d
commit
25ee92602b
|
|
@ -0,0 +1,49 @@
|
|||
# Generated by Django 3.2.12 on 2025-10-21 06:08
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import django.utils.timezone
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('wf', '0004_workflow_view_path2'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('system', '0006_auto_20241213_1249'),
|
||||
('ofm', '0022_alter_mroomslot_unique_together'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='PatentInfo',
|
||||
fields=[
|
||||
('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')),
|
||||
('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
|
||||
('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
|
||||
('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
|
||||
('name', models.CharField(max_length=100, verbose_name='拟申请专利名称')),
|
||||
('author', models.CharField(max_length=100, verbose_name='发明人（设计人）')),
|
||||
('type', models.CharField(choices=[('invention', '发明专利'), ('utility', '实用新型专利'), ('design', '外观设计专利')], default='invention', max_length=50, verbose_name='专利类型')),
|
||||
('is_public', models.BooleanField(default=False, verbose_name='是否公开')),
|
||||
('area', models.CharField(choices=[('Domestic', '国内申请'), ('Foreign', '国外申请'), (' PCT', 'PCT申请')], default='Domestic', max_length=50, verbose_name='拟申请地域')),
|
||||
('identified', models.BooleanField(default=False, verbose_name='是否进行过科技成果鉴定')),
|
||||
('published_article', models.BooleanField(default=False, verbose_name='是否发表过文章')),
|
||||
('exhibited', models.BooleanField(default=False, verbose_name='是否参与过展会展出')),
|
||||
('applied_to_production', models.BooleanField(default=False, verbose_name='是否参与应用于生产/销售')),
|
||||
('participated_in_exchange', models.BooleanField(default=False, verbose_name='是否参与过技术交流')),
|
||||
('tech_background_pages', models.PositiveIntegerField(blank=True, null=True, verbose_name='技术背景材料页数')),
|
||||
('tech_disclosure_pages', models.PositiveIntegerField(blank=True, null=True, verbose_name='技术交底材料页数')),
|
||||
('novelty_report_pages', models.PositiveIntegerField(blank=True, null=True, verbose_name='查新检索报告页数')),
|
||||
('diagrams_or_photos_pages', models.PositiveIntegerField(blank=True, null=True, verbose_name='图/照片页数或张数')),
|
||||
('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='patentinfo_belong_dept', to='system.dept', verbose_name='所属部门')),
|
||||
('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='patentinfo_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
|
||||
('ticket', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='patentInfo_ticket', to='wf.ticket', verbose_name='关联工单')),
|
||||
('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='patentinfo_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -158,33 +158,34 @@ class Publicity(CommonBDModel):
|
|||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
# class PatentInfo(CommonBDModel):
|
||||
# """TN: 专利申密审批表单样式"""
|
||||
# PATENT_TYPE_CHOICES = (
|
||||
# ('invention', '发明专利'),
|
||||
# ('utility', '实用新型专利'),
|
||||
# ('design', '外观设计专利'),
|
||||
# )
|
||||
# APPLY_AREAS = (
|
||||
# ('Domestic', '国内申请'),
|
||||
# ('Foreign', '国外申请'),
|
||||
# (' PCT', 'PCT申请'),
|
||||
# )
|
||||
# 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)
|
||||
|
||||
class PatentInfo(CommonBDModel):
|
||||
"""TN: 专利申密审批表单样式"""
|
||||
PATENT_TYPE_CHOICES = (
|
||||
('invention', '发明专利'),
|
||||
('utility', '实用新型专利'),
|
||||
('design', '外观设计专利'),
|
||||
)
|
||||
APPLY_AREAS = (
|
||||
('Domestic', '国内申请'),
|
||||
('Foreign', '国外申请'),
|
||||
(' PCT', 'PCT申请'),
|
||||
)
|
||||
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)
|
||||
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: 论文申密审批表单"""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
from .models import (Mroom, MroomBooking, MroomSlot, LendingSeal, Vehicle, FileRecord, BorrowRecord, Publicity)
|
||||
# Publicity, PatentInfo, PaperOfm, Platform, Project, PatentRecord, PaperRecord, ProjectApproval, ProjectInfo)
|
||||
from .models import (Mroom, MroomBooking, MroomSlot, LendingSeal, Vehicle, FileRecord, BorrowRecord, Publicity, PatentInfo)
|
||||
# Publicity, PatetInfo, PaperOfm, Platform, Project, PatentRecord, PaperRecord, ProjectApproval, ProjectInfo)
|
||||
from apps.utils.serializers import CustomModelSerializer
|
||||
from rest_framework import serializers
|
||||
from django.db import transaction
|
||||
|
|
@ -122,11 +122,11 @@ class PublicitySerializer(CustomModelSerializer):
|
|||
read_only_fields = EXCLUDE_FIELDS
|
||||
|
||||
|
||||
# class PatentInfoSerializer(CustomModelSerializer):
|
||||
# class Meta:
|
||||
# model = PatentInfo
|
||||
# fields = '__all__'
|
||||
# read_only_fields = EXCLUDE_FIELDS
|
||||
class PatentInfoSerializer(CustomModelSerializer):
|
||||
class Meta:
|
||||
model = PatentInfo
|
||||
fields = '__all__'
|
||||
read_only_fields = EXCLUDE_FIELDS
|
||||
|
||||
|
||||
# class PaperSerializer(CustomModelSerializer):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
from apps.wf.models import Ticket
|
||||
# TicketFlow, Transition, Workflow, CustomField, State,
|
||||
from apps.ofm.models import LendingSeal, Vehicle, BorrowRecord, Publicity, MroomBooking, MroomSlot
|
||||
from apps.ofm.models import LendingSeal, Vehicle, BorrowRecord, Publicity, MroomBooking, MroomSlot, PatentInfo
|
||||
from rest_framework.exceptions import ParseError
|
||||
|
||||
|
||||
|
|
@ -138,4 +138,18 @@ def save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs):
|
|||
for k, v in data_save.items():
|
||||
setattr(obj, k, v)
|
||||
obj.save()
|
||||
|
||||
|
||||
|
||||
def bind_patent(ticket: Ticket, transition, new_ticket_data: dict):
|
||||
ins = PatentInfo.objects.get(id=new_ticket_data['t_id'])
|
||||
ticket_data = ticket.ticket_data
|
||||
ticket_data.update({
|
||||
't_model': 'patent',
|
||||
't_id': ins.id,
|
||||
})
|
||||
ticket.ticket_data = ticket_data
|
||||
ticket.create_by = ins.create_by
|
||||
ticket.save()
|
||||
if ins.ticket is None:
|
||||
ins.ticket = ticket
|
||||
ins.save()
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
from django.urls import path, include
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from apps.ofm.views import (MroomViewSet, MroomBookingViewSet, MroomSlotViewSet,LendingSealViewSet, VehicleViewSet, FilerecordViewSet, FileborrowViewSet, PublicityViewSet)
|
||||
from apps.ofm.views import (MroomViewSet, MroomBookingViewSet, MroomSlotViewSet,LendingSealViewSet, VehicleViewSet, FilerecordViewSet,
|
||||
FileborrowViewSet, PublicityViewSet, PatentInfoViewSet)
|
||||
# SealModelViewSet,
|
||||
# , PublicityViewSet, PatentInfoViewSet, PaperViewSet, PlatformViewSet,
|
||||
# , PublicityViewSet, , PaperViewSet, PlatformViewSet,
|
||||
# ProjectViewSet, PatentRecordViewSet, PaperRecordViewSet, ProjectApprovalViewSet, ProjectInfoViewSet)
|
||||
|
||||
API_BASE_URL = 'api/ofm/'
|
||||
|
|
@ -18,7 +19,7 @@ router.register('vehicle', VehicleViewSet, basename='vehicle')
|
|||
router.register('filerecord', FilerecordViewSet, basename='filerecord')
|
||||
router.register('fileborrow', FileborrowViewSet, basename='fileborrow')
|
||||
router.register('publicity', PublicityViewSet, basename='publicity')
|
||||
# router.register('patentinfo', PatentInfoViewSet, basename='patentinfo')
|
||||
router.register('patentinfo', PatentInfoViewSet, basename='patentinfo')
|
||||
# router.register('paper', PaperViewSet, basename='paper')
|
||||
# router.register('platform', PlatformViewSet, basename='platform')
|
||||
# router.register('project', ProjectViewSet, basename='project')
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
from django.shortcuts import render
|
||||
from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
|
||||
from .models import Mroom, MroomBooking, MroomSlot, LendingSeal, Vehicle, FileRecord, BorrowRecord, Publicity
|
||||
# Publicity, PatentInfo, PaperOfm, Platform, Project, PatentRecord, PaperRecord, ProjectApproval, ProjectInfo)
|
||||
from .serializers import (MroomSerializer, MroomBookingSerializer, MroomSlotSerializer, LendingSealSerializer, VehicleSerializer, FileRecordSerializer, BorrowRecordSerializer, PublicitySerializer,)
|
||||
from .models import Mroom, MroomBooking, MroomSlot, LendingSeal, Vehicle, FileRecord, BorrowRecord, Publicity, PatentInfo
|
||||
# Publicity, , PaperOfm, Platform, Project, PatentRecord, PaperRecord, ProjectApproval, ProjectInfo)
|
||||
from .serializers import (MroomSerializer, MroomBookingSerializer, MroomSlotSerializer, LendingSealSerializer,
|
||||
VehicleSerializer, FileRecordSerializer, BorrowRecordSerializer, PublicitySerializer, PatentInfoSerializer)
|
||||
# ,SealSerializer,
|
||||
# LendingSealSerializer, FileRecordSerializer, BorrowRecordSerializer, PublicitySerializer,
|
||||
# PatentInfoSerializer, PaperSerializer, PlatformSerializer, ProjectSerializer, ProjectMemberSerializer, PaperRecordSerializer, ProjectApprovalSerializer, ProjectInfoSerializer)
|
||||
|
|
@ -170,15 +171,15 @@ class PublicityViewSet(CustomModelViewSet):
|
|||
ordering = ["-create_time", "number"]
|
||||
|
||||
|
||||
# class PatentInfoViewSet(CustomModelViewSet):
|
||||
# """list: 专利
|
||||
class PatentInfoViewSet(CustomModelViewSet):
|
||||
"""list: 专利
|
||||
|
||||
# 专利
|
||||
# """
|
||||
# queryset = PatentInfo.objects.all()
|
||||
# serializer_class = PatentInfoSerializer
|
||||
# filterset_fields = ["name", "author", "type"]
|
||||
# ordering = ["create_time", "name", "author", "type"]
|
||||
专利
|
||||
"""
|
||||
queryset = PatentInfo.objects.all()
|
||||
serializer_class = PatentInfoSerializer
|
||||
filterset_fields = ["name", "author", "type"]
|
||||
ordering = ["-create_time", "name", "author", "type"]
|
||||
|
||||
|
||||
# class PaperViewSet(CustomModelViewSet):
|
||||
|
|
|
|||
Loading…
Reference in New Issue