云资源、订单相关问题及优化

src/components/order-list/order-list-cell.vue

@@ -48,7 +48,9 @@
         <div v-else-if="cellItem.order_type == 3">
           <div>
             规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
-            <span v-if="cellItem.disk_num != 0">{{ cellItem.disk_num }}数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB</span>
+            <span
+              v-if="cellItem.disk_num != 0"
+            >数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB</span>
           </div>
           <div
             class="cell_specification_type"
@@ -59,11 +61,15 @@
         <div>
           <div v-if="cellItem.approval_first_level == 0 &&  cellItem.pay_status != -1">待审核</div>
           <div
-            v-if="cellItem.approval_first_level == 1 && cellItem.approval_second_level == 0 && cellItem.pay_status != -1"
+            v-else-if="cellItem.approval_first_level == 1 && cellItem.approval_second_level == 0 && cellItem.pay_status != -1"
           >审核中</div>
-          <div v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1">审核通过</div>
-          <div v-if="cellItem.approval_first_level == -1 && cellItem.pay_status != -1">审核未通过</div>
-          <div v-if="cellItem.pay_status == -1">订单已取消</div>
+          <div
+            v-else-if="cellItem.approval_first_level == 1 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1"
+          >审核通过</div>
+          <div
+            v-else-if="(cellItem.approval_first_level == -1 || cellItem.approval_second_level == -1) && cellItem.pay_status != -1"
+          >审核未通过</div>
+          <div v-else-if="cellItem.pay_status == -1">订单已取消</div>
           <el-popover
             v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 0"
             placement="right-start"
@@ -111,7 +117,11 @@
             class="cell_option_btn"
             @click="viewDetail(cellItem.order_id)"
           >查看详情</el-button>
-          <div v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1" class="cell_option_spec" @click="nextApply">再次申请</div>
+          <div
+            v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1"
+            class="cell_option_spec"
+            @click="nextApply"
+          >再次申请</div>
         </div>
       </el-col>
       <el-collapse-transition>

src/components/order-list/order-list-com.vue

@@ -23,7 +23,7 @@
         <el-input
           v-model="search"
           prefix-icon="el-icon-search"
-          placeholder="请输入关键字搜索服务"
+          placeholder="请输入关键字搜索订单"
           @input="searchVal"
         ></el-input>
       </div>

src/components/shop-cloud/shop-cloud.vue

@@ -107,14 +107,14 @@
                   <el-col :span="22">
                     <el-form-item class="form_item">
                       <div class="form_item_title">数据盘（可选）：</div>
-                      <el-select v-model="formNew.store_type" placeholder="请选择数据盘类型">
+                      <!-- <el-select v-model="formNew.store_type" placeholder="请选择数据盘类型">
                         <el-option
                           v-for="item in options_store_type"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
                         ></el-option>
-                      </el-select>
+                      </el-select> -->
                     </el-form-item>
                   </el-col>
                   <el-col :span="11">
@@ -345,14 +345,14 @@
                     <el-col :span="22">
                       <el-form-item class="form_item">
                         <div class="form_item_title">增加数据盘：</div>
-                        <el-select v-model="formOld.store_type" placeholder="请选择数据盘类型">
+                        <!-- <el-select v-model="formOld.store_type" placeholder="请选择数据盘类型">
                           <el-option
                             v-for="item in options_store_type"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
                           ></el-option>
-                        </el-select>
+                        </el-select> -->
                       </el-form-item>
                     </el-col>
                     <el-col :span="11">
