Merge branch 'xym' into dev

src/pages/workbench/fwgl/approveWorkspace.vue

@@ -59,25 +59,27 @@ export default {
       sunbmitText: "",
       submit: null,
     },
+    tempFilter: null,
   }),
   computed: {},
   methods: {
     init(filter) {
       // console.log(filter);
 
+      this.tempFilter = filter;
+
       this.$http
-        .get("/apaas/service/v3/resource/user/apply/list", {
+        .get("/apaas/service/v3/resource/apply/approveList", {
           params: {
             search: filter.keyword,
             page: filter.page,
             limit: filter.size,
-            depart: "",
-            state1: filter.state1,
+            state: filter.state,
           },
         })
         .then(({ data }) => {
           this.listTotal = data.total;
-          this.listData = data.data.cloud_apply_list;
+          this.listData = data.data;
         })
         .catch((error) => {
           console.log(error);
@@ -87,7 +89,9 @@ export default {
       this.$refs.dialog.show();
     },
     detailAction(item) {
-      console.log("detailAction");
+      this.$router.push({
+        path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+      });
     },
     approveAction(item) {
       this.dialogInfo.msg = "该工作区域的申请通过还是拒绝？";
@@ -118,12 +122,12 @@ export default {
     this.level = parseInt(this.$route.params.level);
     this.type = parseInt(this.$route.params.type);
 
-    let warnFlag = this.$route.query.warn || false;
+    let warnFlag = this.$route.query.warn == 1 ? true : false;
 
     this.otherFilter = [
       {
         name: "审批状态",
-        prop: "state1",
+        prop: "state",
         default: "",
         options: [
           {
@@ -148,7 +152,7 @@ export default {
     this.listHeader = [
       {
         label: "工作区域名称",
-        prop: "name_space",
+        prop: "namespace",
         type: "button",
         callback: this.detailAction,
       },
@@ -202,12 +206,14 @@ export default {
       },
       {
         label: "申请类型",
-        prop: "type",
         align: "center",
+        getText(item) {
+          return item.apply_type === 0 ? "初次申请" : "资源调整";
+        },
       },
       {
         label: "所属组织",
-        prop: "org_name",
+        prop: "department_name",
       },
       {
         label: "用户申请时间",

src/pages/workbench/fwgl/fwglList.vue

@@ -1486,7 +1486,9 @@ export default {
       );
     }, // 审批服务
     cloudDetail(item) {
-      console.log("cloudDetail - " + item.name);
+      this.$router.push({
+        path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+      });
     },
     cloudAllot(item) {
       this.$refs.allotConfirm.getDetail(item.apply_id);
@@ -1996,7 +1998,7 @@ export default {
       this.$router.push({
         path: `/fwgl/${this.level}/${this.type}/approveWorkspace`,
         query: {
-          warn: this.cloud_admin_warn,
+          warn: this.cloud_admin_warn ? 1 : 0,
         },
       });
     },

src/pages/workbench/fwgl/organizationCloudResource.vue

@@ -318,7 +318,9 @@ export default {
       this.$refs.dialog.show();
     },
     detailAction(item) {
-      console.log("detailAction");
+      this.$router.push({
+        path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+      });
     },
     stateAction(item) {
       this.dialogInfo.msg = "您确认要禁用该工作区域吗？";

src/pages/workbench/yygl/yyglList.vue

@@ -1358,6 +1358,7 @@ export default {
             });
           });
       };
+      this.showDialog();
     },
   },
   created() {