From e4d32db4d283a638fd6b29da9f0863ca24096fd3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 21 Sep 2019 09:25:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=85=AC=E5=8F=B8=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/daoru.py | 2 +- safesite/forms.py | 1 - safesite/migrations/0270_auto_20190920_1200.py | 17 +++++++++++++++++ safesite/models.py | 1 - safesite/templates/companyinfo.html | 1 - 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 safesite/migrations/0270_auto_20190920_1200.py diff --git a/safesite/daoru.py b/safesite/daoru.py index 46f8cd94..b0ce039e 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -283,7 +283,7 @@ def drrisks(companyid,path): if users.exists(): obj.zrr = users[0] obj.save() - obj.qrcode = makeqr3('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id)) + obj.qrcode = makeqr_riskact('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id)) obj.save() a = Risk() a.riskact=obj diff --git a/safesite/forms.py b/safesite/forms.py index 2c342ee6..147d9f7c 100644 --- a/safesite/forms.py +++ b/safesite/forms.py @@ -19,6 +19,5 @@ class CompanyInfoForm(forms.Form): legalperson_phone = forms.CharField(max_length=24, label='法人电话', widget=forms.TextInput(attrs={'size': '50'})) liaison = forms.CharField(max_length=24, label='联系人', widget=forms.TextInput(attrs={'size': '50'})) liaison_phone = forms.CharField(max_length=24, label='联系人电话', widget=forms.TextInput(attrs={'size': '50'})) - liaison_fax = forms.CharField(max_length=13, label='联系人传真', widget=forms.TextInput(attrs={'size': '50'})) introduce = forms.CharField(label='公司概况', widget=forms.Textarea) diff --git a/safesite/migrations/0270_auto_20190920_1200.py b/safesite/migrations/0270_auto_20190920_1200.py new file mode 100644 index 00000000..14f34fdb --- /dev/null +++ b/safesite/migrations/0270_auto_20190920_1200.py @@ -0,0 +1,17 @@ +# Generated by Django 2.1.5 on 2019-09-20 12:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0269_auto_20190919_1423'), + ] + + operations = [ + migrations.RemoveField( + model_name='companyinfo', + name='liaison_fax', + ), + ] diff --git a/safesite/models.py b/safesite/models.py index e572a1fc..d7b1815f 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -830,7 +830,6 @@ class CompanyInfo(models.Model): legalperson_phone = models.CharField(max_length=24, null=True, blank=True, verbose_name='法人电话') liaison = models.CharField(max_length=24, verbose_name='联系人') liaison_phone = models.CharField(max_length=24, verbose_name='联系人电话') - liaison_fax = models.CharField(max_length=10, null=True, blank=True, verbose_name='联系人传真') introduce = models.TextField( null=True, blank=True, verbose_name='公司概况') createtime = models.DateTimeField(auto_now_add=True) modifytime = models.DateTimeField(auto_now=True) diff --git a/safesite/templates/companyinfo.html b/safesite/templates/companyinfo.html index 97c3f746..2ea4c098 100644 --- a/safesite/templates/companyinfo.html +++ b/safesite/templates/companyinfo.html @@ -1,4 +1,3 @@ -
公司信息
{% csrf_token %} {{ companyinfo.non_field_errors }} From fcea0213798ee8a22b1599f5ad11ba1dca55b16a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Sep 2019 20:18:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=9A=90=E6=82=A3=E3=80=81=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E5=B8=83=E8=8C=A8=E7=BA=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0271_auto_20190925_1113.py | 18 ++++ .../migrations/0272_auto_20190925_1657.py | 18 ++++ safesite/models.py | 2 + safesite/templates/trouble.html | 4 +- safesite/views.py | 93 +++++++++++++------ 5 files changed, 107 insertions(+), 28 deletions(-) create mode 100644 safesite/migrations/0271_auto_20190925_1113.py create mode 100644 safesite/migrations/0272_auto_20190925_1657.py diff --git a/safesite/migrations/0271_auto_20190925_1113.py b/safesite/migrations/0271_auto_20190925_1113.py new file mode 100644 index 00000000..22b22b28 --- /dev/null +++ b/safesite/migrations/0271_auto_20190925_1113.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.5 on 2019-09-25 11:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0270_auto_20190920_1200'), + ] + + operations = [ + migrations.AlterField( + model_name='trouble', + name='shresult', + field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改'), (5, '评估未通过'), (6, '未采纳')], null=True), + ), + ] diff --git a/safesite/migrations/0272_auto_20190925_1657.py b/safesite/migrations/0272_auto_20190925_1657.py new file mode 100644 index 00000000..070d32ac --- /dev/null +++ b/safesite/migrations/0272_auto_20190925_1657.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.5 on 2019-09-25 16:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0271_auto_20190925_1113'), + ] + + operations = [ + migrations.AddField( + model_name='suggest', + name='accept', + field=models.IntegerField(default=1), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index d7b1815f..524f261f 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -120,6 +120,7 @@ class Trouble(models.Model):#隐患排查 (3, '复查未通过'), (4, '已修改'), (5,'评估未通过'), + (6,'未采纳'), ) deletemark=models.IntegerField(default='1') troubleid = models.AutoField(primary_key=True) @@ -409,6 +410,7 @@ class Suggest(models.Model):#合理化建议 yjwcsj = models.DateTimeField(null=True,blank=True) #预计完成时间 sjwcsj = models.DateTimeField(null=True,blank=True) #实际完成时间 shyj = models.CharField(max_length=1000,null=True,blank=True) #审核意见 + accept = models.IntegerField(default=1) class Suggestflow(models.Model):#建议流程 id = models.AutoField(primary_key=True) diff --git a/safesite/templates/trouble.html b/safesite/templates/trouble.html index 04eedee4..c7cc757c 100644 --- a/safesite/templates/trouble.html +++ b/safesite/templates/trouble.html @@ -116,12 +116,13 @@ { field: 'todouser__userid', hidden: true }, { field: 'sybzt', hidden: true }, { - field: 'shresult', title: '整改结果状态', width: 100, styler: function (value, row, index) { + field: 'shresult', title: '隐患状态', width: 100, styler: function (value, row, index) { switch (value) { case 1: return ''; break; case 2: return 'background-color:red;'; break; case 3: return 'background-color:red;'; break; case 4: return 'background-color:yellow;'; break; + case 6: return 'background-color:yellow;'; break; } }, formatter: function (value, row, index) { switch (value) { @@ -130,6 +131,7 @@ case 3: return '复查未通过'; break; case 4: return '已修改'; break; case 5: return '评估未通过'; break; + case 6: return '未采纳'; break; } } }, diff --git a/safesite/views.py b/safesite/views.py index fd426a0a..60cc281a 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -945,29 +945,55 @@ def accessyh(req): return JsonResponse({"code":1}) elif a.yhzt==1: if yhdata['shresult'] == 'reject': - a.shresult = 5 - a.yhzt = 0 - a.sybzt = 1 - a.todouser = a.fxr - a.pgyj = yhdata['pgyj'] - a.save() - m=TroubleAccess(troubleid=a,clr=a.pgr,yhzt=0,action='请'+a.fxr.name+'重新填报',result=0) - m.save() - postdict={ - 'touser':'oPGqkweX75QtLmgehUN-ipR4hcyc', - 'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0', - "miniprogram":{"appid":"wx5c39b569f01c27db","path":"pages/trouble/accesstrouble?troubleid="+str(a.troubleid)}, - 'data':{ - 'first':{'value':a.yhdj.dickeyname + '被退出需重新上报:'}, - 'keyword1':{'value':a.yhms}, - 'keyword2':{'value':a.fxsj}, - 'keyword3':{'value':a.yhdd}, - 'remark':{'value':'请查看评估意见并修改后上传。'} + if 'accept' in yhdata: + if yhdata['accept'] == 'no': + a.shresult = 6 + a.yhzt = 6 + a.sybzt = 1 + a.todouser = None + a.pgyj = yhdata['pgyj'] + a.save() + m=TroubleAccess(troubleid=a,clr=a.pgr,yhzt=6,action='未采纳',opinion=yhdata['pgyj']) + m.save() + postdict={ + 'touser':'oPGqkweX75QtLmgehUN-ipR4hcyc', + 'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0', + "miniprogram":{"appid":"wx5c39b569f01c27db","path":"pages/trouble/accesstrouble?troubleid="+str(a.troubleid)}, + 'data':{ + 'first':{'value':a.yhdj.dickeyname + '未被采纳:'}, + 'keyword1':{'value':a.yhms}, + 'keyword2':{'value':a.fxsj}, + 'keyword3':{'value':a.yhdd}, + 'remark':{'value':'请查看未采纳原因'} + } + } + postdict['touser']=a.fxr.openid + send_wechatmsg.delay(postdict) + return JsonResponse({"code":1}) + else: + a.shresult = 5 + a.yhzt = 0 + a.sybzt = 1 + a.todouser = a.fxr + a.pgyj = yhdata['pgyj'] + a.save() + m=TroubleAccess(troubleid=a,clr=a.pgr,yhzt=0,action='请'+a.fxr.name+'重新填报',result=0) + m.save() + postdict={ + 'touser':'oPGqkweX75QtLmgehUN-ipR4hcyc', + 'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0', + "miniprogram":{"appid":"wx5c39b569f01c27db","path":"pages/trouble/accesstrouble?troubleid="+str(a.troubleid)}, + 'data':{ + 'first':{'value':a.yhdj.dickeyname + '被退出需重新上报:'}, + 'keyword1':{'value':a.yhms}, + 'keyword2':{'value':a.fxsj}, + 'keyword3':{'value':a.yhdd}, + 'remark':{'value':'请查看评估意见并修改后上传。'} + } } - } - postdict['touser']=a.todouser.openid - send_wechatmsg.delay(postdict) - return JsonResponse({"code":1}) + postdict['touser']=a.todouser.openid + send_wechatmsg.delay(postdict) + return JsonResponse({"code":1}) elif 'zppg' in yhdata and yhdata['zppg']=='yes': a.yhzt=1 a.sybzt=1 @@ -2551,9 +2577,10 @@ def gchandle(req): if 'unsafe' in gcdata: olist = gcdata['unsafe'] for i in olist: - dickey = Dickey.objects.get(dickeyid=i) - m = Unsafes(observe = obj,unsafedickey=dickey,unsafedicclass=dickey.dicparent) - m.save() + if i != 0: + dickey = Dickey.objects.get(dickeyid=i) + m = Unsafes(observe = obj,unsafedickey=dickey,unsafedicclass=dickey.dicparent) + m.save() yjjs_gc.delay(companyid) return JsonResponse({"code":1}) elif a == 'listall': @@ -3692,11 +3719,23 @@ def apitool(req): newpart = req.GET.get('part') username = req.GET.get('username') user = User.objects.get(username=username) + oldpart = user.ubelongpart + oldpart.aqy = oldpart.aqy.replace(','+str(user.userid)+',','') + oldpart.bmzg = oldpart.bmzg.replace(','+str(user.userid)+',','') + oldpart.bsq = oldpart.bsq.replace(','+str(user.userid)+',','') + oldpart.save() part = Partment.objects.get(partid=newpart) - companyid = part.partlink.split(',')[1] + if part.iscompany==1: + usecomp = part + else: + usecomp = Partment.objects.get(partid=part.partlink.split(',')[1]) user.ubelongpart = part - user.usecomp = Partment.objects.get(partid=companyid) + user.usecomp = usecomp user.save() + for i in Group.objects.filter(usecomp=usecomp): + i.users.remove(user) + groupobj = Group.objects.filter(usecomp=usecomp,grouptype=3).first() + groupobj.users.add(user) return JsonResponse({"code":1}) elif a == 'correctionzs': objs = Socertificate.objects.all() From 783a0cb6ce8845d64fb8ccef3feb39a8459be2a9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Sep 2019 17:54:26 +0800 Subject: [PATCH 3/6] xx --- safesite/templates/suggest.html | 14 ++++++++++++++ safesite/views.py | 9 +++++++++ 2 files changed, 23 insertions(+) diff --git a/safesite/templates/suggest.html b/safesite/templates/suggest.html index 74d3a1a3..3b58b915 100644 --- a/safesite/templates/suggest.html +++ b/safesite/templates/suggest.html @@ -94,6 +94,20 @@ { field: 'dqxz', title: '当前现状', width: 200 }, { field: 'jynr', title: '建议内容', width: 400 }, { field: 'jyfk', title: '建议反馈', width: 400 }, + { + field: 'accept', title: '建议状态', width: 80, styler: function (value, row, index) { + switch (value) { + case 1: return 'background-color:green;'; break; + case 0: return 'background-color:yellow;'; break; + + } + }, formatter: function (value, row, index) { + switch (value) { + case 1: return '已采纳'; break; + case 0: return '未采纳'; break; + } + } + }, ]] }); function addjy(){ diff --git a/safesite/views.py b/safesite/views.py index 60cc281a..b8325b6e 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -3593,6 +3593,15 @@ def apisuggest(req): obj.save() Suggestflow.objects.create(suggest=obj,user=User.objects.get(userid=userid),action='转交'+user.name+'评估') return JsonResponse({"code":1}) + elif 'accept' in data: + if data['accept'] == 'no': + obj.jyzt = 4 + obj.todouser = None + obj.jyfk = data['jyfk'] + obj.accept = 0 + obj.save() + Suggestflow.objects.create(suggest=obj,user=User.objects.get(userid=userid),action='未采纳该建议') + return JsonResponse({"code":1}) else: obj.jyzt = 4 obj.todouser = None From 21be18b1a461627091c5bf6ab7499e8001aa35fe Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 8 Oct 2019 21:29:55 +0800 Subject: [PATCH 4/6] zuoye --- .../migrations/0273_auto_20191008_1604.py | 29 +++ safesite/models.py | 6 +- safesite/templates/operationspjdadd.html | 8 +- safesite/templates/suggest.html | 2 +- safesite/templates/zuoyepeizhi.html | 2 +- safesite/views.py | 168 +++++++++++------- 6 files changed, 145 insertions(+), 70 deletions(-) create mode 100644 safesite/migrations/0273_auto_20191008_1604.py diff --git a/safesite/migrations/0273_auto_20191008_1604.py b/safesite/migrations/0273_auto_20191008_1604.py new file mode 100644 index 00000000..459197f0 --- /dev/null +++ b/safesite/migrations/0273_auto_20191008_1604.py @@ -0,0 +1,29 @@ +# Generated by Django 2.1.5 on 2019-10-08 16:04 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0272_auto_20190925_1657'), + ] + + operations = [ + # migrations.AddField( + # model_name='area', + # name='qrcode', + # field=models.CharField(blank=True, max_length=200, null=True), + # ), + migrations.AddField( + model_name='operation', + name='todousers', + field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None), + ), + migrations.AddField( + model_name='operationspjd', + name='sprs', + field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 524f261f..29504ac0 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1,7 +1,7 @@ from django.db import models import uuid import django.utils.timezone as timezone -from django.contrib.postgres.fields import JSONField +from django.contrib.postgres.fields import JSONField,ArrayField import jwt import datetime # Create your models here. @@ -466,6 +466,7 @@ class Operation(models.Model):#作业表 zyzt = JSONField() fxcs = models.CharField(max_length=200) todouser = models.ForeignKey(User,related_name='zyclr',on_delete=models.CASCADE,null=True,blank=True) + todousers = ArrayField(models.IntegerField(), blank=True,null=True) usecomp = models.ForeignKey(Partment,on_delete=models.CASCADE,null=True,blank=True,default=1) class Fxcs(models.Model):#作业分析措施 @@ -508,12 +509,13 @@ class Operzyry(models.Model):#作业确认人 modifytime = models.DateTimeField(auto_now = True) submittime = models.DateTimeField(default = timezone.now) -class Operationspjd(models.Model):#作业审批节点 +class Operationspjd(models.Model):#作业审批节点配置 id = models.AutoField(primary_key=True) zylx = models.ForeignKey(Dickey, on_delete=models.CASCADE,null=True,blank=True) jdmc = models.CharField(max_length=100) spbm = models.ForeignKey(Partment,related_name='spbm',on_delete=models.CASCADE,null=True,blank=True)#审批部门 spr = models.ForeignKey(User,related_name='spr',on_delete=models.CASCADE,null=True,blank=True)#审批部门 + sprs = ArrayField(models.IntegerField(), blank=True,null=True) submittime = models.DateTimeField(u'创建时间',default = timezone.now) modifytime = models.DateTimeField(auto_now = True) usecomp = models.ForeignKey(Partment,on_delete=models.CASCADE,null=True,blank=True) diff --git a/safesite/templates/operationspjdadd.html b/safesite/templates/operationspjdadd.html index fde8ca25..d7f20fd9 100644 --- a/safesite/templates/operationspjdadd.html +++ b/safesite/templates/operationspjdadd.html @@ -13,7 +13,7 @@ required=true />
-
@@ -22,9 +22,13 @@