From 07eae98390b2a28a270b265000ecaa59834bfed6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 5 Dec 2019 21:06:12 +0800 Subject: [PATCH] operation spxq --- .gitignore | 1 + requirements.txt | Bin 887 -> 1886 bytes .../migrations/0295_auto_20191205_1702.py | 18 ++++++++++++++++++ safesite/models.py | 1 + safesite/views.py | 6 +++--- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 safesite/migrations/0295_auto_20191205_1702.py 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 179001eac7d590dae567f9e5c7ff887208a66994..51627d4c24c8dc9efab4f29882cb2bafc4633dab 100644 GIT binary patch literal 1886 zcmZuy+iu!W5ZvcV{S-&BA(uY%txu6EMQWw=)qq3H#RhB=l8}_Ut z_xR86(zdp@oqfeq*p=Pj6!zIZ+01I&;Hj;&gDu=+0_!bKj&q&7TI;Pn$4~9cKemZm z8IvQ5fA210=ZHU8HS%Je@S4N2!8zEwdrV=YUG-@_06}ffIAU>)Sfb#`@sQ2jUJ{QA z-t<$BE1M>Jiz>uHMN0P|R#sDnZ??kkjV(uPso1^8FGkkPv(U4GZv3yZ4jQ+J?(m(} znVZpKaT(o#$rk=(odJ1??|otrvFuZxI<@e;JLuDcC9BX&db3+mqeYIRYqbH6$dr$I zzCiTcPViy%@L-OKv!r$z>|0o=HxWiHb(UIJ_KMTMmv*TwzCukOYC|>1lo{9!YAviw z*Nh&Q8Pts%$5KPvCUt7)gOp<*S-r*-XQ)6FCHzbO3|>WIwSt8zi!pT@y1qh=3R#AU zm|(8R-~pD#yIwd0V$gg`tCiPf-&ys=eW(JbQZu)L+Ovc*Fy$i^*068kar9VXVkd6B z`X+UOakLDGzoXv4)`;5K4}5OZ-l@nutK~2>XLQ+0QdeqSIcF_a;j-Ql0l?oGY*ndq#h44E@;MdmPi+U7PX&+YS#cRF1tA%fE6*384T0 literal 887 zcmX|A%Z}q95WMp*M#dy|a^SY7kwzM6SDL+IOcD|d1jtM>U%%BP+MD}9S9eueuh*p1 zz_)y0v-95RyeK94$OZ4&9BZWNX8#JLQi6+~i>cL2%(i7DWsLPUKa|>ViFRXibq9y% zz1Z_T7lN4+rrS#Md%j^N`k3{ql|sY?`*qgg*zg8Ev86>_M$Rr>wk5?-fY$Q?(_hu% z*5qwxbgCFm#Vr>DTS7^XdWxYfH&TBzx9WVM7D2}%aj(f!JaWlw?e42TIN$C;53^r3 zR8QLi5mVXG2Efts8w@;VYs0II<+sc&0SgR#$FNh()w{V{ZPkmeZLvYJ^I|j*MZ5Ow z?A!`+&)!@(>w#W_TlB5CR@W0j??Kc#&Y0F#C+JID=Nr*H@{xJ0P2WV|yUv$e`mGO7 zQIJ_9FX=8(5I+115>z zN{x6bSSk+_)3L3-!{d*~+vgt|HBqri(18F;+&6M);42LQ=%gLAM(XEf6v?jH#03|? zf-Kv`0b9aR@K3han=KWIfe++@A}jn+4mLNH@SqrXakcYSXNV8w1a?O9d7y;w#Q_$# zl1Izse>p4b1lRxo 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