Ver código fonte

非必填字段显示--以及去掉确认框

zhangdan 4 anos atrás
pai
commit
7f25deecee

+ 1 - 11
src/views/SupervisionAuth/role/menuModal.vue

@@ -94,17 +94,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 1 - 1
src/views/SupervisionAuth/role/roleList.vue

@@ -44,7 +44,7 @@
       </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>
+        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks ?record.remarks :'--' }}</span>
       </template>
       <span slot="action" slot-scope="text, record">
         <a-icon

+ 7 - 17
src/views/SupervisionAuth/role/roleModal.vue

@@ -5,13 +5,13 @@
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
-            placeholder="请输入角色名称30个字以内"
+            placeholder="请输入角色名称(最多30个字符)"
             allowClear
             :maxLength="30"
             id="roleModal-name"
             v-decorator="['formData.name', {
               initialValue: formData.name,getValueFromEvent: $filterEmpty,
-              rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+              rules: [{ required: true, message: '请输入角色名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
           />
         </a-form-item>
         <!-- 状态 -->
@@ -40,16 +40,16 @@
                 rules: [] },
             ]"
             style="min-height: 60px;"
-            placeholder="输入内容500个字以内"
+            placeholder="请输入角色描述(最多500个字符)"
             :maxLength="500"
             autosize />
         </a-form-item>
 
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit">
+        <a-form-item :wrapper-col="{ span: 24, offset: 10}" >
+          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">
             取消
           </a-button>
         </a-form-item>
@@ -118,17 +118,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 6 - 16
src/views/SupervisionAuth/user/userModal.vue

@@ -13,12 +13,12 @@
             <!-- 用户名称 -->
             <a-form-item label="员工姓名" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
-                placeholder="请输入员工姓名30个字以内"
+                placeholder="请输入员工姓名(最多30个字符)"
                 :maxLength="30"
                 id="userModal-name"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,getValueFromEvent: $filterEmpty,
-                  rules: [{ required: true, message: '请输入员工姓名30个字以内!' }] }]"
+                  rules: [{ required: true, message: '请输入员工姓名(最多30个字符)!' }] }]"
                 allowClear />
             </a-form-item>
           </a-col>
@@ -115,11 +115,11 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
-          <a-button type="primary" @click="handleSubmit()" id="userModal-handleSubmit">
+        <a-form-item :wrapper-col="{  span: 24, offset: 10 }">
+          <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '15px' }" id="userModal-handleSubmit">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '50px' }" @click="handleCancel()" id="userModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="userModal-handleCancel">
             取消
           </a-button>
         </a-form-item>
@@ -250,17 +250,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 1 - 11
src/views/power/role/menuModal.vue

@@ -96,17 +96,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

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

@@ -56,7 +56,7 @@
       </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>
+        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks ?record.remarks : '--' }}</span>
 
       </template>
       <span slot="action" slot-scope="text, record">
@@ -80,7 +80,9 @@
           @click="delect(record)"/>
       </span>
     </s-table>
+    <!-- 新增、编辑弹窗 -->
     <roleModal :visible="showModal" :data="itemData" @refresh="refreshTable" @close="showModal = false"></roleModal>
+    <!-- 菜单权限弹窗 -->
     <menuModal :visible="showMenuModal" :data="menuData" @close="showMenuModal = false"></menuModal>
   </a-card>
 </template>
@@ -114,6 +116,12 @@ export default {
           width: 60,
           align: 'center'
         },
+        {
+		  title: '创建时间',
+		  dataIndex: 'createDate',
+		  width: 200,
+		  align: 'center'
+        },
         {
           title: '角色名称',
           dataIndex: 'name',
@@ -134,12 +142,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '创建时间',
-          dataIndex: 'createDate',
-          width: 200,
-          align: 'center'
-        },
         {
           title: '操作',
           width: 200,

+ 7 - 17
src/views/power/role/roleModal.vue

@@ -5,13 +5,13 @@
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
-            placeholder="请输入角色名称30个字以内"
+            placeholder="请输入角色名称(最多30个字符)"
             allowClear
             :maxLength="30"
             id="roleModal-name"
             v-decorator="['formData.name', {
               initialValue: formData.name,getValueFromEvent: $filterEmpty,
-              rules: [{ required: true, message: '请输入角色名称30个字以内!' }] }]" />
+              rules: [{ required: true, message: '请输入角色名称(最多30个字符)!' }] }]" />
         </a-form-item>
         <!-- 状态 -->
         <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
@@ -37,16 +37,16 @@
                 rules: [] },
             ]"
             style="min-height: 60px;"
-            placeholder="输入内容500个字以内"
+            placeholder="请输入角色描述(最多500个字符)"
             :maxLength="500"
             autosize />
         </a-form-item>
 
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit">
+        <a-form-item :wrapper-col="{ span: 24, offset: 10 }">
+          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">
             取消
           </a-button>
         </a-form-item>
@@ -122,17 +122,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 11 - 10
src/views/power/user/userList.vue

@@ -64,10 +64,10 @@
           @change="changeFlagHandle(text, record)"
           v-hasPermission="'B_power_user_enable'"/>
       </span>
-      <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
+      <!-- <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
         <span v-else>无</span>
-      </div>
+      </div> -->
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="unlock"
@@ -120,6 +120,12 @@ export default {
           width: 60,
           align: 'center'
         },
+        {
+		  title: '创建时间',
+		  dataIndex: 'createDate',
+		  width: 200,
+		  align: 'center'
+        },
         {
           title: '用户名称',
           dataIndex: 'name',
@@ -135,8 +141,9 @@ export default {
         {
           title: '角色',
           width: 200,
-          align: 'center',
-          scopedSlots: { customRender: 'roleNames' }
+		  dataIndex: 'roleNames',
+          align: 'center'
+          // scopedSlots: { customRender: 'roleNames' }
         },
         {
           title: '状态',
@@ -144,12 +151,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '创建时间',
-          dataIndex: 'createDate',
-          width: 200,
-          align: 'center'
-        },
         {
           title: '操作',
           align: 'center',

+ 5 - 15
src/views/power/user/userModal.vue

@@ -13,14 +13,14 @@
             <!-- 用户名称 -->
             <a-form-item label="用户名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
-                placeholder="请输入用户名称30个字以内"
+                placeholder="请输入用户名称(最多30个字符)"
                 allowClear
                 :maxLength="30"
                 id="userModal-name"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,
                   getValueFromEvent: $filterEmpty,
-                  rules: [{ required: true, message: '请输入用户名称30个字以内!' }] }]" />
+                  rules: [{ required: true, message: '请输入用户名称(最多30个字符)!' }] }]" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -106,12 +106,12 @@
                     rules: [] },
                 ]"
                 style="min-height: 50px;"
-                placeholder="输入内容为500个字以内"
+                placeholder="请输入备注(最多500个字符)"
                 autosize />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
+        <a-form-item :wrapper-col="{  span: 24, offset: 10 }">
           <a-button type="primary" @click="handleSubmit()" id="userModal-handleSubmit">
             保存
           </a-button>
@@ -197,17 +197,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()