1

src/views/backStageManage/application/apply/components/apply.vue

@@ -18,7 +18,7 @@
                 v-loading="loading"
                 :data="tableData"
                 header-row-class-name="custom-table-header"
-                max-height="calc(100% - 0)"
+                height="calc(100% - 0)"
             >
             <el-table-column label="应用名称" align="" show-overflow-tooltip>
                 <template slot-scope="scope">

src/views/backStageManage/application/apply/index copy.vue

@@ -79,7 +79,7 @@
           </el-form-item>
          
         </el-form>
-          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  max-height="250" border>
+          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  height="250" border>
             <!-- <el-table-column type="index" label="#" width="55" align="center"></el-table-column> -->
             <el-table-column prop="name" label="租户名称" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="contacts" label="联系人" align="center" show-overflow-tooltip></el-table-column>

src/views/backStageManage/application/function/index copy.vue

@@ -79,7 +79,7 @@
           </el-form-item>
          
         </el-form>
-          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  max-height="250" border>
+          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  height="250" border>
             <!-- <el-table-column type="index" label="#" width="55" align="center"></el-table-column> -->
             <el-table-column prop="name" label="租户名称" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="contacts" label="联系人" align="center" show-overflow-tooltip></el-table-column>

src/views/backStageManage/application/vipType/vipType.vue

@@ -30,7 +30,7 @@
           border
           row-key="id"
           style="width: 100%"
-          max-height="calc(100% - 40px)"
+          height="calc(100% - 0px)"
           v-loading="loading"
       >
           <el-table-column type="index" label="序号" align="center" width="120px">

src/views/backStageManage/application/vision/vision.vue

@@ -35,7 +35,7 @@
             :data="tableData"
             row-key="id"
             style="width: 100%"
-            max-height="calc(100% - 0)"
+            height="calc(100% - 0)"
             v-loading="loading"
             @sort-change="sortChange"
         >

src/views/backStageManage/examine/examine/components/examine.vue

@@ -22,7 +22,7 @@
                 :data="tableData"
                 row-key="id"
                 style="width: 100%"
-                max-height="calc(100% - 0)"
+                height="calc(100% - 0)"
                 v-loading="loading"
                 @sort-change="sortChange"
                 @selection-change="handleSelectionChange"

src/views/backStageManage/examine/examine/components/view/table.vue

@@ -6,7 +6,7 @@
         :data="tableData"
         row-key="id"
         style="width: 100%"
-        max-height="calc(100% - 0)"
+        height="calc(100% - 0)"
         v-loading="loading"
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"

src/views/backStageManage/organization/department/components/department.vue

@@ -21,7 +21,7 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              max-height="calc(100% - 0)"
+              height="calc(100% - 0)"
               v-loading="loading"
           >
               <el-table-column prop="name" label="部门名称" align="" show-overflow-tooltip></el-table-column>

src/views/backStageManage/organization/position/position.vue

@@ -26,7 +26,7 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              max-height="calc(100% - 0)"
+              height="calc(100% - 0)"
               v-loading="loading"
           >
             <el-table-column prop="position" label="职位名称"></el-table-column>

src/views/backStageManage/paymentCode/paymentCode/components/form/paymentCode.vue

@@ -132,7 +132,7 @@ export default {
 						},
 					],
             },
-            tableData:[]
+            tableData:[],
         };
     },
     watch: {
@@ -140,6 +140,10 @@ export default {
             if(this.$route.path != '/administrator/editPaymentCode'){
                 return
             }
+            if(this.form.id == this.id){
+                return
+            }
+            
             this.init()
         },
     },
@@ -163,7 +167,7 @@ export default {
             }
         },
         //查询数据并校验
-        getById(){
+        async getById(){
             if(!this.id){
                 this.$message.error('编辑缺少参数')
                 return
@@ -171,7 +175,7 @@ export default {
             var params = {
                 ids: [this.id],
             };
-            this.$api.getPaymentCode(params).then(response=>{
+            await this.$api.getPaymentCode(params).then(response=>{
                 if(response.code == 200){
                     var data = response.data.records
                     if(data && data.length>0){
@@ -209,7 +213,7 @@ export default {
                         if (response.code === 200) {
                             this.btnLoading = false
                             this.$message.success( a + '成功');
-                            this.finish()
+                            this.finish(response.data)
                         }
                     })
                     .catch(error => {
@@ -219,10 +223,16 @@ export default {
                 }
             });
         },
-        finish(){
+        finish(data){
             if(this.model == 'add'){
-                this.resetForm();
-                this.init()
+                this.$alert('付费码：'+data, '添加成功', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                        this.resetForm();
+                        this.init()
+                    }
+                });
+                
             }else{
                 this.$store.commit('removeHistoryPath',this.$route.path);
                 this.$store.commit('removeHistory',this.$route.path);

src/views/backStageManage/paymentCode/paymentCode/components/paymentCode.vue

@@ -28,7 +28,7 @@
             border
             row-key="id"
             style="width: 100%"
-            max-height="calc(100% - 40px)"
+            height="calc(100% - 0px)"
             v-loading="loading"
         >
             <el-table-column type="index" label="序号" align="center" width="120px">