dict code 非必填
This commit is contained in:
parent
72637e749d
commit
d9ba995bcc
|
@ -1,7 +1,7 @@
|
|||
from django.shortcuts import render
|
||||
from rest_framework.response import Response
|
||||
from apps.opm.models import GasCheck, Operation, Opl, OplCate, OplWorker
|
||||
from apps.opm.serializers import GasCheckCreateUpdateSerializer, GasCheckSerializer, OperationCreateUpdateSerializer, OperationSerializer, OplCateCreateUpdateSerializer, OplCateSerializer, OplSerializer, OplWorkerCreateSerializer, OplWorkerUpdateSerializer
|
||||
from apps.opm.serializers import GasCheckCreateUpdateSerializer, GasCheckSerializer, OperationCreateUpdateSerializer, OperationSerializer, OplCateCreateUpdateSerializer, OplCateSerializer, OplCreateUpdateSerializer, OplSerializer, OplWorkerCreateSerializer, OplWorkerUpdateSerializer
|
||||
from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet
|
||||
from rest_framework.exceptions import ParseError
|
||||
from rest_framework.mixins import CreateModelMixin, ListModelMixin, DestroyModelMixin
|
||||
|
@ -39,8 +39,8 @@ class OperationViewSet(CustomModelViewSet):
|
|||
|
||||
class OplViewSet(CustomModelViewSet):
|
||||
queryset = Opl.objects.all()
|
||||
create_serializer_class = OplCateCreateUpdateSerializer
|
||||
update_serializer_class = OplCateCreateUpdateSerializer
|
||||
create_serializer_class = OplCreateUpdateSerializer
|
||||
update_serializer_class = OplCreateUpdateSerializer
|
||||
serializer_class = OplSerializer
|
||||
|
||||
def destroy(self, request, *args, **kwargs):
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 3.2.12 on 2022-06-21 01:51
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='dictionary',
|
||||
name='value',
|
||||
field=models.CharField(blank=True, max_length=10, null=True, verbose_name='值'),
|
||||
),
|
||||
]
|
|
@ -174,7 +174,7 @@ class Dictionary(CommonAModel):
|
|||
数据字典
|
||||
"""
|
||||
name = models.CharField('名称', max_length=60)
|
||||
value = models.CharField('值', max_length=10)
|
||||
value = models.CharField('值', max_length=10, null=True, blank=True)
|
||||
code = models.CharField('标识', max_length=30, null=True, blank=True)
|
||||
description = models.TextField('描述', blank=True, null=True)
|
||||
type = models.ForeignKey(
|
||||
|
|
|
@ -320,7 +320,7 @@ class UserUpdateSerializer(CustomModelSerializer):
|
|||
"""
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['username', 'name', 'avatar', 'is_active']
|
||||
fields = ['username', 'name', 'avatar', 'is_active', 'phone']
|
||||
|
||||
def update(self, instance, validated_data):
|
||||
if User.objects.filter(username=validated_data['username']
|
||||
|
@ -337,7 +337,7 @@ class UserCreateSerializer(CustomModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['username', 'name', 'avatar', 'is_active']
|
||||
fields = ['username', 'name', 'avatar', 'is_active', 'phone']
|
||||
|
||||
|
||||
class PasswordChangeSerializer(serializers.Serializer):
|
||||
|
|
Loading…
Reference in New Issue