diff --git a/safesite/export.py b/safesite/export.py index 0851038f..078dc144 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -80,7 +80,7 @@ def exportdoc(a,id): elif a=='px': trainid = id a = Train.objects.filter(trainid=trainid) - x = a.values('trainid','trainnum','state','trainplace','starttime','trainname','traintype__dickeyname','teacher','submituser__name','submittime','trainlevel__dicname','traincontent__dickeyname','manlevel__dickeyname','detailcontent','participantnum','knownum','duration','material')[0] + x = a.values('trainid','trainnum','state','trainplace','starttime','trainname','traintype__dickeyname','teacher','submituser__name','submittime','trainlevel__dicname','traincontent__dickeyname','manlevel__dickeyname','detailcontent','participantnum','knownum','duration','material','pxxg','examtest__num','examtest__name')[0] for key in x: if x[key] == None: x[key] = '' diff --git a/safesite/exportemp/px.docx b/safesite/exportemp/px.docx index 5f3ec918..db36d13f 100644 Binary files a/safesite/exportemp/px.docx and b/safesite/exportemp/px.docx differ diff --git a/safesite/exportemp/~$px.docx b/safesite/exportemp/~$px.docx new file mode 100644 index 00000000..fcd42e3f Binary files /dev/null and b/safesite/exportemp/~$px.docx differ diff --git a/safesite/migrations/0265_auto_20190917_1716.py b/safesite/migrations/0265_auto_20190917_1716.py new file mode 100644 index 00000000..77d2e743 --- /dev/null +++ b/safesite/migrations/0265_auto_20190917_1716.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1.5 on 2019-09-17 17:16 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0264_auto_20190909_0916'), + ] + + operations = [ + migrations.AddField( + model_name='train', + name='examtest', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest'), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 5afec4ce..0510a3b6 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -42,6 +42,7 @@ class Area(models.Model): deletemark = models.IntegerField(default='1') usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE) risklevel = models.CharField(max_length=50,null=True,blank=True)#风险等级 + qrcode = models.CharField(max_length=200,blank=True,null=True)#区域二维码 class User(models.Model): userid = models.AutoField(primary_key=True) @@ -628,6 +629,7 @@ class Train(models.Model):#培训表 pxxg = models.CharField(max_length=1000,null=True,blank=True) material = models.CharField(max_length=1000,null=True,blank=True) checkqr = models.CharField(max_length=200,blank=True,null=True) + examtest = models.ForeignKey(ExamTest,on_delete=models.CASCADE,null=True,blank=True) class Trainuser(models.Model):#培训人员记录 train = models.ForeignKey(Train, on_delete=models.CASCADE) diff --git a/safesite/templates/abtrain.html b/safesite/templates/abtrain.html index b9ce2c11..27c68d1f 100644 --- a/safesite/templates/abtrain.html +++ b/safesite/templates/abtrain.html @@ -67,7 +67,7 @@