Browse Source

全局notify变message/登记时间范围限制

master
xuhuajiao 3 years ago
parent
commit
adf22f175c
  1. 6
      src/components/Crud/crud.js
  2. 23
      src/utils/request.js
  3. 24
      src/views/archivesManage/lendManage/toLend/module/lendRecord.vue

6
src/components/Crud/crud.js

@ -492,9 +492,9 @@ function CRUD(options) {
findVM(type) { findVM(type) {
return crud.vms.find(vm => vm && vm.type === type).vm return crud.vms.find(vm => vm && vm.type === type).vm
}, },
notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) {
crud.vms[0].vm.$notify({
title,
notify(message, type = CRUD.NOTIFICATION_TYPE.INFO) {
crud.vms[0].vm.$message({
message,
type, type,
duration: 2500 duration: 2500
}) })

23
src/utils/request.js

@ -1,6 +1,7 @@
import axios from 'axios' import axios from 'axios'
import router from '@/router/routers' import router from '@/router/routers'
import { Notification } from 'element-ui'
// import { Notification } from 'element-ui'
import { Message } from 'element-ui'
import store from '../store' import store from '../store'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import Config from '@/settings' import Config from '@/settings'
@ -36,8 +37,8 @@ service.interceptors.response.use(
if (response.data.code === 200) { if (response.data.code === 200) {
return response.data.data return response.data.data
} else { } else {
Notification.error({
title: errorMsg,
Message.error({
message: errorMsg,
duration: 5000 duration: 5000
}) })
} }
@ -49,8 +50,8 @@ service.interceptors.response.use(
reader.readAsText(error.response.data, 'utf-8') reader.readAsText(error.response.data, 'utf-8')
reader.onload = function(e) { reader.onload = function(e) {
const errorMsg = JSON.parse(reader.result).message const errorMsg = JSON.parse(reader.result).message
Notification.error({
title: errorMsg,
Message.error({
message: errorMsg,
duration: 5000 duration: 5000
}) })
} }
@ -60,8 +61,8 @@ service.interceptors.response.use(
code = error.response.data.status code = error.response.data.status
} catch (e) { } catch (e) {
if (error.toString().indexOf('Error: timeout') !== -1) { if (error.toString().indexOf('Error: timeout') !== -1) {
Notification.error({
title: '网络请求超时',
Message.error({
message: '网络请求超时',
duration: 5000 duration: 5000
}) })
return Promise.reject(error) return Promise.reject(error)
@ -80,15 +81,15 @@ service.interceptors.response.use(
} else { } else {
const errorMsg = error.response.data.message const errorMsg = error.response.data.message
if (errorMsg !== undefined) { if (errorMsg !== undefined) {
Notification.error({
title: errorMsg,
Message.error({
message: errorMsg,
duration: 5000 duration: 5000
}) })
} }
} }
} else { } else {
Notification.error({
title: '接口请求失败',
Message.error({
message: '接口请求失败',
duration: 5000 duration: 5000
}) })
} }

24
src/views/archivesManage/lendManage/toLend/module/lendRecord.vue

@ -50,7 +50,16 @@
<el-input v-model="recordForm.idcard" /> <el-input v-model="recordForm.idcard" />
</el-form-item> </el-form-item>
<el-form-item label="借阅时间" prop="lendDates"> <el-form-item label="借阅时间" prop="lendDates">
<date-range-picker v-model="recordForm.lendDates" />
<!-- <date-range-picker v-model="recordForm.lendDates" /> -->
<el-date-picker
v-model="recordForm.lendDates"
value-format="yyyy-MM-dd hh:mm:ss"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
/>
</el-form-item> </el-form-item>
<el-form-item label="借阅目的" prop="purpose" class="down-select"> <el-form-item label="借阅目的" prop="purpose" class="down-select">
<el-select v-model="recordForm.purpose" placeholder="请选择"> <el-select v-model="recordForm.purpose" placeholder="请选择">
@ -76,11 +85,11 @@ import { FetchFindBorrowerByQuery, FetchRegisterBorrow } from '@/api/archivesMan
import { form } from '@crud/crud' import { form } from '@crud/crud'
import { validatePhone } from '@/utils/validate' import { validatePhone } from '@/utils/validate'
import { lendingCrud } from '../../mixins/lending' import { lendingCrud } from '../../mixins/lending'
import DateRangePicker from '@/components/DateRangePicker'
// import DateRangePicker from '@/components/DateRangePicker'
export default { export default {
name: 'LendRecord', name: 'LendRecord',
components: { DateRangePicker },
// components: { DateRangePicker },
mixins: [form({}), lendingCrud], mixins: [form({}), lendingCrud],
data() { data() {
return { return {
@ -103,6 +112,12 @@ export default {
lendDates: [{ required: true, trigger: 'change', message: '请选择借阅时间' }] lendDates: [{ required: true, trigger: 'change', message: '请选择借阅时间' }]
// idcard: [{ trigger: 'blur', validator: validateIdNo }] // idcard: [{ trigger: 'blur', validator: validateIdNo }]
}, },
// data()
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
},
borrowGoalOptions: [ borrowGoalOptions: [
{ value: '工作考察', label: '工作考察' }, { value: '工作考察', label: '工作考察' },
{ value: '学术考究', label: '学术考究' }, { value: '学术考究', label: '学术考究' },
@ -201,4 +216,7 @@ export default {
::v-deep .el-input__inner{ ::v-deep .el-input__inner{
width: 320px; width: 320px;
} }
::v-deep .el-range-editor--small .el-range-separator{
color: #fff;
}
</style> </style>
Loading…
Cancel
Save