1

src/store/modules/permission.js

@@ -32,6 +32,7 @@ const permission = {
             resolve(response)
           }
         }).catch(error=>{
+          commit('SET_PERMISSION',[])
           reject(error)
         })
       })

src/views/backStageManage/organization/tenant/components/form/tenant.vue

@@ -5,7 +5,7 @@
                 <el-button size="small"  @click="init">重 置</el-button>
         </div>
         <div class="form_center" :class="model == 'detail'?'pointer_events_none':''">
-            <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="left">
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
                 <el-form-item label="租户名称" prop="tenant">
                     <el-input v-model="form.name" placeholder="请输入租户名称" :readonly="true"></el-input>
                 </el-form-item>
@@ -17,8 +17,7 @@
                 <el-form-item label="状态" prop="state">
                     <el-switch
                         style="display: block"
-                        v-model="scope.row.state"
-                        @change="(val)=>changeState(scope.row,val)"
+                        v-model="form.state"
                         active-color="#13ce66"
                         inactive-color="red"
                         :active-value="1"
@@ -28,7 +27,7 @@
                     </el-switch>
                 </el-form-item>
                 <el-form-item label="类型" prop="type">
-                    <el-select v-model="form.type" placeholder="请选择企业类型">
+                    <el-select v-model="form.type" style="width:100%" placeholder="请选择企业类型">
                         <el-option v-for="item in tenantType" :key="item.dictChildValue" :label="item.dictChildLabel" :value="Number(item.dictChildValue)"></el-option>
                     </el-select>
                 </el-form-item>

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

@@ -27,6 +27,15 @@
                         <div>{{ getTenantName(scope.row.tenantType) }}</div>
                     </template>
                 </el-table-column>
+                <el-table-column prop="vipTypes" label="购买会员信息">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.vipTypes && scope.row.vipTypes.length">
+                            <div v-for="item in scope.row.vipTypes" :key="item.vipTypeId">
+                                {{ item.vipTypeName }} : {{ item.vipTypeNum }}
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column label="是否启用" align="center" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <el-switch