Compare commits

..

No commits in common. 'a2adf2ce20d690d333c994fca55748e856d38602' and 'aa5382f199360bc9b8409c92a5989584118f99f4' have entirely different histories.

  1. 4
      src/plugins/cache/index.js
  2. 12
      src/views/Pers/Employee/Comp/DialogEmployee.vue
  3. 2
      src/views/Pers/Employee/index.vue

@ -26,7 +26,7 @@ const sessionCache = {
let storage = storageStr ? JSON.parse(storageStr) : {}
return storage[key]
},
delete(key) {
remove(key) {
if (!sessionStorage) {
return null
}
@ -62,7 +62,7 @@ const localCache = {
let storage = storageStr ? JSON.parse(storageStr) : {}
return storage[key]
},
delete(key) {
remove(key) {
if (!localStorage) {
return null
}

@ -114,17 +114,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="离职日期" prop="retireDate">
<el-date-picker
v-model="formData.retireDate"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
@ -241,7 +230,6 @@ const resetForm = () => {
remark: '',
status: CommonStatusEnum.ENABLE,
hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
retireDate: undefined,
attendanceSettingId: undefined,
instanceIds: []
}

@ -30,7 +30,7 @@
<el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column label="姓名" prop="name" />
<el-table-column label="用户姓名" prop="name" />
<el-table-column label="职位" prop="post" />
<el-table-column label="手机号码" prop="mobile" width="120" />
<el-table-column label="考勤方案" prop="attendanceSettingName" />

Loading…
Cancel
Save