Browse Source

【pc端 - 优化bug】-【统一时间控件等bug】-(魏凯)-2020/07/27

master
weikai 5 years ago
parent
commit
0b4ca2803b
  1. 8
      src/views/modules/custom/evaluateinfo.vue
  2. 8
      src/views/modules/custom/evaluateofficercount.vue
  3. 2
      src/views/modules/sys/params-add-or-update.vue
  4. 1
      src/views/modules/sys/resource-add-or-update.vue
  5. 4
      src/views/modules/sys/role-add-or-update.vue
  6. 29
      src/views/modules/user/partymembers.vue

8
src/views/modules/custom/evaluateinfo.vue

@ -119,17 +119,17 @@ export default {
optionList: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
}

8
src/views/modules/custom/evaluateofficercount.vue

@ -100,17 +100,17 @@ export default {
},
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
}

2
src/views/modules/sys/params-add-or-update.vue

@ -3,7 +3,7 @@
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
<el-form-item prop="paramCode" :label="$t('params.paramCode')">
<el-input v-model="dataForm.paramCode"
maxlength="50"
maxlength="30"
show-word-limit
:placeholder="$t('params.paramCode')"></el-input>
</el-form-item>

1
src/views/modules/sys/resource-add-or-update.vue

@ -28,6 +28,7 @@
<el-input
v-model="dataForm.resourceCode"
placeholder="请输入资源编码" maxlength="32"
show-word-limit
></el-input>
</el-form-item>

4
src/views/modules/sys/role-add-or-update.vue

@ -11,6 +11,8 @@
<el-form-item prop="name"
:label="$t('role.name')">
<el-input v-model="dataForm.name"
maxlength="30"
show-word-limit
:placeholder="$t('role.name')"></el-input>
</el-form-item>
<el-form-item label="角色类型">
@ -26,6 +28,8 @@
<el-form-item prop="remark"
:label="$t('role.remark')">
<el-input v-model="dataForm.remark"
maxlength="100"
show-word-limit
:placeholder="$t('role.remark')"></el-input>
</el-form-item>
<el-row>

29
src/views/modules/user/partymembers.vue

@ -334,10 +334,39 @@ export default {
.catch(() => { })
// this.getStreetList()
this.getRegistOptions()
this.initTime()
// this.getPostOptions()
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}`
},
methods: {
initTime () {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
this.time = [start, end]
let year = start.getFullYear()
let month = start.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let date = start.getDate()
if (date < 10) {
date = '0' + date
}
let startDate = year + '-' + month + '-' + date
let yearend = end.getFullYear()
let monthend = end.getMonth() + 1
if (monthend < 10) {
monthend = '0' + monthend
}
let dateend = end.getDate()
if (dateend < 10) {
dateend = '0' + dateend
}
let endDate = yearend + '-' + monthend + '-' + dateend
this.dataForm.startTime = startDate
this.dataForm.endTime = endDate
},
btKeyUpRealName (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~!#¥%……&*()={}|《》?:“”【】、;‘’,。、]/g, '')
this.dataForm.realName = e.target.value

Loading…
Cancel
Save