Merge branch 'ldx' into dev

src/pages/workbench/fwgl/cloud-detail.vue

@@ -248,7 +248,7 @@
           @click="pass"
         >提交资源申请</el-button>
         <el-button
-          v-if="now_user == 0 && use_uid != '' && (apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 || apploy_msg.second_level == -1) || apploy_msg.second_level == 1)"
+          v-if="now_user == 0 && apploy_msg.state == 1 && use_uid != '' && (apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1) || apploy_msg.second_level == 1)"
           class="adjustment"
           @click="adjustment"
         >资源调整</el-button>
@@ -749,6 +749,7 @@ export default {
 
           this.apploy_msg.first_level = data.first_level;
           this.apploy_msg.second_level = data.second_level;
+          this.apploy_msg.state = data.state;
 
           this.cloudData.namespace = data.namespace;
           this.cloudData.workplace = data.workplace;