diff --git a/safesite/migrations/0296_auto_20191209_1029.py b/safesite/migrations/0296_auto_20191209_1029.py new file mode 100644 index 00000000..885556ee --- /dev/null +++ b/safesite/migrations/0296_auto_20191209_1029.py @@ -0,0 +1,69 @@ +# Generated by Django 2.2.7 on 2019-12-09 10:29 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0295_auto_20191205_1702'), + ] + + operations = [ + migrations.CreateModel( + name='Operproce', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.CharField(max_length=50)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('reads', models.IntegerField(default='0')), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optbm', to='safesite.Partment')), + ('homeworktype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ('jobs', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optgs', to='safesite.Partment')), + ], + ), + #migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + #), + migrations.CreateModel( + name='Resbility', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.CharField(max_length=50)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('reads', models.IntegerField(default='0')), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbbm', to='safesite.Partment')), + ('homeworktype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ('jobs', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbgs', to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='ReaderOperproce', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('num', models.CharField(max_length=50)), + ('readertime', models.DateTimeField(default=django.utils.timezone.now)), + ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operproce')), + ], + ), + migrations.CreateModel( + name='Readerblility', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('num', models.CharField(max_length=50)), + ('readertime', models.DateTimeField(default=django.utils.timezone.now)), + ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Resbility')), + ], + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 5c2fa554..313d9f90 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -892,3 +892,42 @@ class Mgtsystem(models.Model): publisdate = models.DateTimeField(default = timezone.now) createuser = models.ForeignKey(User,on_delete=models.CASCADE) deletemark = models.IntegerField(default=1) + + + +#责任制表 +class Resbility(models.Model): + id = models.AutoField(primary_key=True)#主键 + title = models.CharField(max_length=50)#标题 + jobs = models.ForeignKey(Group,on_delete=models.CASCADE,null=True,blank=True)#岗位 + homeworktype=models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True)#作业许可类型 + department = models.ForeignKey(Partment,related_name='resbbm',on_delete=models.CASCADE,null=True,blank=True)#部门 + createuser = models.ForeignKey(User,on_delete=models.CASCADE)#上传者 + createdate = models.DateTimeField(default = timezone.now)#上传时间 + usecomp = models.ForeignKey(Partment,related_name='resbgs',on_delete=models.CASCADE,null=True,blank=True)#所属公司 + deletemark = models.IntegerField(default=1)#是否删除 + reads = models.IntegerField(default='0') +#操作规程 +class Operproce(models.Model): + id = models.AutoField(primary_key=True)#主键 + title = models.CharField(max_length=50)#标题 + jobs = models.ForeignKey(Group,on_delete=models.CASCADE,null=True,blank=True)#岗位 + homeworktype=models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True)#作业许可类型 + department = models.ForeignKey(Partment,related_name='optbm',on_delete=models.CASCADE,null=True,blank=True)#部门 + createuser = models.ForeignKey(User,on_delete=models.CASCADE)#上传者 + createdate = models.DateTimeField(default = timezone.now)#上传时间 + usecomp = models.ForeignKey(Partment,related_name='optgs',on_delete=models.CASCADE,null=True,blank=True)#所属公司 + deletemark = models.IntegerField(default=1)#是否删除 + reads = models.IntegerField(default='0') +#责任阅读表 +class Readerblility(models.Model): + readid = models.ForeignKey(Resbility, on_delete=models.CASCADE)#主键 + num = models.CharField(max_length=50) + readeruser = models.ForeignKey(User,on_delete=models.CASCADE) + readertime = models.DateTimeField(default = timezone.now) +#操作规程阅读表 +class ReaderOperproce(models.Model): + readid = models.ForeignKey(Operproce, on_delete=models.CASCADE)#主键 + num = models.CharField(max_length=50) + readeruser = models.ForeignKey(User,on_delete=models.CASCADE) + readertime = models.DateTimeField(default = timezone.now) diff --git a/safesite/static/safesite/easyui/themes/icon.css b/safesite/static/safesite/easyui/themes/icon.css index b3d93cc6..33786e43 100644 --- a/safesite/static/safesite/easyui/themes/icon.css +++ b/safesite/static/safesite/easyui/themes/icon.css @@ -169,7 +169,12 @@ .icon-bhr { background: url('icons/behv.png') no-repeat center center; } - +.icon-caozuo { + background: url('icons/caozuo.png') no-repeat center center; +} +.icon-zeren { + background: url('icons/zeren.png') no-repeat center center; +}