zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://e.coding.net/ctcdevteam/safesite

This commit is contained in:
caoqianming 2021-12-20 22:48:58 +08:00
parent 33b8f17e99 92583ef37f
commit cb84db6d26
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
safesite/views.py
View File

@ -5605,12 +5605,12 @@ def apioperation(req):
obj.zynr = data['zynr']
obj.kssj = data['kssj']
obj.jssj = data['jssj']
if 'zyqy' in data:
if data.get('zyqy', None):
obj.zyqy = Area.objects.get(
id=data['zyqy']) if data['zyqy'] else None
id=data['zyqy'])
obj.zylx = Dickey.objects.get(dickeyid=data['zylx'])
obj.zybm = oneuser.ubelongpart
if 'zybm' in data:
if data.get('zybm', None):
obj.zybm = Partment.objects.get(partid=data['zybm'])
obj.sdbm = Partment.objects.get(partid=data['sdbm'])
obj.zyfzr = oneuser
@ -5621,6 +5621,7 @@ def apioperation(req):
if data['splc']==0:#无审批
obj.zyzt = {'zyzt':'待关闭','index':0,'splc':0}
obj.save()
Operzyry.objects.filter(oper=obj).delete()
for i in data['zyry']:
Operzyry.objects.create(oper=obj, operzyry=User.objects.get(userid=i), checked=1)
return JsonResponse({"code": 1})
@ -5646,6 +5647,7 @@ def apioperation(req):
obj.save()
# Operspxq.objects.create(oper=obj,jdmc='作业负责人审批',spr=obj.zyfzr,checked=1,spbm=obj.zyfzr.ubelongpart)
b = [] # 发送通知
Operzyry.objects.filter(oper=obj).delete()
for i in data['zyry']:
x = User.objects.get(userid=i)
if int(userid) == int(i): # 申请人包含作业人直接确认
@ -5790,7 +5792,7 @@ def apioperation(req):
zyid = req.GET.get('zyid')
a = Operation.objects.filter(zyid=zyid)
x = a.values('zyid', 'zydd', 'zylx__dickeyname', 'zynum', 'zyfzr__name', 'zynr', 'zyzt', 'zyimg', 'zylx', 'sdbm',
'submittime', 'zybm__partname', 'sdbm__partname', 'kssj', 'jssj', 'fxcs', 'zyimg2','zyqy__name')[0]
'submittime', 'zybm__partname', 'sdbm__partname', 'kssj', 'jssj', 'fxcs', 'zyimg2','zyqy__name', 'zyqy')[0]
if x['zyimg'] != '':
x['zyimg'] = x['zyimg'].split('?')
else: