Merge branch 'dev' into d_ls

src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -343,19 +343,8 @@ export default {
         },
         {
           label: "下单模板",
-          prop: "templateStatus",
-          scope: "isOptions",
+          prop: "templateName",
           hidden: true,
-          options: [
-            {
-              label: "班级",
-              value: 1,
-            },
-            {
-              label: "考期、报考地区",
-              value: 2,
-            },
-          ],
         },
         {
           label: "学习顺序",

src/views/systemManagement/roleManagement/index.vue

@@ -318,11 +318,11 @@ export default {
           prop: "menuIds",
           scope: "tree",
         },
-        {
-          label: "数据池权限",
-          prop: "keys",
-          scope: "treeInfo",
-        },
+        // {
+        //   label: "数据池权限",
+        //   prop: "keys",
+        //   scope: "treeInfo",
+        // },
         {
           label: "备注",
           prop: "remark",
@@ -503,7 +503,7 @@ export default {
     rulesTableSumbit() {
       this.disabledBtn = true;
       this.listData.menuIds = this.getMenuAllCheckedKeys();
-      this.listData.businessIds = this.getMenuAllCheckedKeysInfo();
+      // this.listData.businessIds = this.getMenuAllCheckedKeysInfo();
       var data = this.listData;
       if (this.statusPop === 1) {
         this.$api