fix

pkuaijin · Jun 16, 2021 · 41536d0 · 41536d0
1 parent afaacbc
commit 41536d0
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/backend/init.sh b/backend/init.sh
@@ -3,8 +3,11 @@
 apps=(systems tools notices workflows tickets)
 rm -rf core.db
 for app in ${apps[@]};do
-  echo $app
   rm -rf $app/migrations
+done
+
+for app in ${apps[@]};do
+  echo $app
   python manage.py makemigrations $app
 done
 

diff --git a/backend/notices/migrations/0001_initial.py b/backend/notices/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2021-05-09 08:31
+# Generated by Django 3.0.3 on 2021-06-16 08:30
 
 from django.db import migrations, models
 

diff --git a/backend/systems/migrations/0001_initial.py b/backend/systems/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2021-05-09 08:31
+# Generated by Django 3.0.3 on 2021-06-16 08:30
 
 import django.contrib.auth.models
 from django.db import migrations, models

diff --git a/backend/systems/permissions.py b/backend/systems/permissions.py
@@ -18,9 +18,6 @@
     '/api/sys/auth/jwt-token-auth/',
     '/api/sys/auth/getuserinfo/',
     '/api/sys/auth/getmenubutons/',
-    '/api/sys/user/',
-    '/api/workflow/customfield/',
-    '/api/workflow/state/',
 ]
 
 

diff --git a/backend/tickets/migrations/0001_initial.py b/backend/tickets/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2021-05-09 08:31
+# Generated by Django 3.0.3 on 2021-06-16 08:30
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,8 +10,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('workflows', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('workflows', '0001_initial'),
     ]
 
     operations = [

diff --git a/backend/tools/migrations/0001_initial.py b/backend/tools/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2021-05-09 08:31
+# Generated by Django 3.0.3 on 2021-06-16 08:30
 
 from django.db import migrations, models
 import tools.storage

diff --git a/backend/workflows/management/commands/init_leave.py b/backend/workflows/management/commands/init_leave.py
@@ -168,7 +168,7 @@ def handle(self, *args, **options):
         self.stdout.write(self.style.SUCCESS('############ 初始化角色权限 ###########'))
         menus = [34, 35, 36, 37, 38, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
                  77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96]
-        perms = [92, 96, 48, 44, 52, 73, 74, 75, 76, 85, 86, 87, 88, 81, 82, 83, 84, 77, 78, 79, 80, 28, 32, 68, 64]
+        perms = [52, 60, 92, 96, 48, 44, 52, 73, 74, 75, 76, 85, 86, 87, 88, 81, 82, 83, 84, 77, 78, 79, 80, 28, 32, 68, 64]
         menu_obj_list = Menu.objects.filter(id__in=menus)
         perm_obj_list = Permission.objects.filter(id__in=perms)
 

diff --git a/backend/workflows/migrations/0001_initial.py b/backend/workflows/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2021-05-09 08:31
+# Generated by Django 3.0.3 on 2021-06-16 08:30
 
 from django.conf import settings
 from django.db import migrations, models

diff --git a/frontend/src/views/sys/role.vue b/frontend/src/views/sys/role.vue
@@ -187,7 +187,7 @@
         <el-button @click="MenuFormVisible = false">{{ "取消" }}</el-button>
         <el-button
           type="primary"
-          @click="dialogStatus === 'create' ? createData() : updateData()"
+          @click="dialogStatus === 'create' ? createData() : updateData('memu')"
           >{{ "确定" }}</el-button
         >
       </div>
@@ -219,7 +219,7 @@
         <el-button @click="PermFormVisible = false">{{ "取消" }}</el-button>
         <el-button
           type="primary"
-          @click="dialogStatus === 'create' ? createData() : updateData()"
+          @click="dialogStatus === 'create' ? createData() : updateData('perm')"
           >{{ "确定" }}</el-button
         >
       </div>
@@ -293,7 +293,7 @@ export default {
       permprops: {
         key: "id",
         label: "name",
-      },
+      }
     };
   },
   computed: {
@@ -412,24 +412,26 @@ export default {
       this.dialogStatus = "update";
       if (val == "menu") {
         this.MenuFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+          this.valueIdSelectTree2 = this.temp.parent;
+          this.$refs.tree.setCheckedKeys(this.temp.menus);
+        });
       } else if (val == "perm") {
         this.PermFormVisible = true;
       } else {
         this.BaseFormVisible = true;
       }
 
-      this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-        this.valueIdSelectTree2 = this.temp.parent;
-        this.$refs.tree.setCheckedKeys(row.menus);
-      });
     },
-    updateData() {
+    updateData(val) {
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
-          this.temp.parent = this.valueIdSelectTree2;
-          this.temp.menus = this.$refs.tree.getCheckedKeys();
+          if (val == "menu") {
+            this.temp.parent = this.valueIdSelectTree2;
+            this.temp.menus = this.$refs.tree.getCheckedKeys();
+          }
           role
             .requestPut(this.temp.id, this.temp)
             .then(() => {