From d9ba995bcc8d971cd02f6496711997a92f9b60c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 21 Jun 2022 09:53:02 +0800
Subject: [PATCH] =?UTF-8?q?dict=20code=20=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/opm/views.py                              |  6 +++---
 .../migrations/0002_alter_dictionary_value.py  | 18 ++++++++++++++++++
 apps/system/models.py                          |  2 +-
 apps/system/serializers.py                     |  4 ++--
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 apps/system/migrations/0002_alter_dictionary_value.py

diff --git a/apps/opm/views.py b/apps/opm/views.py
index 3b39e9b0..bc7ae755 100644
--- a/apps/opm/views.py
+++ b/apps/opm/views.py
@@ -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):
diff --git a/apps/system/migrations/0002_alter_dictionary_value.py b/apps/system/migrations/0002_alter_dictionary_value.py
new file mode 100644
index 00000000..77db4c6c
--- /dev/null
+++ b/apps/system/migrations/0002_alter_dictionary_value.py
@@ -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='值'),
+        ),
+    ]
diff --git a/apps/system/models.py b/apps/system/models.py
index 6160f89b..baf2aca4 100755
--- a/apps/system/models.py
+++ b/apps/system/models.py
@@ -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(
diff --git a/apps/system/serializers.py b/apps/system/serializers.py
index c9bb16c1..589ef4f0 100755
--- a/apps/system/serializers.py
+++ b/apps/system/serializers.py
@@ -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):