From 0a1dd39db2e83b716fb37a1009586a5927664537 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Tue, 12 Jan 2021 22:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=9E=8B=E5=AD=97=E5=85=B8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=9A=90=E6=82=A3=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/abdict.html | 32 +++++++++++++++++++-------------
 safesite/views.py              | 15 +++++++++++++--
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/safesite/templates/abdict.html b/safesite/templates/abdict.html
index 2be01ab4..87bb7b92 100644
--- a/safesite/templates/abdict.html
+++ b/safesite/templates/abdict.html
@@ -7,8 +7,10 @@
     </div>
     <div data-options="region:'center'" style="width:100%;height:100%;padding:5px 15px;">
         <form method="post" id="dicff">
+            <input id="dicparent" name="dicparent" type="hidden"
+                    ></input>
             <div style="margin-bottom:10px">
-                <input id="dickeyid" name="dickeyid" type="hidden" style="width:90%;"
+                <input id="dickeyid" name="dickeyid" type="hidden"
                     data-options="label:'字典ID'"></input>
             </div>
             <div style="margin-bottom:10px">
@@ -16,10 +18,11 @@
                     data-options="label:'项目值',multiline:true,required:true"></input>
             </div>
             <div style="margin-bottom:10px">
-                <select id="dicparent" name="dicparent" style="width:90%" data-options="label:'所属字典',required:true"
-                    editable="false">
-                </select>
+                <input id="parent" name="parent" style="width:90%" data-options="label:'父'" 
+                    editable="false" >
+                </input>
             </div>
+            
             <div style="margin-bottom:10px">
                 <input id="dickeydetail" name="detail" style="width:90%;height:60px" 
                     data-options="label:'描述',multiline:true"></input></div>
@@ -29,18 +32,21 @@
     <script>
         $('#dickeyname').textbox();
         $('#dickeydetail').textbox();
-        $('#dicparent').combotree({
-            url: 'dicchandle?a=tree',
-            loadFilter: function (rows) {
-                return convert(rows);
-            },
-        });
+        // $('#dicparent').combotree({
+        //     url: 'dicchandle?a=tree',
+        //     loadFilter: function (rows) {
+        //         return convert(rows);
+        //     },
+        // });
         
         //获取dialog传值
         var x = getQueryParam('dicparent')
         if (x == 0) { }
         else {
-             $('#dicparent').combotree('setValue', x);
+             $('#dicparent').attr('value', x);
+             $('#parent').combotree({
+            url: 'getdickey?dicclass='+x+'&a=combobox',
+        });
     }
 
         var a = GetQueryString('a');
@@ -51,7 +57,7 @@
             else { $('#dicparent').combotree('setValue', x) }
         }
         else {
-            $('#dicparent').combotree('setValue', getQueryParam('dicparent'))
+            $('#dicparent').attr('value', getQueryParam('dicparent'));
             $('#dickeydetail').textbox('setValue', getQueryParam('detail'));
             //console.log(getQueryParam('detail'));
             $('#dickeyname').textbox('setValue', getQueryParam('dickeyname'));
@@ -91,7 +97,7 @@
                 },
                 success: function (data) {
                     if (data.code == 1) {
-                        $("#dictable").datagrid('reload'); $("#dd").dialog("close");
+                        $("#dictable").treegrid('reload'); $("#dd").dialog("close");
                     } else { $.messager.alert('提示', '失败,该选项不可编辑!'); }
                     $('#submitdictb').linkbutton('enable');
                 },
diff --git a/safesite/views.py b/safesite/views.py
index 96b89954..ca42e784 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1664,6 +1664,7 @@ def getdickey(req):
         for i in r_list:
             i['value'] = i['dickeyid']
             i['text'] = i['dickeyname']
+            i['id'] = i['dickeyid']
             r_dict[i["dickeyid"]]=i
         ret=[]
         for i in r_list:
@@ -1691,6 +1692,7 @@ def getdickey(req):
         for i in r_list:
             i['value'] = i['dickeyid']
             i['text'] = i['dickeyname']
+            i['id'] = i['dickeyid']
             r_dict[i["dickeyid"]]=i
         ret=[]
         for i in r_list:
@@ -3101,6 +3103,7 @@ def dicthandle(req):
         dickeyname = data['dickeyname']
         dicparent = data['dicparent']
         detail = data['detail']
+        parent = data.get('parent', None)
         if dickeyid != '':
             a = Dickey.objects.get(dickeyid=dickeyid)
             if ',1,' in a.usecomps and companyid != '1':
@@ -3109,11 +3112,19 @@ def dicthandle(req):
                 a.dickeyname = dickeyname
                 a.dicparent = Dicclass.objects.get(dicid=dicparent)
                 a.detail = detail
+                if parent:
+                    a.parent = Dickey.objects.get(dickeyid=parent)
                 a.save()
                 return JsonResponse({"code": 1})
         else:
-            Dickey.objects.create(dickeyname=dickeyname, dicparent=Dicclass.objects.get(
-                dicid=dicparent), usecomps=','+companyid+',', detail=detail)
+            obj = Dickey()
+            obj.dickeyname = dickeyname
+            obj.dicparent=Dicclass.objects.get(dicid=dicparent)
+            obj.detail = detail
+            obj.usecomps = ','+companyid+','
+            if parent:
+                obj.parent = Dickey.objects.get(dickeyid=parent)
+            obj.save()
             return JsonResponse({"code": 1})