Merge branch 'master-500-dev-xwx' into 'master-500-dev'

【763】部门类型配置成字典获取



See merge request !580

@@ -108,6 +108,20 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
                     $.each(data, function (i, v) {
                     $.each(data, function (i, v) {
                         $form.find("select[name='orgAdmin']").append(new Option(v.nickname, v.username))
                         $form.find("select[name='orgAdmin']").append(new Option(v.nickname, v.username))
                     })
                     })
+                    admin.req({
+                        url: `${domainName}/api-web/manage/ddic/findSucDdics/ORG_TYPE?access_token=${accessToken}`,
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res && res.data) {
+                                var ddiclist = res.data;
+                                $.each(ddiclist, function (i, v) {
+                                    $form.find("select[name='orgType']").append(new Option(v.ddicName, v.ddicCode))
+                                });
+                                form.render();
+                            }
+                        },
+                    });
                     if(orgId){
                     if(orgId){
                         // 查询当前部门机构信息
                         // 查询当前部门机构信息
                         $.ajax({
                         $.ajax({

@@ -44,9 +44,6 @@
                    <div class="layui-input-inline">
                    <div class="layui-input-inline">
                        <select name="orgType"  class="layui-select">
                        <select name="orgType"  class="layui-select">
                            <option value="">==请选择==</option>
                            <option value="">==请选择==</option>
-                           <option value="0">税务局</option>
-                           <option value="1">部门</option>
-                           <option value="2">组</option>
                        </select>
                        </select>
                    </div>
                    </div>
                </div>
                </div>