增加模板表

client_mp/pages/inspectrecord/recorddetail.vue

@@ -2,11 +2,11 @@
 	<view style="padding-left: 24rpx;padding-right: 24rpx;padding-bottom: 16rpx;">
 		<u-form :model="form" label-position="top" :label-style="labelStyle" ref="uForm" :rules="rules"
 			:errorType="errorType">
-			<u-form-item label="检查事项">
+			<u-form-item label="检查事项" v-if="form.item_">
 				<view >类别:<span style="color:darkblue;font-weight: bold;">{{form.item_.type}}</span></view>
 				<view>{{form.item_.sortnum}}.{{form.item_.name}}</view>
 			</u-form-item>
-			<u-form-item label="取证要求">
+			<u-form-item label="取证要求" v-if="form.item_">
 				<span>{{form.item_.require}}</span>
 			</u-form-item>
 			<u-form-item label="检查结果" prop="result">

client_mp/pages/inspectrecord/recorddo.vue

@@ -2,11 +2,11 @@
 	<view style="padding-left: 24rpx;padding-right: 24rpx;padding-bottom: 16rpx;">
 		<u-form :model="form" label-position="top" :label-style="labelStyle" ref="uForm" :rules="rules"
 			:errorType="errorType">
-			<u-form-item label="检查事项">
+			<u-form-item label="检查事项" v-if="form.item_">
 				<view >类别:<span style="color:darkblue;font-weight: bold;">{{form.item_.type}}</span></view>
 				<view>{{form.item_.sortnum}}.{{form.item_.name}}</view>
 			</u-form-item>
-			<u-form-item label="取证要求">
+			<u-form-item label="取证要求" v-if="form.item_">
 				<span>{{form.item_.require}}</span>
 			</u-form-item>
 			<u-form-item label="检查结果" prop="result">

client_mp/pages/subtask/subtaskdetail.vue

@@ -9,18 +9,18 @@
 				</view>
 				<view class="u-body-item">
 					所属任务:
-					<span>{{subtask.inspecttask_.name}}</span>
+					<span v-if="subtask.inspecttask_">{{subtask.inspecttask_.name}}</span>
 				</view>
 				<view class="u-body-item">
 					检查期限:
-					<span>{{subtask.inspecttask_.start_date}} </span>至
+					<span v-if="subtask.inspecttask_">{{subtask.inspecttask_.start_date}} </span>至
-					<span> {{subtask.inspecttask_.end_date}}</span>
+					<span v-if="subtask.inspecttask_"> {{subtask.inspecttask_.end_date}}</span>
 				</view>
 				<view class="u-body-item">
 					涉及单位:
 					<span style="color:blue;">{{subtask.depts_count}}</span>家
 					巡查组:
-					<span style="color:blue;">{{subtask.members.length}}</span>人
+					<span style="color:blue;" v-if="subtask.members">{{subtask.members.length}}</span>人
 				</view>
 				<view style="margin-top: 6rpx;">
 					<u-gap height="1" bg-color="#bbb"></u-gap>

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,
+            },
+        ),
+    ]

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):
+class InspectTemplate(CommonAModel):
-#     """
+    """
-#     检查模板
+    检查模板
-#     """
+    """
-#     name = models.CharField('模板名称', max_length=200)
+    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

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__'

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():