diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index a9c9108..0c3f1a3 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -116,15 +116,24 @@
-
-
+
+ format="yyyy-MM-dd"
+ placeholder="选择日期时间"
+ style="width:200px" @change="changeTime">
+
+
+
+
@@ -193,7 +202,23 @@ export default {
uploadUrl: '',
// 富文本end
fileList: [],
- isAble: false
+ isAble: false,
+ pickerBeginDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dataForm.newsReleaseEndTime
+ if (beginDateVal) {
+ return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+ }
+ }
+ },
+ pickerBeginDateAfter: {
+ disabledDate: (time) => {
+ let EndDateVal = this.dataForm.newsReleaseStartTime
+ if (EndDateVal) {
+ return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+ }
+ }
+ }
}
},
activated () {
@@ -348,10 +373,7 @@ export default {
}
this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
},
- setRegistTime () {
- this.dataForm.newsReleaseStartTime = this.time[0]
- this.dataForm.newsReleaseEndTime = this.time[1]
- },
+
// 上传图片end
// 表单提交
dataFormSubmitHandle: debounce(function () {
@@ -512,6 +534,17 @@ export default {
},
handelError () {
this.loading = false
+ },
+ changeTime (dateValue) {
+ var startTimeIsNull = this.dataForm.newsReleaseStartTime === '' || this.dataForm.newsReleaseStartTime === 'null' || this.dataForm.newsReleaseStartTime === null
+ var endTimeIsNull = this.dataForm.newsReleaseEndTime === '' || this.dataForm.newsReleaseEndTime === 'null' || this.dataForm.newsReleaseEndTime === null
+ if (dateValue === null || dateValue === '' || dateValue === 'null') {
+ this.dataForm.newsReleaseStartTime = ''
+ this.dataForm.newsReleaseEndTime = ''
+ } else if (startTimeIsNull || endTimeIsNull) {
+ this.dataForm.newsReleaseStartTime = dateValue
+ this.dataForm.newsReleaseEndTime = dateValue
+ }
}
},
components: {
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index f1fe891..d873bf9 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -52,20 +52,27 @@
placeholder="请输入"
clearable>
-
-
-
-
-
-
- 注册时间
-
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
@@ -179,6 +186,22 @@ export default {
state: '0',
nickname: ''
},
+ pickerBeginDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dataForm.endTime
+ if (beginDateVal) {
+ return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+ }
+ }
+ },
+ pickerBeginDateAfter: {
+ disabledDate: (time) => {
+ let EndDateVal = this.dataForm.startTime
+ if (EndDateVal) {
+ return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+ }
+ }
+ },
deptIdList: [],
options: [],
userDetailVisible: false,
@@ -203,6 +226,7 @@ export default {
this.options = res.data.options
})
.catch(() => { })
+ this.initTime()
},
watch: {
'deptIdList': function (val) {
@@ -233,6 +257,34 @@ export default {
}
},
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
+ },
getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) {