Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/table/table-input.vue

@@ -5,7 +5,7 @@
         ref="inpNum"
         v-model="inputText"
         oninput="value=value.replace(/[^\d]/g, '')"
-        :disabled="couldNotEdit || name == ''"
+        :disabled="couldNotEdit || name == ''||itemEdit"
         size="small"
         @input="changeValue"
         class="table_in_input"
@@ -18,7 +18,7 @@
       <el-input
         ref="inp"
         v-model="inputText"
-        :disabled="couldNotEdit || name == ''"
+        :disabled="couldNotEdit || name == ''||itemEdit"
         size="small"
         @input="changeValue"
         class="table_in_input"
@@ -80,6 +80,10 @@ export default {
       type: Boolean,
       default: false
     },
+    itemEdit:{
+      type: Boolean,
+      default: false
+    },
     type: {
       type: String,
       default: ""
@@ -98,6 +102,11 @@ export default {
     inputTextUp: "",
     helper: helper
   }),
+  watch:{
+    item(n,o){
+      this.inputText = n
+    }
+  },
   mounted() {
     this.inputText = this.item;
   },

src/components/table/table-um.vue

@@ -84,6 +84,9 @@
           :show-overflow-tooltip="true"
           :render-header="item.require ? renderHeader : null"
         >
+        <template slot="header" slot-scope="scope">
+          <span v-html="scope.column.label"></span>
+        </template>
           <template slot-scope="scope">
             <!-- 操作按钮 -->
             <span v-if="item.type === 'Button'">
@@ -153,12 +156,13 @@
             <v-apaas-table-input
               v-else-if="item.type === 'input' || item.type === 'upload' || item.type === 'inputNumber'"
               :item="helper.GetProperty(scope.row, item.prop)"
-              :header="item.prop"
+              :header="item.prop" ref=""
               :id="scope.row.id"
               :name="scope.row.name"
               :rowId="scope.$index"
               :type="scope.row[item.uploadKey] ? scope.row[item.uploadKey] : ''"
               :typeHead="item.type"
+              :itemEdit="scope.row[item.prop]=='不限次数'||scope.row[item.prop]=='申请获取应用镜像部署权限'||scope.row[item.prop]=='提供2核4G，4核8G等多种规格'"
               :couldNotEdit="couldNotEdit"
               @changeInputValue="changeInputValue"
               @changeUpFile="changeUpFile"

src/pages/authority/user/money.vue

@@ -185,6 +185,7 @@ export default {
           if(res.data.success){
             this.$refs.dialog.hide();
             this.$message.success('充值成功')
+            this.change_date()
           }else{
             this.$message.error(res.data.errMsg)
           }

src/pages/workbench/fwgl/apply_service_detail.vue

@@ -118,6 +118,7 @@ export default {
       use_approval_arr: [],
       process_in_up:false,//是否是服务注册产生的
       perception_in:false,//是否是感知服务
+      service_apply_type:1,//服务申请的方式，1：计次收费2：时长收费
       port_select:'',
       req_solt_code_arr:'',
       res_solt_code_arr:'',
@@ -618,6 +619,10 @@ export default {
           title: "申请时间：",
           info: "",
         },
+        {
+          title: "支付总价：",
+          info: "2000",
+        },
         {
           title: "审批信息",
           prop: "title",
@@ -720,15 +725,7 @@ export default {
               ? "#515fe7"
               : "#e15260"
           );
-          this.$set(
-            this.service_header_arr["first"][2],
-            "text",
-            data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
-              ? "-"
-              : data.service_apply_info.service_end_time
-                  .replace("T", " ")
-                  .split("+")[0]
-          );
+          
           this.$set(this.service_header_arr["second"][0], "text", data.req_url);
           this.$set(this.service_header_arr, "url", data.cover);
 
@@ -737,6 +734,28 @@ export default {
               this.service_header_arr.second = []
               this.service_header_arr.second.push(temp_sj)
             }
+            if(this.service_apply_type==1){
+              this.$set(
+                this.service_header_arr["first"][2],
+                "text",
+                data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
+                  ? "-"
+                  : data.service_apply_info.service_end_time
+                      .replace("T", " ")
+                      .split("+")[0]
+              );
+              this.$set(this.service_header_arr["first"][2],'name','可调用次数')
+            }else{
+              this.$set(
+                this.service_header_arr["first"][2],
+                "text",
+                data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
+                  ? "-"
+                  : data.service_apply_info.service_end_time
+                      .replace("T", " ")
+                      .split("+")[0]
+              );
+            }
           this.$set(this.list_arr[0], "info", data.descript);
           this.$set(this.list_arr[1], "info", data.data_service_type2_name);
           this.$set(

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -262,7 +262,11 @@ export default {
         {
           title: "申请规格：",
           info: ""
-        }
+        },
+        {
+          title: "总价：",
+          info: "2000",
+        },
       ]
     };
   },

src/pages/workbench/workPlace.vue

@@ -889,10 +889,10 @@ export default {
             num: ""
           },
           {
-            text: "收益总额",
-            pic: require("@/assets/imgs/ic_shouyize.png"),
-            bg: "rgb(255,242,226)",
-            color: "#ea7d19",
+            text: "工作区域",
+            pic: require("@/assets/imgs/ic_gongzuoquyu.png"),
+            bg: "#e7fdfc",
+            color: "#25bdb1",
             type: "earnings_money",
             num: ""
           }

src/pages/workbench/yygl/apply_app_detail.vue

@@ -134,6 +134,10 @@ export default {
           title: "申请时间：",
           info: "",
         },
+        {
+          title: "总价：",
+          info: "2000",
+        },
         {
           title: "审批信息",
           prop:"title",

src/pages/workbench/yygl/approval_app_detail.vue

@@ -244,6 +244,10 @@ export default {
         {
           title: "申请时间：",
           info: ""
+        },
+        {
+          title: "订单总价：",
+          info: "30000"
         }
       ]
     };