From 69162eba3afa6c1f83c722ac8206e22c26e088bf Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 23 Apr 2021 17:11:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/inspectrecord/recorddetail.vue | 4 +-- client_mp/pages/inspectrecord/recorddo.vue | 4 +-- client_mp/pages/subtask/subtaskdetail.vue | 8 ++--- .../migrations/0012_inspecttemplate.py | 32 +++++++++++++++++++ server/apps/quality/models.py | 12 +++---- server/apps/quality/serializers.py | 4 +++ server/apps/quality/views.py | 2 +- 7 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 server/apps/quality/migrations/0012_inspecttemplate.py diff --git a/client_mp/pages/inspectrecord/recorddetail.vue b/client_mp/pages/inspectrecord/recorddetail.vue index b3f23e2..d86363c 100644 --- a/client_mp/pages/inspectrecord/recorddetail.vue +++ b/client_mp/pages/inspectrecord/recorddetail.vue @@ -2,11 +2,11 @@ - + 类别:{{form.item_.type}} {{form.item_.sortnum}}.{{form.item_.name}} - + {{form.item_.require}} diff --git a/client_mp/pages/inspectrecord/recorddo.vue b/client_mp/pages/inspectrecord/recorddo.vue index 49307f4..040d289 100644 --- a/client_mp/pages/inspectrecord/recorddo.vue +++ b/client_mp/pages/inspectrecord/recorddo.vue @@ -2,11 +2,11 @@ - + 类别:{{form.item_.type}} {{form.item_.sortnum}}.{{form.item_.name}} - + {{form.item_.require}} diff --git a/client_mp/pages/subtask/subtaskdetail.vue b/client_mp/pages/subtask/subtaskdetail.vue index 96dab48..858ca67 100644 --- a/client_mp/pages/subtask/subtaskdetail.vue +++ b/client_mp/pages/subtask/subtaskdetail.vue @@ -9,18 +9,18 @@ 所属任务: - {{subtask.inspecttask_.name}} + {{subtask.inspecttask_.name}} 检查期限: - {{subtask.inspecttask_.start_date}} 至 - {{subtask.inspecttask_.end_date}} + {{subtask.inspecttask_.start_date}} 至 + {{subtask.inspecttask_.end_date}} 涉及单位: {{subtask.depts_count}}家 巡查组: - {{subtask.members.length}}人 + {{subtask.members.length}}人 diff --git a/server/apps/quality/migrations/0012_inspecttemplate.py b/server/apps/quality/migrations/0012_inspecttemplate.py new file mode 100644 index 0000000..6e39190 --- /dev/null +++ b/server/apps/quality/migrations/0012_inspecttemplate.py @@ -0,0 +1,32 @@ +# Generated by Django 3.0.5 on 2021-04-23 09:10 + +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 = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('quality', '0011_auto_20210422_1328'), + ] + + operations = [ + migrations.CreateModel( + name='InspectTemplate', + fields=[ + ('id', models.AutoField(auto_created=True, 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=200, verbose_name='模板名称')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspecttemplate_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspecttemplate_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/server/apps/quality/models.py b/server/apps/quality/models.py index 4cc2c9b..5dbfc89 100644 --- a/server/apps/quality/models.py +++ b/server/apps/quality/models.py @@ -2,11 +2,11 @@ from django.db import models from utils.model import BaseModel from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File # Create your models here. -# class InspectTemplate(CommonAModel): -# """ -# 检查模板 -# """ -# name = models.CharField('模板名称', max_length=200) +class InspectTemplate(CommonAModel): + """ + 检查模板 + """ + name = models.CharField('模板名称', max_length=200) class InspectItem(CommonAModel): """ @@ -21,7 +21,7 @@ class InspectItem(CommonAModel): type = models.CharField('类型', max_length=50, choices=type_choices, default='合规') require = models.TextField('取证要求', null=True, blank=True) sortnum = models.IntegerField('序号', default=1) - # template = + # template = models.ForeignKey(InspectTemplate, on_delete=models.CASCADE, verbose_name='所属模板') class Meta: verbose_name = '检查清单' verbose_name_plural = verbose_name diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py index cec91f5..6fa388b 100644 --- a/server/apps/quality/serializers.py +++ b/server/apps/quality/serializers.py @@ -127,3 +127,7 @@ class InspectRecordCheckSerializer(serializers.ModelSerializer): raise ParseError('未填写检查结果') return result + class InspectTemplateSerializer(serializers.ModelSerializer): + class Meta: + model = InspectTemplate + fields = '__all__' diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index 42b1f96..3648b8f 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -184,7 +184,7 @@ class InspectDeptViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): obj.state = '已提交' obj.save() # 更新主任务和子任务状态 - if not InspectDept.objects.filter(subtask=obj.subtask).exlude(state='已提交').exists(): + if not InspectDept.objects.filter(subtask=obj.subtask).exclude(state='已提交').exists(): obj.subtask.state = '已完成' obj.subtask.save() if not SubInspectTask.objects.filter(inspecttask=obj.subtask.inspecttask).exclude(state='已完成').exists(): From b5cbd62ceb877f44efbba04a63b2b5870ae5d1fd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 25 Apr 2021 13:39:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=A1=A8=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client_mp/common/http.interceptor.js | 2 +- client_mp/pages/home/home.vue | 8 ++++--- client_mp/pages/inspectrecord/index.vue | 2 +- client_mp/pages/inspectrecord/recorddo.vue | 4 ++++ client_mp/pages/login/login.vue | 20 +++++++++++++--- client_mp/pages/login/login_password.vue | 7 ++++-- client_mp/pages/subtask/subtaskdetail.vue | 4 ++-- .../migrations/0013_inspectitem_template.py | 20 ++++++++++++++++ server/apps/quality/models.py | 2 +- server/apps/quality/serializers.py | 8 +++---- server/apps/quality/views.py | 24 +++++++++++++++---- 11 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 server/apps/quality/migrations/0013_inspectitem_template.py diff --git a/client_mp/common/http.interceptor.js b/client_mp/common/http.interceptor.js index f9ef57a..354eeb2 100644 --- a/client_mp/common/http.interceptor.js +++ b/client_mp/common/http.interceptor.js @@ -11,7 +11,7 @@ const install = (Vue, vm) => { // header: { // 'content-type': 'xxx' // } - showLoading: false, + showLoading: true, loadingText: '请求中..', originalData: true, loadingTime: 800, diff --git a/client_mp/pages/home/home.vue b/client_mp/pages/home/home.vue index b03ef4c..5484f29 100644 --- a/client_mp/pages/home/home.vue +++ b/client_mp/pages/home/home.vue @@ -1,7 +1,8 @@