浏览代码

修改样式

zhangdan 4 年之前
父节点
当前提交
eb377e4369

+ 21 - 8
src/views/SupervisionAuth/role/roleList.vue

@@ -34,8 +34,19 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.isEnable" @change="changeFlagHandle(text, record)" v-hasPermission="'B_power_role_del'" id="roleList-changeFlagHandle"/>
+        <a-switch
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          v-model="record.isEnable"
+          @change="changeFlagHandle(text, record)"
+          v-hasPermission="'B_power_role_del'"
+          id="roleList-changeFlagHandle"/>
       </span>
+      <!-- 角色描述 -->
+      <template slot="remarks" slot-scope="text, record">
+        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks }}</span>
+
+      </template>
       <span slot="action" slot-scope="text, record">
         <a class="action-button menu-text" @click="openMenuModal(record)" v-hasPermission="'M_power_role_menu'" id="roleList-openMenuModal">菜单权限</a>
         <a class="action-button" @click="handleEdit(record)" v-hasPermission="'B_supervision_role_edit'" id="roleList-handleEdit">修改</a>
@@ -75,36 +86,38 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          width: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '创建时间',
           dataIndex: 'createDate',
-          minWidth: '100',
+          width: 200,
           align: 'center'
         },
         {
           title: '角色名称',
           dataIndex: 'name',
-          minWidth: '100',
+          width: 150,
           align: 'center'
         },
         {
           title: '角色描述',
           dataIndex: 'remarks',
-          minWidth: '100',
-          align: 'center'
+          width: 200,
+		  ellipsis: true, // 内容超过宽度 自动出现省略号
+          align: 'center',
+		  scopedSlots: { customRender: 'remarks' }
         },
         {
           title: '状态',
-          minWidth: '100',
+          width: 150,
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '操作',
-          minWidth: '100',
+          width: 200,
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

+ 4 - 4
src/views/SupervisionAuth/role/roleModal.vue

@@ -6,8 +6,8 @@
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
             placeholder="请输入角色名称30个字以内"
-			allowClear
-			id="roleModal-name"
+            allowClear
+            id="roleModal-name"
             :maxLength="30"
             v-decorator="['formData.name', {
               initialValue: formData.name,
@@ -18,7 +18,7 @@
         <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
             name="radioGroup"
-			id="roleModal-isEnable"
+            id="roleModal-isEnable"
             v-decorator="[
               'formData.isEnable',
               {
@@ -33,7 +33,7 @@
 
         <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-textarea
-			id="roleModal-remarks"
+            id="roleModal-remarks"
             v-decorator="[
               'formData.remarks',
               { initialValue: formData.remarks,

+ 3 - 3
src/views/SupervisionAuth/user/newStoreModal.vue

@@ -70,18 +70,18 @@ export default {
       columns: [{
         title: '序号',
         dataIndex: 'no',
-        minWidth: '100',
+        width: 60,
         align: 'center'
       },
       {
         title: '门店名称',
         dataIndex: 'storeName',
-        minWidth: '100',
+        width: 100,
         align: 'center'
       },
       {
         title: '操作',
-        minWidth: '100',
+        width: 100,
         align: 'center',
         scopedSlots: {
           customRender: 'action'

+ 3 - 3
src/views/SupervisionAuth/user/usedStoreModal.vue

@@ -53,19 +53,19 @@ export default {
       columns: [{
         title: '序号',
         dataIndex: 'no',
-        minWidth: '100',
+         width: 60,
         align: 'center'
       },
       {
         title: '门店名称',
         dataIndex: 'storeName',
-        minWidth: '100',
+        width: 100,
         align: 'center'
       },
       {
         title: '操作',
         key: '操作',
-        minWidth: '100',
+        width: 100,
         align: 'center',
         scopedSlots: {
           customRender: 'action'

+ 9 - 9
src/views/SupervisionAuth/user/userList.vue

@@ -9,7 +9,7 @@
                 allowClear
                 v-model.trim="queryParam.name"
                 id="userList-name"
-				:maxLength="30"
+                :maxLength="30"
                 @pressEnter="$refs.table.refresh(true)"
                 placeholder="请输入员工姓名" />
             </a-form-item>
@@ -20,7 +20,7 @@
                 allowClear
                 v-model.trim="queryParam.phone"
                 id="userList-phone"
-				:maxLength="11"
+                :maxLength="11"
                 @pressEnter="$refs.table.refresh(true)"
                 placeholder="请输入手机号码" />
             </a-form-item>
@@ -121,37 +121,37 @@ export default {
       columns: [{
         title: '序号',
         dataIndex: 'no',
-        minWidth: '100',
+        width: 60,
         align: 'center'
       },
       {
         title: '创建时间',
         dataIndex: 'createDate',
-        minWidth: '100',
+        width: 200,
         align: 'center'
       },
       {
         title: '员工姓名',
         dataIndex: 'name',
-        minWidth: '100',
+        width: 150,
         align: 'center'
       },
       {
         title: '手机号码',
         dataIndex: 'phone',
-        minWidth: '100',
+        width: 150,
         align: 'center'
       },
       {
         title: '角色',
         dataIndex: 'roleNames',
-        minWidth: '100',
+        width: 200,
         align: 'center'
       },
       {
         title: '启用状态',
         dataIndex: 'loginFlag',
-        minWidth: '100',
+        width: 150,
         align: 'center',
         scopedSlots: {
           customRender: 'loginFlag'
@@ -160,7 +160,7 @@ export default {
       {
         title: '操作',
         dataIndex: 'action',
-        minWidth: '100',
+        width: 200,
         align: 'center',
         scopedSlots: {
           customRender: 'action'

+ 1 - 2
src/views/SupervisionAuth/user/userModal.vue

@@ -14,7 +14,6 @@
             <a-form-item label="员工姓名" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入员工姓名30个字以内"
-                :maxLength="30"
                 id="userModal-name"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,
@@ -59,7 +58,7 @@
             <a-form-item label="角色" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-select
                 id="userModal-roleNames"
-				allowClear
+                allowClear
                 v-decorator="[
                   'formData.roleNames',
                   {

+ 13 - 7
src/views/power/role/roleList.vue

@@ -54,7 +54,11 @@
           @change="changeFlagHandle(record)"
           v-hasPermission="'B_power_role_enable'"/>
       </span>
+      <!-- 角色描述 -->
+      <template slot="remarks" slot-scope="text, record">
+        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks }}</span>
 
+      </template>
       <span slot="action" slot-scope="text, record">
         <template>
           <a class="action-button menu-text" @click="openMenuModal(record)" id="roleList-openMenuModal" v-hasPermission="'M_power_role_menu'">菜单权限</a>
@@ -94,36 +98,38 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          width: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '角色名称',
           dataIndex: 'name',
-          width: '100',
+          width: 150,
           align: 'center'
         },
         {
           title: '角色描述',
           dataIndex: 'remarks',
-          width: '100',
-          align: 'center'
+          width: 200,
+          ellipsis: true, // 内容超过宽度 自动出现省略号
+          align: 'center',
+          scopedSlots: { customRender: 'remarks' }
         },
         {
           title: '状态',
-          width: '100',
+          width: 150,
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '创建时间',
           dataIndex: 'createDate',
-          width: '120',
+          width: 200,
           align: 'center'
         },
         {
           title: '操作',
-          width: '100',
+          width: 200,
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

+ 0 - 1
src/views/power/role/roleModal.vue

@@ -8,7 +8,6 @@
             placeholder="请输入角色名称30个字以内"
 			allowClear
 			id="roleModal-name"
-            :maxLength="30"
             v-decorator="['formData.name', {
               initialValue: formData.name,
               rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"

+ 7 - 7
src/views/power/user/userList.vue

@@ -100,43 +100,43 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          width: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '用户名称',
           dataIndex: 'name',
-          width: '100',
+          width: 150,
           align: 'center'
         },
         {
           title: '手机号码',
           dataIndex: 'phone',
-          width: '100',
+          width: 150,
           align: 'center'
         },
         {
           title: '角色',
-          width: '100',
+          width: 200,
           align: 'center',
           scopedSlots: { customRender: 'roleNames' }
         },
         {
           title: '状态',
-          width: '100',
+          width: 150,
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '创建时间',
           dataIndex: 'createDate',
-          width: '120',
+          width: 200,
           align: 'center'
         },
         {
           title: '操作',
-          width: '100',
           align: 'center',
+          width: 200,
           scopedSlots: { customRender: 'action' }
         }
       ],

+ 2 - 3
src/views/power/user/userModal.vue

@@ -8,8 +8,7 @@
             <a-form-item label="用户名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入用户名称30个字以内"
-				allowClear
-                :maxLength="30"
+                allowClear
                 id="userModal-name"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,
@@ -21,7 +20,7 @@
             <a-form-item label="手机号码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入手机号码"
-				allowClear
+                allowClear
                 :maxLength="11"
                 id="userModal-phone"
                 v-decorator="['formData.phone', {