Merge branch 'develop' into 'develop'

Develop

See merge request dcuc-bujz/auth-web!3

config/dev.env.js

@@ -33,9 +33,9 @@ module.exports = merge(prodEnv, {
     PROT: "8871",
     PROXY_TABLE: JSON.stringify({
         "/dcucauth": {
-            target: "http://10.11.1.237:8861"
+            // target: "http://10.11.1.237:8861"
             // target: "http://10.254.11.203:8861"
-            //  target: "http://192.168.10.2:8871"
+             target: "http://192.168.10.2:8871"
             //  target: "http://192.168.6.133:3471"
 
         }

src/pages/appfun-auth-manage/app-role-manage/index.vue

@@ -55,11 +55,11 @@ export default {
         },
         {
           label: '单位名称',
-          name: 'orgId',
+          name: 'orgCode',
           op: '=',
           value: '',
           apiName: 'getOrgTree',
-          nodeKey: 'id',
+          nodeKey: 'code',
           type: 'APP',
           component: 'SelectOrgTree',
           placeholder: '请选择单位名称',

src/pages/appfun-auth-manage/org-quotas-manage/index.vue

@@ -53,11 +53,11 @@ export default {
         },
         {
           label: '单位名称',
-          name: 'orgId',
+          name: 'orgCode',
           op: '=',
           value: '',
           apiName: 'getOrgTree',
-          nodeKey: 'id',
+          nodeKey: 'code',
           type: 'APP',
           component: 'SelectOrgTree',
           placeholder: '请选择单位名称'