diff --git a/safesite/mgt/views.py b/safesite/mgt/views.py index e80a9a7e..321a1ea2 100644 --- a/safesite/mgt/views.py +++ b/safesite/mgt/views.py @@ -63,18 +63,19 @@ def api(req): userid = req.session['userid'] companyid = getcompany(userid) if a == 'add': - obj = Mgtsystem() - data = json.loads(req.body.decode('utf-8')) - obj.mgtname = data['mgtname'] - obj.mgtpath = data['filepath'] - obj.type= Dickey.objects.get(dickeyid=data['type']) - obj.publisdate=data['publisdate'] - obj.usecomp=Partment.objects.get(partid=companyid) - obj.createuser=User.objects.get(userid=userid) - obj.qrcode = makeqr_( - 'https://safeyun.ctcshe.com/miniprogram/mgt?id='+str(obj.id)) - obj.save() - return JsonResponse({"code":1}) + obj = Mgtsystem() + data = json.loads(req.body.decode('utf-8')) + obj.mgtname = data['mgtname'] + obj.mgtpath = data['filepath'] + obj.type= Dickey.objects.get(dickeyid=data['type']) + obj.publisdate=data['publisdate'] + obj.usecomp=Partment.objects.get(partid=companyid) + obj.createuser=User.objects.get(userid=userid) + obj.save() + obj.qrcode = makeqr_( + 'https://safeyun.ctcshe.com/miniprogram/mgt?id='+str(obj.id)) + obj.save() + return JsonResponse({"code":1}) elif a=='listall': startnum,endnum=fenye(req) diff --git a/safesite/views.py b/safesite/views.py index 8f2ee031..3676c79e 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -34,7 +34,7 @@ from groups import models as g_models from . import forms from .daoru import (cal_area_risk_level, cal_riskact_level, drequipments, - drquestions, drrisks, drtodotroubles, drusers, makeqr, drsafelist, + drquestions, drrisks, drtodotroubles, drusers, makeqr, drsafelist, makeqr_, makeqr_area, makeqr_examtest, makeqr_riskact, makeqr_train, makeqr_safelist) from .export import (exportdoc, exportdoc2, exportsimplexlsx, exportxlsx, exportyjdoc) @@ -8717,6 +8717,9 @@ def getresbilitydata(req): if 'jobpart' in data and data['jobpart']: obj.department=Partment.objects.get(partid=data['jobpart']) + obj.save() + obj.qrcode = makeqr_( + 'https://safeyun.ctcshe.com/miniprogram/resbility?id='+str(obj.id)) obj.save() return JsonResponse({"code":1}) elif a=='listall':#责任列表 @@ -8794,25 +8797,27 @@ def getprodata(req): f.write(req.FILES['mf'].read()) return JsonResponse({"code":1,"filename":file_name,"filepath":filepath}) elif a=='add':#新增责任制 - obj = Operproce() - data = json.loads(req.body.decode('utf-8')) - obj.title = data['title'] - if 'group' in data and data['group']: - obj.jobs =Group.objects.get(groupid= data['group']) - if 'type' in data and data['type']: - obj.homeworktype= Dickey.objects.get(dickeyid=data['type']) - if 'jobpart' in data and data['jobpart']: - obj.department=Partment.objects.get(partid=data['jobpart']) - if data['filepath']: - obj.operprocepath=data['filepath'] - obj.createuser=User.objects.get(userid=userid) - if 'publisdate' in data and data['publisdate']: - obj.createdate=data['publisdate'] - obj.usecomp=Partment.objects.get(partid=companyid) - if data['filepath']: - obj.filepath=data['filepath'] - obj.save() - return JsonResponse({"code":1}) + obj = Operproce() + data = json.loads(req.body.decode('utf-8')) + obj.title = data['title'] + if 'group' in data and data['group']: + obj.jobs =Group.objects.get(groupid= data['group']) + if 'type' in data and data['type']: + obj.homeworktype= Dickey.objects.get(dickeyid=data['type']) + if 'jobpart' in data and data['jobpart']: + obj.department=Partment.objects.get(partid=data['jobpart']) + if data['filepath']: + obj.operprocepath=data['filepath'] + obj.createuser=User.objects.get(userid=userid) + if 'publisdate' in data and data['publisdate']: + obj.createdate=data['publisdate'] + obj.usecomp=Partment.objects.get(partid=companyid) + if data['filepath']: + obj.filepath=data['filepath'] + obj.save() + obj.qrcode = makeqr_( + 'https://safeyun.ctcshe.com/miniprogram/proce?id='+str(obj.id)) + return JsonResponse({"code":1}) elif a=='listall':#责任列表 startnum,endnum=fenye(req) #groups = Group.objects.filter(users__userid=userid)