diff --git a/.gitignore b/.gitignore index 69eb586d..1bb3dbf6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ aspnet_client/ static/ mysite/settings.py safesite/token.txt +web.config # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/requirements.txt b/requirements.txt index 179001ea..51627d4c 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/safesite/migrations/0295_auto_20191205_1702.py b/safesite/migrations/0295_auto_20191205_1702.py new file mode 100644 index 00000000..cc0ac1da --- /dev/null +++ b/safesite/migrations/0295_auto_20191205_1702.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.8 on 2019-12-05 17:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0294_auto_20191125_1414'), + ] + + operations = [ + migrations.AddField( + model_name='operation', + name='issimple', + field=models.IntegerField(default=1), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index d90f696c..5c2fa554 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -471,6 +471,7 @@ class Operation(models.Model):#作业表 zyimg = models.CharField(max_length=1000,default='') zyimg2 = models.CharField(max_length=1000,default='') deletemark = models.IntegerField(default='1') + issimple = models.IntegerField(default=1) zyzt = JSONField() fxcs = models.CharField(max_length=200) todouser = models.ForeignKey(User,related_name='zyclr',on_delete=models.CASCADE,null=True,blank=True) diff --git a/safesite/views.py b/safesite/views.py index f1d8ff77..07138ecd 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4628,16 +4628,16 @@ def apioperation(req): nextindex = obj.zyzt['index']+1 spruser = User.objects.get(userid=userid) if oldindex == 0: - Operspxq.objects.create(oper=obj,jdmc=obj.zyzt['splc'][0]['jdmc'],spr=spruser,checked=1,spbm=spruser.ubelongpart) spr1 = data['spr1'] if 'spr1' in data else None spr2 = data['spr2'] if 'spr2' in data else None if spr1: obj.zyzt['splc'][1]['sprs'] = [spr1] #作业部门审批人 if spr2: obj.zyzt['splc'][2]['sprs'] = [spr2] #属地部门审批人 + Operspxq.objects.create(oper=obj,jdmc=obj.zyzt['splc'][oldindex]['jdmc'],spr=spruser,checked=1,spbm=spruser.ubelongpart)#审批该步 while nextindex