merge

src/pages/authority/organization/organizationedit.vue

@@ -162,12 +162,16 @@ export default {
       }
     },
     get_now_user() {
-      let userName = this.$store.state.userInfo.user_name;
-
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
           this.form = {
-        person: userName,
+            person: data.data.user_name,
             date: formatDateTime_date(new Date()),
           };
+        } else {
+          console.log(data.errMsg);
+        }
+      });
     },
     get_user() {
       this.$http

src/pages/authority/role/addroles.vue

@@ -39,7 +39,7 @@
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
 
-        <el-form-item class="bottom-btn">
+        <el-form-item class="bottom-btn apass_button">
           <el-button type="primary" @click="onSubmit('form')" class="right"
             >保存</el-button
           >
@@ -76,8 +76,8 @@ export default {
       form: {
         name: "",
         desc: "",
-        person: this.$store.state.userInfo.user_name,
-        date: formatDateTime_date(new Date()),
+        person: "",
+        date: "",
       },
       now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
       permissionData: [],
@@ -96,6 +96,7 @@ export default {
   watch: {},
   computed: {},
   created() {
+    this.get_now_user();
     this.get_now_page();
     console.log(this.$route);
   },
@@ -319,6 +320,18 @@ export default {
       console.log(values);
       console.log(this.permissionData);
     },
+    get_now_user() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        let baseinfo = {
+          person: data.data.user_name,
+          date: formatDateTime_date(new Date()),
+        };
+        this.form = {
+          ...this.form,
+          ...baseinfo,
+        };
+      });
+    },
   },
 };
 </script>

src/pages/authority/user/organizationuser.vue

@@ -110,7 +110,7 @@
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item class="apass_button">
           <el-button
             @click="resetForm('form')"
             class="left"
@@ -159,8 +159,8 @@ export default {
         origin: "",
         able: "",
         desc: "",
-        person: this.$store.state.userInfo.user_name,
-        date: formatDateTime_date(new Date()),
+        person: "",
+        date: "",
         ip: "",
         domain: "",
       },
@@ -207,11 +207,13 @@ export default {
         ],
       },
       edit_flag: 0,
+      baseinfo: {},
     };
   },
   watch: {},
   computed: {},
   created() {
+    this.get_now_user();
     this.getOriginArr();
     this.get_now_page();
   },
@@ -368,6 +370,26 @@ export default {
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
+      this.form = {
+        ...this.form,
+        ...this.baseinfo,
+      };
+    },
+    get_now_user() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          this.baseinfo = {
+            person: data.data.user_name,
+            date: formatDateTime_date(new Date()),
+          };
+          this.form = {
+            ...this.form,
+            ...this.baseinfo,
+          };
+        } else {
+          console.log(data.errMsg);
+        }
+      });
     },
   },
 };

src/pages/authority/user/permission.vue

@@ -77,9 +77,12 @@ export default {
   data: () => ({
     listTotal: 0,
     listData: [],
+    tempFilter: null,
   }),
   methods: {
     listAction(filters) {
+      this.tempFilter = filters;
+
       this.$http
         .get("/apaas/backmgt/user/userApply/list", {
           params: {
@@ -109,10 +112,18 @@ export default {
           }
         )
         .then(({ data }) => {
+          if (data.success === 1) {
             this.$message({
               message: `操作成功.`,
               type: "success",
             });
+            this.listAction(this.tempFilter);
+          } else {
+            this.$message({
+              message: `操作失败.`,
+              type: "warning",
+            });
+          }
         })
         .catch((error) => {
           this.$message({

src/pages/authority/user/useradd.vue

-<template>
-    <div>
-
-    </div>
-</template>
-
-<script>
-export default {
-    props: [],
-    components: {
-
-    },
-    data() {
-        return {
-
-        };
-    },
-    watch: {
-
-    },
-    computed: {
-
-    },
-    created() {
-
-    },
-    mounted() {
-
-    },
-    methods: {
-
-    },
-};
-</script>
-
-<style scoped>
-
-</style>

src/pages/workbench/fwgl/fwglList.vue

@@ -542,11 +542,11 @@ export default {
                   return item.service_apply_info.approval_status === 1;
                 },
               },
-              {
+              /* {
                 label: "删除",
                 class: "warn",
                 callback: this.deleteItem,
-              },
+              }, */
             ],
           },
         ];
@@ -585,7 +585,7 @@ export default {
           },
         ];
       }
-      // TODO:组织管理员 --- 云资源管理
+      // TODO: 组织管理员 --- 云资源管理
       else if (level == 1 && type == 2) {
         this.listUrl = "xxxxxx";
         this.listHeader = [
@@ -815,11 +815,11 @@ export default {
                   return item.service_apply_info.approval_status === 1;
                 },
               },
-              {
+              /* {
                 label: "删除",
                 class: "warn",
                 callback: this.deleteItem,
-              },
+              }, */
             ],
           },
         ];
@@ -858,7 +858,7 @@ export default {
           },
         ];
       }
-      // TODO:超级管理员 --- 云资源管理
+      // TODO: 超级管理员 --- 云资源管理
       else if (level == 2 && type == 2) {
         this.listUrl = "xxxxxx";
         this.listHeader = [