完善

src/views/sys/menu/CheckAndEditModel.vue

@@ -12,7 +12,12 @@
         <a-input v-model="model.menuName" />
       </a-form-model-item>
       <a-form-model-item label="类型" prop="menuType">
-        <a-input v-model="model.menuType" style="width: 100%" />
+        <j-dict-select-tag
+          v-model="model.menuType"
+          style="width: 100%"
+          placeholder="菜单类型"
+          dict-code="menu_type"
+        />
       </a-form-model-item>
       <a-form-model-item label="权限标识" prop="perms">
         <a-input v-model="model.perms" style="width: 100%" />

src/views/sys/menu/index.vue

@@ -48,13 +48,24 @@
         bordered
         row-key="menuId"
         :columns="columns"
-        :defaultExpandedRowKeys="[100]"
+        :default-expanded-row-keys="[100]"
         :data-source="dataSource"
         :pagination="ipagination"
         :loading="loading"
         :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
+        <template slot="menuType" slot-scope="text, record">
+          <a-tag v-if="record.menuType === 'M'" color="#f50">
+            目录
+          </a-tag>
+          <a-tag v-if="record.menuType === 'C'" color="#2db7f5">
+            菜单
+          </a-tag>
+          <a-tag v-if="record.menuType === 'F'" color="#87d068">
+            按钮
+          </a-tag>
+        </template>
         <template slot="status" slot-scope="text, record">
           <a-switch
             :checked="record.status==='1'?false:true"

src/views/sys/menu/indexColumns.js

@@ -9,6 +9,7 @@ function columns(vm) {
       title: '类型',
       align: 'center',
       dataIndex: 'menuType',
+      scopedSlots: { customRender: 'menuType' },
       key: 'menuType'
     },
     {

src/views/sys/worker/CheckAndEditModel.vue

@@ -8,8 +8,8 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="员工姓名:" prop="nickName">
-        <a-input v-model="model.nickName" />
+      <a-form-model-item label="员工姓名:" prop="realName">
+        <a-input v-model="model.realName" />
       </a-form-model-item>
       <a-form-model-item label="登录账号:" prop="userName">
         <a-input v-model="model.userName" />
@@ -31,20 +31,20 @@
           dict-code="role"
         />
       </a-form-model-item>
-      <a-form-model-item label="职工工号" prop="userName">
-        <a-input v-model="model.userName" />
+      <a-form-model-item label="职工工号" prop="nickName">
+        <a-input v-model="model.nickName" />
       </a-form-model-item>
-      <a-form-model-item label="手机号码" prop="phonenumber">
-        <a-input v-model="model.phonenumber" />
+      <a-form-model-item label="手机号码" prop="phone">
+        <a-input v-model="model.phone" />
       </a-form-model-item>
       <a-form-model-item label="微信账号">
-        <a-input v-model="model.userName" />
+        <a-input v-model="model.wechat" />
       </a-form-model-item>
       <a-form-model-item label="邮箱地址">
         <a-input v-model="model.email" />
       </a-form-model-item>
       <a-form-model-item label="出生日期">
-        <a-input v-model="model.userName" />
+        <a-date-picker style="width: 100%" v-model="model.birthday" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择"/>
       </a-form-model-item>
       <a-form-model-item label="性别">
         <j-dict-select-tag
@@ -76,11 +76,11 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        nickName: [{ required: true, message: '请输入' }],
+        realName: [{ required: true, message: '请输入' }],
         deptId: [{ required: true, message: '请选择' }],
-        userName: [{ required: true, message: '请选择' }],
+        nickName: [{ required: true, message: '请选择' }],
         roles: [{ required: true, message: '请选择' }],
-        phonenumber: [{ required: true, message: '请输入' }]
+        phone: [{ required: true, message: '请输入' }]
       },
       url: {
         add: '/system/user',

src/views/sys/worker/indexColumns.js

@@ -12,8 +12,8 @@ function columns(vm) {
     {
       title: '姓名',
       align: 'center',
-      dataIndex: 'nickName',
-      key: 'nickName'
+      dataIndex: 'realName',
+      key: 'realName'
     },
     {
       title: '部门',
@@ -32,8 +32,8 @@ function columns(vm) {
     {
       title: '手机号',
       align: 'center',
-      dataIndex: 'phonenumber',
-      key: 'phonenumber'
+      dataIndex: 'phone',
+      key: 'phone'
     },
     {
       title: '状态',