@@ -593,10 +593,10 @@
                   class="dia_block_item_val"
                 >{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</span>
               </div>
-              <div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
+              <!-- <div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
                 <span class="dia_block_item_title">数据盘类型：</span>
                 <span class="dia_block_item_val">{{ diaForm.store_type }}</span>
-              </div>
+              </div> -->
             </div>
             <span class="dia_item_all_title">单个容器组规格：</span>
             <div class="dia_block_item">
@@ -1042,7 +1042,7 @@ export default {
             this.$router.push("/services_shop");
           } else {
             this.$message({
-              message: "申请失败",
+              message: `申请失败，${response.data.errMsg}`,
               type: "error"
             });
           }
@@ -1081,7 +1081,7 @@ export default {
             this.$router.push("/services_shop");
           } else {
             this.$message({
-              message: "申请调整失败",
+              message: `申请调整失败，${response.data.errMsg}`,
               type: "error"
             });
           }

src/pages/user/order/order_detail.vue

@@ -15,17 +15,17 @@
           >待审核</p>
           <p
             class="detail_head_cell_val text_yellow"
-            v-if="orderDetail.approval_first_level == 1&& orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
+            v-else-if="orderDetail.approval_first_level == 1&& orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
           >审核中</p>
           <p
             class="detail_head_cell_val text_blue"
-            v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
+            v-else-if="orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
           >审核通过</p>
           <p
             class="detail_head_cell_val text_red"
-            v-if="orderDetail.approval_first_level == -1 && orderDetail.pay_status != -1"
+            v-else-if="(orderDetail.approval_first_level == -1 || orderDetail.approval_second_level == -1) && orderDetail.pay_status != -1"
           >审核未通过</p>
-          <p class="detail_head_cell_val text_blackblue" v-if="orderDetail.pay_status == -1">订单已取消</p>
+          <p class="detail_head_cell_val text_blackblue" v-else-if="orderDetail.pay_status == -1">订单已取消</p>
         </div>
         <div class="detail_head_cell detail_head_no border_right">
           <p class="detail_head_cell_title">订单编号</p>
@@ -457,19 +457,19 @@ export default {
     },
     nextApply() {
       let query = {};
-      if (this.cellItem.order_type == 1) {
+      if (this.orderDetail.order_type == 1) {
         query = {
-          service_id: parseFloat(this.cellItem.service_id),
-          spec_id: this.cellItem.svc_spec_id,
-          duration: this.cellItem.duration,
-          duration_unit: this.cellItem.duration_unit
+          service_id: parseFloat(this.orderDetail.service_id),
+          spec_id: this.orderDetail.svc_spec_id,
+          duration: this.orderDetail.duration,
+          duration_unit: this.orderDetail.duration_unit
         };
-      } else if (this.cellItem.order_type == 2) {
+      } else if (this.orderDetail.order_type == 2) {
         query = {
-          app_id: parseFloat(this.cellItem.app_id),
-          spec_id: this.cellItem.spec_app,
-          duration: this.cellItem.duration,
-          duration_unit: this.cellItem.duration_unit
+          app_id: parseFloat(this.orderDetail.app_id),
+          spec_id: this.orderDetail.spec_app,
+          duration: this.orderDetail.duration,
+          duration_unit: this.orderDetail.duration_unit
         };
       }
       window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
@@ -497,9 +497,9 @@ export default {
         });
     },
     getMessage() {
-      if (this.cellItem.order_type == 1) {
+      if (this.orderDetail.order_type == 1) {
         this.$api.user
-          .getServiceEvaluation({ apply_id: this.cellItem.apply_id })
+          .getServiceEvaluation({ apply_id: this.orderDetail.apply_id })
           .then(response => {
             if (response.data.success == 1) {
               this.message = response.data.data;
@@ -511,9 +511,9 @@ export default {
               });
             }
           });
-      } else if (this.cellItem.order_type == 2) {
+      } else if (this.orderDetail.order_type == 2) {
         this.$api.user
-          .getAppEvaluation({ apply_id: this.cellItem.apply_id })
+          .getAppEvaluation({ apply_id: this.orderDetail.apply_id })
           .then(response => {
             if (response.data.success == 1) {
               this.message = response.data.data;

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

@@ -35,8 +35,14 @@
                 v-if="apploy_msg.first_level == 0"
                 class="head_right_msg_item apply_wait"
               >待审批</span>
-              <span v-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 1" class="head_right_msg_item apply_success">审批通过</span>
-              <span v-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1)" class="head_right_msg_item apply_refuse">审批未通过</span>
+              <span
+                v-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 1"
+                class="head_right_msg_item apply_success"
+              >审批通过</span>
+              <span
+                v-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1)"
+                class="head_right_msg_item apply_refuse"
+              >审批未通过</span>
             </p>
             <p class="head_right_msg_p">
               业务系统名：
@@ -74,12 +80,12 @@
                   <div>{{ cloudDteail.disk }}</div>
                 </div>
               </div>
-              <div class="params_block_item_in">
+              <!-- <div class="params_block_item_in">
                 <span class="params_block_item_title">数据盘类型：</span>
                 <div class="params_block_item_val">
                   <div>{{ cloudDteail.store_type }}</div>
                 </div>
-              </div>
+              </div>-->
               <div class="params_block_item_in">
                 <span class="params_block_item_title">申请时长：</span>
                 <span class="params_block_item_val">{{ cloudDteail.apply_duration_time }}</span>
@@ -124,12 +130,12 @@
                   <div>{{ cloudDetailNew.adjust_disk}}</div>
                 </div>
               </div>
-              <div class="params_block_item_in">
+              <!-- <div class="params_block_item_in">
                 <span class="params_block_item_title">数据盘类型：</span>
                 <div class="params_block_item_val">
                   <div>{{ cloudDetailNew.store_type }}</div>
                 </div>
-              </div>
+              </div>-->
               <div class="params_block_item_in">
                 <span class="params_block_item_title">续期时长：</span>
                 <span class="params_block_item_val">{{ cloudDetailNew.adjust_duration_time }}核</span>
@@ -218,10 +224,10 @@
       </div>
       <div v-if="activeName == '1'" class="my_params">
         <InfoList :list_arr="list_arr_my" class="detail_s_val">
-          <div ref="ApplicationStatus" slot="ApplicationStatus" class="params_apply_desc">
+          <div ref="ApplicationStatus" slot="ApplicationStatus" class="params_apply_desc_1">
             <span v-if="super_status == 0" class="head_right_msg_item apply_wait">待审批</span>
-            <span v-if="super_status == 1" class="head_right_msg_item apply_success">审批通过</span>
-            <span v-if="super_status == -1" class="head_right_msg_item apply_refuse">审批未通过</span>
+            <span v-else-if="super_status == 1" class="head_right_msg_item apply_success">审批通过</span>
+            <span v-else-if="super_status == -1" class="head_right_msg_item apply_refuse">审批未通过</span>
           </div>
         </InfoList>
       </div>
@@ -245,12 +251,12 @@
           @click="distribution"
         >分配</el-button>
         <el-button
-          v-if="now_user == 2 && apploy_msg.second_level == 0 || now_user == 1 && apploy_msg.first_level == 0"
+          v-if="(now_user == 2 && apploy_msg.first_level == 1 && apploy_msg.second_level == 0) || (now_user == 1 && apploy_msg.first_level == 0)"
           class="refuse"
           @click="refuse"
         >拒绝</el-button>
         <el-button
-          v-if="now_user == 2 && apploy_msg.second_level == 0"
+          v-if="now_user == 2 && apploy_msg.second_level == 0 && apploy_msg.first_level == 1"
           class="adjustment"
           @click="pass"
         >通过</el-button>
@@ -646,9 +652,9 @@ export default {
           this.list_arr[6].info = data.bgn_time; //  get time
           this.list_arr[7].info = data.time_remaining; //  remaining days
           this.list_arr[8].info = data.end_time; //  maturity time
-          this.list_arr_my[0].info = data.first_level_time; //  submit application time
-          this.list_arr_my[1].info = data.second_level_time; //  super get time
-          this.super_status = data.second_leve; //  super status
+          this.list_arr_my[0].info = data.first_level_time || "暂未提交"; //  submit application time
+          this.list_arr_my[1].info = data.second_level_time || "暂未获取"; //  super get time
+          this.super_status = data.second_level; //  super status
           this.desc = data.workplacedesc; //  workplace description
           let count = data.cloud_resource_count; //  resource usage
           if (count) {
@@ -830,6 +836,10 @@ export default {
   padding-left: 15px;
   line-height: 26px;
 }
+.params_apply_desc_1 {
+  margin: 5px 0;
+  line-height: 26px;
+}
 .params_resource_overview {
   margin: 5px 0;
   padding-left: 15px;