Merge branch 'feature/4月-菜单和权限' into test

src/components/app/customer/select-group.vue

@@ -11,12 +11,12 @@
   import selectGroup from '@/components/app/customer/select-group.vue';
  -->
 <template>
-  <el-dialog title="选择分组" :visible.sync="dialogVisible" width="833px" :before-close="handleClose">
+  <el-dialog class="select-table-dialog" title="选择分组" :visible.sync="dialogVisible" width="833px" :before-close="handleClose">
     <div class="">
       <div class="search-top m-b-20">
         <el-input placeholder="请输入分组名称搜索" maxlength="50" prefix-icon="el-icon-search" v-model="searchInput" class="w-280" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"> </el-input>
       </div>
-      <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" height="450" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
+      <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" height="33vh" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column label="分组名称">
           <template slot-scope="scope">
@@ -47,8 +47,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
-        <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
+      <div class="block common-wrap__page text-right" v-if="tableData.length != 0">
+        <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total" style="margin-bottom: 0"> </dm-pagination>
       </div>
     </div>
     <div slot="footer" class="dialog-footer">
@@ -188,6 +188,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.select-table-dialog {
+  >>> .el-dialog__body {
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+}
 .m-b-20 {
   margin-bottom: 20px;
 }

src/views/apps/customerApp/memberGroupSetList.vue

@@ -22,22 +22,29 @@
     </div>
     <div class="m-t-20">
       <el-table class="select-table" ref="tempTable" v-loading="loading" :data="templateList" tooltip-effect="dark" :style="{ width: '100%' }">
-        <el-table-column label="模板名称" show-overflow-tooltip>
+        <el-table-column label="模板名称" show-overflow-tooltip min-width="150">
           <template slot-scope="scope">{{ scope.row.templateName }}</template>
         </el-table-column>
-        <el-table-column label="模板id" show-overflow-tooltip>
+        <el-table-column label="模板id" show-overflow-tooltip min-width="150">
           <template slot-scope="scope">{{ scope.row.templateId }}</template>
         </el-table-column>
-        <el-table-column label="编辑人" show-overflow-tooltip>
+        <el-table-column label="创建人" prop="creatorName" show-overflow-tooltip min-width="90"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" min-width="80">
+          <template slot-scope="scope">
+            <div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
+            <div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="编辑人" show-overflow-tooltip min-width="90">
           <template slot-scope="scope">{{ scope.row.editPerson }}</template>
         </el-table-column>
-        <el-table-column prop="" label="最近编辑时间" show-overflow-tooltip>
+        <el-table-column prop="" label="最近编辑时间" show-overflow-tooltip min-width="80">
           <template slot-scope="scope">
             <div class="line-18">{{ scope.row.editTime | timeStampToYmd }}</div>
             <div class="line-18">{{ scope.row.editTime | timeStampToHms }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" v-if="$getButtonLimit($buttonCode.editGroupTemp) || $getButtonLimit($buttonCode.setStoreArea) || $getButtonLimit($buttonCode.delGroupTemp)">
+        <el-table-column label="操作" v-if="$getButtonLimit($buttonCode.editGroupTemp) || $getButtonLimit($buttonCode.setStoreArea) || $getButtonLimit($buttonCode.delGroupTemp)" min-width="150">
           <template slot-scope="scope">
             <el-button v-if="$getButtonLimit($buttonCode.editGroupTemp)" :limit-code="$buttonCode.editGroupTemp" @click="toEdit(scope.$index, scope.row)" type="text" :disabled="$store.state.wxEnterpriseType">编辑</el-button>
             <el-button v-if="$getButtonLimit($buttonCode.setStoreArea)" :limit-code="$buttonCode.setStoreArea" @click="toStore(scope.$index, scope.row)" type="text" :disabled="$store.state.wxEnterpriseType">门店范围设置</el-button>