尝试修改树状字典成功
This commit is contained in:
parent
42dc36da06
commit
a3f1d188dd
|
@ -14,7 +14,7 @@
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-bottom:5px">
|
<div style="margin-bottom:5px">
|
||||||
<input class="easyui-combobox" editable="false" required=true name="yhlxo" id="yhlxo" style="width:480px;" data-options="
|
<input class="easyui-combotree" editable="false" required=true name="yhlxo" id="yhlxo" style="width:480px;" data-options="
|
||||||
url:'getdickey?dicclass=56&a=combobox',
|
url:'getdickey?dicclass=56&a=combobox',
|
||||||
label:'隐患类型',
|
label:'隐患类型',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
|
|
|
@ -1656,10 +1656,26 @@ def getdickey(req):
|
||||||
a = (a.filter(usecomps__contains=',1,') | a.filter(usecomps__contains=',' +
|
a = (a.filter(usecomps__contains=',1,') | a.filter(usecomps__contains=',' +
|
||||||
companyid+',')).exclude(nousecomps__contains=','+companyid+',')
|
companyid+',')).exclude(nousecomps__contains=','+companyid+',')
|
||||||
a = a.values('dickeyid', 'dicparent__dicname', 'dickeyname',
|
a = a.values('dickeyid', 'dicparent__dicname', 'dickeyname',
|
||||||
'dicparent__dicid', 'detail').order_by('dickeyid')
|
'dicparent__dicid', 'detail', 'parent').order_by('dickeyid')
|
||||||
total = a.count()
|
total = a.count()
|
||||||
if req.GET.get('a') == 'combobox':
|
if req.GET.get('a') == 'combobox':
|
||||||
return HttpResponse(transstr(a, 'dickeyid', 'dickeyname'), content_type="application/json")
|
r_list = list(a)
|
||||||
|
r_dict={}
|
||||||
|
for i in r_list:
|
||||||
|
i['value'] = i['dickeyid']
|
||||||
|
i['text'] = i['dickeyname']
|
||||||
|
r_dict[i["dickeyid"]]=i
|
||||||
|
ret=[]
|
||||||
|
for i in r_list:
|
||||||
|
parent=i['parent']
|
||||||
|
if parent:
|
||||||
|
if 'children' in r_dict[parent]:
|
||||||
|
r_dict[parent]['children'].append(i)
|
||||||
|
else:
|
||||||
|
r_dict[parent]['children'] = [i]
|
||||||
|
else:
|
||||||
|
ret.append(i)
|
||||||
|
return HttpResponse(json.dumps(ret), content_type="application/json")
|
||||||
else:
|
else:
|
||||||
if req.GET.get('dicclass') == '33':
|
if req.GET.get('dicclass') == '33':
|
||||||
for i in a:
|
for i in a:
|
||||||
|
@ -1670,7 +1686,23 @@ def getdickey(req):
|
||||||
str = str + '-' + x.jdmc
|
str = str + '-' + x.jdmc
|
||||||
i['splcdetail'] = str
|
i['splcdetail'] = str
|
||||||
a = a
|
a = a
|
||||||
return HttpResponse(transjson(total, a), content_type="application/json")
|
r_list = list(a)
|
||||||
|
r_dict={}
|
||||||
|
for i in r_list:
|
||||||
|
i['value'] = i['dickeyid']
|
||||||
|
i['text'] = i['dickeyname']
|
||||||
|
r_dict[i["dickeyid"]]=i
|
||||||
|
ret=[]
|
||||||
|
for i in r_list:
|
||||||
|
parent=i['parent']
|
||||||
|
if parent:
|
||||||
|
if 'children' in r_dict[parent]:
|
||||||
|
r_dict[parent]['children'].append(i)
|
||||||
|
else:
|
||||||
|
r_dict[parent]['children'] = [i]
|
||||||
|
else:
|
||||||
|
ret.append(i)
|
||||||
|
return HttpResponse(json.dumps(ret), content_type="application/json")
|
||||||
|
|
||||||
|
|
||||||
def addtrain(req):
|
def addtrain(req):
|
||||||
|
|
BIN
需求/惠东需求.xlsx
BIN
需求/惠东需求.xlsx
Binary file not shown.
Loading…
Reference in New Issue