elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【pc端时间框选择时间优化】-张晓宁20200727

master
FightingN 5 years ago
parent
e17787ccbd
commit
12da8f4056
13 changed files with 125 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/modules/analysis/export/operation.vue
  2. 26
      src/views/modules/analysis/item/unsolved-item-list.vue
  3. 4
      src/views/modules/contentSecurity/checkrecords.vue
  4. 26
      src/views/modules/events/issue-change-list.vue
  5. 24
      src/views/modules/events/issue-close-list.vue
  6. 23
      src/views/modules/events/issue-reject-list.vue
  7. 3
      src/views/modules/events/issue-review-detail-view.vue
  8. 18
      src/views/modules/events/item-close-list.vue
  9. 32
      src/views/modules/events/item-deal-list.vue
  10. 20
      src/views/modules/events/item-end-list.vue
  11. 20
      src/views/modules/heart/actbanner.vue
  12. 2
      src/views/modules/master/masteruserrelation-add.vue
  13. 14
      src/views/modules/master/masteruserrelation.vue

4
src/views/modules/analysis/export/operation.vue
View File

@ -18,7 +18,7 @@
collapse-tags></el-cascader> collapse-tags></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-form-item label="时间筛选类型"> <el-form-item label="时间筛选类型" label-width="100px">
<template> <template>
<el-radio v-model="timeFlag" <el-radio v-model="timeFlag"
label="1">有效时间</el-radio> label="1">有效时间</el-radio>
@ -60,7 +60,7 @@
<br> <br>
<el-row> <el-row>
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button type="primary" <el-button type="success"
@click="this.exportHandlee">{{ $t('export') }}</el-button> @click="this.exportHandlee">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
</el-row> </el-row>

26
src/views/modules/analysis/item/unsolved-item-list.vue
View File

@ -32,7 +32,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@ -84,19 +84,35 @@ export default {
endTime: '', endTime: '',
searchContent: '' searchContent: ''
}, },
// pickerBeginDateBefore: {
// disabledDate: (time) => {
// let beginDateVal = this.dataForm.startTime
// if (beginDateVal) {
// return time.getTime() > new Date(beginDateVal+ ' 00:00:00').getTime()
// }
// }
// },
// pickerBeginDateAfter: {
// disabledDate: (time) => {
// let EndDateVal = this.dataForm.endTime
// if (EndDateVal) {
// return time.getTime() < new Date(EndDateVal+ ' 00:00:00').getTime()
// }
// }
// },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, },

4
src/views/modules/contentSecurity/checkrecords.vue
View File

@ -28,7 +28,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="时间" <el-form-item label="提交时间"
prop="startTime" label-width="75px"> prop="startTime" label-width="75px">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
@ -52,7 +52,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('news:checkrecords:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('news:checkrecords:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

26
src/views/modules/events/issue-change-list.vue
View File

@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
<br> <br>
<div> <div>
<el-form-item label="时间" prop="startTime" label-width="70px"> <el-form-item label="提交时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"
@ -82,7 +82,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -240,22 +240,22 @@
}], }],
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
} }
} }
}
} }
}, },
components: { components: {

24
src/views/modules/events/issue-close-list.vue
View File

@ -83,7 +83,7 @@
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -243,21 +243,21 @@
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
} }
} }
},
} }
}, },
components: { components: {

23
src/views/modules/events/issue-reject-list.vue
View File

@ -61,7 +61,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" <el-table v-loading="dataListLoading"
@ -159,21 +159,22 @@
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
} },
} }
}, },
components: { components: {

3
src/views/modules/events/issue-review-detail-view.vue
View File

@ -61,7 +61,8 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="处理意见:" prop="advice"> <el-form-item label="处理意见:" prop="advice">
<el-input :rows="4" v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input> <el-input :rows="4" v-model="dataForm.advice" type="textarea" maxlength="500"
placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="float: right;"> <el-form-item style="float: right;">
<el-button size="small" style="width: 95px" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> <el-button size="small" style="width: 95px" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>

18
src/views/modules/events/item-close-list.vue
View File

@ -80,7 +80,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -231,21 +231,21 @@
options: [], options: [],
detailVisible: false, detailVisible: false,
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
} },
} }
}, },
components: { components: {

32
src/views/modules/events/item-deal-list.vue
View File

@ -80,7 +80,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -232,22 +232,22 @@
}, },
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { 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
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
}
}
} }
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime;
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
} }
}, },
components: { components: {

20
src/views/modules/events/item-end-list.vue
View File

@ -80,7 +80,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -237,22 +237,22 @@
detailVisible: false, detailVisible: false,
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
} },
} }
}, },
components: { components: {

20
src/views/modules/heart/actbanner.vue
View File

@ -30,7 +30,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@ -80,7 +80,23 @@ export default {
status: '', status: '',
startTime: '', startTime: '',
endTime: '' endTime: ''
} },
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()
}
}
},
} }
}, },
components: { components: {

2
src/views/modules/master/masteruserrelation-add.vue
View File

@ -8,7 +8,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-for="(item, index) in this.formData" :key="index"> <div v-for="(item, index) in this.formData" :key="index">
<el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()"> <el-form :inline="true" :rules="dataRule" ref="item" :model="item" >
<div style="text-align: left;">{{"书记"+(index+1)+":"}}</div> <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
<el-row> <el-row>
<el-form-item label="选择书记：" prop="deptName"> <el-form-item label="选择书记：" prop="deptName">

14
src/views/modules/master/masteruserrelation.vue
View File

@ -36,10 +36,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataListOverWrite()" type="primary">{{ $t('query') }}</el-button> <el-button @click="getDataListOverWrite()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="success" @click="addHandle()">{{ $t('add') }}</el-button> <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item> <!-- <el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">测试按钮-新增</el-button> <el-button type="primary" @click="addOrUpdateHandle()">测试按钮-新增</el-button>
@ -122,22 +122,22 @@
nickname: '', nickname: '',
realName: '' realName: ''
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime let beginDateVal = this.dataForm.endTime;
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime let EndDateVal = this.dataForm.startTime;
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
} },
} }
}, },
components: { components: {

Write Preview
Loading…
Cancel
Save