修改部分bug
This commit is contained in:
parent
f7c7dd7f11
commit
b25101bf92
|
@ -22,6 +22,7 @@ from django.core.serializers.json import DjangoJSONEncoder
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
import operator
|
import operator
|
||||||
import jwt
|
import jwt
|
||||||
|
|
||||||
def area(req):
|
def area(req):
|
||||||
userid = req.session['userid']
|
userid = req.session['userid']
|
||||||
companyid = getcompany(userid)
|
companyid = getcompany(userid)
|
||||||
|
|
|
@ -164,7 +164,7 @@ def upfile(req):
|
||||||
|
|
||||||
# html页面
|
# html页面
|
||||||
|
|
||||||
def miniprogram(req):
|
def miniprogram(req, module):
|
||||||
return HttpResponse('请您使用微信扫码打开')
|
return HttpResponse('请您使用微信扫码打开')
|
||||||
|
|
||||||
def safelist(req):
|
def safelist(req):
|
||||||
|
@ -2943,7 +2943,7 @@ def parthandle(req):
|
||||||
if Partment.objects.filter(partlink__contains=','+a+',').exists() or User.objects.filter(ubelongpart=a).exists():
|
if Partment.objects.filter(partlink__contains=','+a+',').exists() or User.objects.filter(ubelongpart=a).exists():
|
||||||
return JsonResponse({"code": 0})
|
return JsonResponse({"code": 0})
|
||||||
else:
|
else:
|
||||||
Partment.objects.get(partid=a).delete()
|
Partment.objects.filter(partid=a).delete()
|
||||||
return JsonResponse({"code": 1})
|
return JsonResponse({"code": 1})
|
||||||
elif req.GET.get('a') == 'addpart':
|
elif req.GET.get('a') == 'addpart':
|
||||||
if req.POST.get('partid') != '':
|
if req.POST.get('partid') != '':
|
||||||
|
@ -3305,7 +3305,9 @@ def pxhandle(req):
|
||||||
# 对many字段单独处理
|
# 对many字段单独处理
|
||||||
str1 = []
|
str1 = []
|
||||||
for i in a.values('trainpart__partname'):
|
for i in a.values('trainpart__partname'):
|
||||||
|
if i:
|
||||||
str1.append(i['trainpart__partname'])
|
str1.append(i['trainpart__partname'])
|
||||||
|
|
||||||
x['trainpart'] = ','.join(str1) if str1 else ''
|
x['trainpart'] = ','.join(str1) if str1 else ''
|
||||||
str2 = []
|
str2 = []
|
||||||
objs = Trainuser.objects.filter(train=a[0])
|
objs = Trainuser.objects.filter(train=a[0])
|
||||||
|
@ -3525,8 +3527,13 @@ def gchandle(req):
|
||||||
obj.safecontent = gcdata['safecontent']
|
obj.safecontent = gcdata['safecontent']
|
||||||
obj.looknum = 'GC'+time.strftime('%Y%m%d%H%M%S')
|
obj.looknum = 'GC'+time.strftime('%Y%m%d%H%M%S')
|
||||||
obj.usecomp = Partment.objects.get(partid=companyid)
|
obj.usecomp = Partment.objects.get(partid=companyid)
|
||||||
|
gc_l = []
|
||||||
if 'lookimg' in gcdata:
|
if 'lookimg' in gcdata:
|
||||||
obj.lookimg = '?'.join(gcdata['lookimg'])
|
for i in gcdata['lookimg']:
|
||||||
|
if i:
|
||||||
|
gc_l.append(i)
|
||||||
|
if gc_l:
|
||||||
|
obj.lookimg = '?'.join(gc_l)
|
||||||
obj.save()
|
obj.save()
|
||||||
if 'lookers' in gcdata:
|
if 'lookers' in gcdata:
|
||||||
ulist = gcdata['lookers'].split(',')
|
ulist = gcdata['lookers'].split(',')
|
||||||
|
@ -4147,8 +4154,12 @@ def apimiss(req):
|
||||||
obj.lesson = data['lesson']
|
obj.lesson = data['lesson']
|
||||||
obj.missnum = 'WS'+time.strftime('%Y%m%d%H%M%S')
|
obj.missnum = 'WS'+time.strftime('%Y%m%d%H%M%S')
|
||||||
obj.usecomp = Partment.objects.get(partid=companyid)
|
obj.usecomp = Partment.objects.get(partid=companyid)
|
||||||
|
missimg_l = []
|
||||||
if 'missimg' in data and data['missimg']:
|
if 'missimg' in data and data['missimg']:
|
||||||
obj.missimg = '?'.join(data['missimg'])
|
for i in data['missimg']:
|
||||||
|
if i:
|
||||||
|
missimg_l.append(i)
|
||||||
|
obj.missimg = '?'.join(missimg_l) if missimg_l else ''
|
||||||
obj.save()
|
obj.save()
|
||||||
yjjs_ws.delay(companyid)
|
yjjs_ws.delay(companyid)
|
||||||
return JsonResponse({"code": 1})
|
return JsonResponse({"code": 1})
|
||||||
|
@ -4679,6 +4690,7 @@ def apipartuser(req):
|
||||||
'checked': False, 'isPeople': True, 'children': []})
|
'checked': False, 'isPeople': True, 'children': []})
|
||||||
return JsonResponse({"code": 1, "data": lst})
|
return JsonResponse({"code": 1, "data": lst})
|
||||||
|
|
||||||
|
@apicheck_login
|
||||||
def apiuser(req):
|
def apiuser(req):
|
||||||
a = req.GET.get('a')
|
a = req.GET.get('a')
|
||||||
if a == 'detail':
|
if a == 'detail':
|
||||||
|
@ -5997,8 +6009,11 @@ def apioperation(req):
|
||||||
obj.zyzt['splc'][1]['sprs'] = [spr1] # 作业部门审批人
|
obj.zyzt['splc'][1]['sprs'] = [spr1] # 作业部门审批人
|
||||||
if spr2:
|
if spr2:
|
||||||
obj.zyzt['splc'][2]['sprs'] = [spr2] # 属地部门审批人
|
obj.zyzt['splc'][2]['sprs'] = [spr2] # 属地部门审批人
|
||||||
|
try:
|
||||||
Operspxq.objects.create(
|
Operspxq.objects.create(
|
||||||
oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart) # 审批该步
|
oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart) # 审批该步
|
||||||
|
except:
|
||||||
|
pass
|
||||||
while nextindex < len(obj.zyzt['splc']):
|
while nextindex < len(obj.zyzt['splc']):
|
||||||
nextsplc = obj.zyzt['splc'][nextindex]
|
nextsplc = obj.zyzt['splc'][nextindex]
|
||||||
if userid in nextsplc['sprs']: # 本人可审批直接跳过下一步
|
if userid in nextsplc['sprs']: # 本人可审批直接跳过下一步
|
||||||
|
|
Loading…
Reference in New Issue