Browse Source

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

master
weikai 5 years ago
parent
commit
58a57a126a
  1. 47
      src/views/modules/analysis/export/operation.vue
  2. 8
      src/views/modules/analysis/issue/issue-classified-statistic.vue
  3. 51
      src/views/modules/analysis/user/gridopening.vue
  4. 53
      src/views/modules/analysis/user/party.vue
  5. 56
      src/views/modules/analysis/user/register.vue
  6. 8
      src/views/modules/case/typicalcase-list.vue
  7. 8
      src/views/modules/custom/epidemic.vue
  8. 8
      src/views/modules/custom/evaluatedeptcount.vue
  9. 4
      src/views/modules/custom/evaluateofficer.vue
  10. 13
      src/views/modules/events/issue-close-detail-view.vue
  11. 4
      src/views/modules/events/issue-process-detail-view.vue
  12. 13
      src/views/modules/events/item-close-detail-view.vue
  13. 4
      src/views/modules/events/item-deal-detail-view.vue
  14. 8
      src/views/modules/group/leaderboard.vue
  15. 8
      src/views/modules/group/topic-list.vue
  16. 4
      src/views/modules/heart/actphrase.vue
  17. 22
      src/views/modules/job/schedule-add-or-update.vue
  18. 48
      src/views/modules/news/allnews.vue
  19. 48
      src/views/modules/news/news.vue
  20. 94
      src/views/modules/news/newsdraft.vue
  21. 18
      src/views/modules/organize/deptofficer.vue
  22. 42
      src/views/modules/oss/oss-config.vue
  23. 13
      src/views/modules/sys/app-menu-add-or-update.vue
  24. 4
      src/views/modules/sys/dept-add-or-update.vue
  25. 25
      src/views/modules/sys/dict-add-or-update.vue
  26. 7
      src/views/modules/sys/menu-add-or-update.vue
  27. 17
      src/views/modules/sys/params-add-or-update.vue
  28. 4
      src/views/modules/sys/params.vue
  29. 17
      src/views/modules/sys/totalconfig-add-or-update.vue
  30. 4
      src/views/modules/sys/totalconfig-list.vue
  31. 13
      src/views/modules/sys/user-add-or-update.vue
  32. 4
      src/views/modules/sys/user.vue

47
src/views/modules/analysis/export/operation.vue

@ -27,16 +27,27 @@
</template> </template>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-form-item prop="newsReleaseStartTime" <el-form-item label="提交时间"
v-if="this.timeFlag==1" prop="startTime">
label="有效时间"> <el-date-picker v-model="dataForm.operationStartTime"
<el-date-picker @change='setRegistTime' type="date"
v-model="time" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.operationEndTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:250px;">
end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -94,7 +105,23 @@ export default {
options: [], options: [],
categorys: [], categorys: [],
loading: false, loading: false,
timeFlag: '1' timeFlag: '1',
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.operationEndTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.operationStartTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
} }
}, },
activated () { activated () {

8
src/views/modules/analysis/issue/issue-classified-statistic.vue

@ -103,17 +103,17 @@ export default {
}, },
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()
} }
} }
}, },

51
src/views/modules/analysis/user/gridopening.vue

@ -25,18 +25,31 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交时间"> <el-form-item label="提交时间"
<el-date-picker @change='setRegistTime' prop="startTime">
v-model="time" <el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:250px;">
end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</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 type="success" <el-button type="success"
@ -276,7 +289,9 @@ export default {
exportURL: '/analysis/user/export/grid0pining' exportURL: '/analysis/user/export/grid0pining'
}, },
dataForm: { dataForm: {
category: '1' category: '1',
startTime:'',
endTime:''
}, },
isAble:false, isAble:false,
time: '', time: '',
@ -297,7 +312,23 @@ export default {
onLineState: '' onLineState: ''
}, },
totalList: [], totalList: [],
totalVisible: false totalVisible: false,
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()
}
}
},
} }
}, },
created () { created () {

53
src/views/modules/analysis/user/party.vue

@ -23,14 +23,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交时间"> <el-form-item label="提交时间"
<el-date-picker @change='setRegistTime' prop="startTime">
v-model="time" <el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:250px;">
end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -148,7 +161,9 @@ export default {
exportURL: '/analysis/user/export/party' exportURL: '/analysis/user/export/party'
}, },
dataForm: { dataForm: {
partyFlag: '1' partyFlag: '1',
startTime:'',
endTime:''
}, },
time: '', time: '',
options: [], options: [],
@ -181,9 +196,25 @@ export default {
onLine: { onLine: {
id: '', id: '',
onLineState: '' onLineState: ''
},
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()
} }
} }
}, },
}
},
created () { created () {
this.$http this.$http
.get(`/sys/user/deptOptions/getByLoginUser`) .get(`/sys/user/deptOptions/getByLoginUser`)
@ -300,11 +331,7 @@ export default {
this.dataForm.dept = choosenItem.name this.dataForm.dept = choosenItem.name
this.dataForm.deptId = choosenItem.id this.dataForm.deptId = choosenItem.id
}, },
setRegistTime () {
console.log(this.time[0])
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
// getListCategory () { // getListCategory () {
// this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => { // this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
// if (res.code !== 0) { // if (res.code !== 0) {

56
src/views/modules/analysis/user/register.vue

@ -11,16 +11,6 @@
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable></el-cascader> clearable></el-cascader>
</el-form-item> </el-form-item>
<br>
<span class="demonstration">提交时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker> &nbsp; &nbsp;
<el-form-item label="排序规则"> <el-form-item label="排序规则">
<el-select v-model="dataForm.category" <el-select v-model="dataForm.category"
clearable clearable
@ -32,8 +22,32 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<br>
<el-form-item label="提交时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</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-item> <el-form-item>
<el-button type="success" <el-button type="success"
@ -172,7 +186,9 @@ export default {
newsCount: '', newsCount: '',
noticeCount: '', noticeCount: '',
partyCount: '', partyCount: '',
registerCount: '' registerCount: '',
startTime:'',
endTime:''
}, },
time: '', time: '',
options: [], options: [],
@ -205,7 +221,23 @@ export default {
onLine: { onLine: {
id: '', id: '',
onLineState: '' onLineState: ''
},
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()
}
} }
},
} }
}, },
created () { created () {

8
src/views/modules/case/typicalcase-list.vue

@ -91,17 +91,17 @@ export default {
}, },
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()
} }
} }
} }

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

@ -96,17 +96,17 @@ export default {
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()
} }
} }
} }

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

@ -97,17 +97,17 @@ export default {
}, },
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/custom/evaluateofficer.vue

@ -35,10 +35,10 @@
</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-item> <el-form-item>
<el-button type="success" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button> <el-button type="primary" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('epdc:topic:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button> <el-button v-if="$hasPermission('epdc:topic:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button>

13
src/views/modules/events/issue-close-detail-view.vue

@ -260,6 +260,11 @@ export default {
}) })
}, },
deleteComment (val) { deleteComment (val) {
this.$confirm('是否屏蔽评论?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => { this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -272,7 +277,13 @@ export default {
this.getCommentList() this.getCommentList()
} }
}) })
}).catch(() => { }) })
}).catch(() => {
this.$message({
type: 'info',
message: '已取消屏蔽'
});
});
}, },
clickImg (url) { clickImg (url) {
this.previewImgList = [] this.previewImgList = []

4
src/views/modules/events/issue-process-detail-view.vue

@ -122,7 +122,9 @@
prop="advice"> prop="advice">
<el-input v-model="dataForm.advice" <el-input v-model="dataForm.advice"
type="textarea" type="textarea"
placeholder="请您填写居民诉求的处理情况及答复意见,向居民公开展示,500字以内"></el-input> 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" <el-button size="small"

13
src/views/modules/events/item-close-detail-view.vue

@ -240,6 +240,11 @@ export default {
this.previewImgList.push(url) this.previewImgList.push(url)
}, },
deleteComment (val) { deleteComment (val) {
this.$confirm('是否屏蔽评论?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => { this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -252,7 +257,13 @@ export default {
this.getCommentList() this.getCommentList()
} }
}) })
}).catch(() => {}) })
}).catch(() => {
this.$message({
type: 'info',
message: '已取消屏蔽'
});
});
}, },
getInfo () { getInfo () {
this.$http.get(`/events/item/contentDetail/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`/events/item/contentDetail/${this.dataForm.id}`).then(({ data: res }) => {

4
src/views/modules/events/item-deal-detail-view.vue

@ -146,12 +146,16 @@
prop="outHandleAdvice"> prop="outHandleAdvice">
<el-input v-model="postDataForm.outHandleAdvice" <el-input v-model="postDataForm.outHandleAdvice"
type="textarea" type="textarea"
maxlength="100"
show-word-limit
placeholder="请您选择居民诉求的处理情况及答复意见,向居民公开展示"></el-input> placeholder="请您选择居民诉求的处理情况及答复意见,向居民公开展示"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目处理意见:" <el-form-item label="项目处理意见:"
prop="handleAdvice"> prop="handleAdvice">
<el-input v-model="postDataForm.handleAdvice" <el-input v-model="postDataForm.handleAdvice"
type="textarea" type="textarea"
maxlength="100"
show-word-limit
placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调),便于相关部门了解项目的实际情况"></el-input> placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调),便于相关部门了解项目的实际情况"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="满意度评价:" <el-form-item label="满意度评价:"

8
src/views/modules/group/leaderboard.vue

@ -92,17 +92,17 @@ export default {
}, },
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()
} }
} }
}, },

8
src/views/modules/group/topic-list.vue

@ -115,17 +115,17 @@ export default {
}, },
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/heart/actphrase.vue

@ -35,10 +35,10 @@
</el-select> </el-select>
</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 type="success" <el-button type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button> @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

22
src/views/modules/job/schedule-add-or-update.vue

@ -1,17 +1,29 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
<el-form-item prop="beanName" :label="$t('schedule.beanName')"> <el-form-item prop="beanName" :label="$t('schedule.beanName')">
<el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input> <el-input v-model="dataForm.beanName"
maxlength="50"
show-word-limit
:placeholder="$t('schedule.beanNameTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="params" :label="$t('schedule.params')"> <el-form-item prop="params" :label="$t('schedule.params')">
<el-input v-model="dataForm.params" :placeholder="$t('schedule.params')"></el-input> <el-input v-model="dataForm.params"
maxlength="120"
show-word-limit
:placeholder="$t('schedule.params')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="cronExpression" :label="$t('schedule.cronExpression')"> <el-form-item prop="cronExpression" :label="$t('schedule.cronExpression')">
<el-input v-model="dataForm.cronExpression" :placeholder="$t('schedule.cronExpressionTips')"></el-input> <el-input v-model="dataForm.cronExpression"
maxlength="50"
show-word-limit
:placeholder="$t('schedule.cronExpressionTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="remark" :label="$t('schedule.remark')"> <el-form-item prop="remark" :label="$t('schedule.remark')">
<el-input v-model="dataForm.remark" :placeholder="$t('schedule.remark')"></el-input> <el-input v-model="dataForm.remark"
maxlength="100"
show-word-limit
:placeholder="$t('schedule.remark')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">

48
src/views/modules/news/allnews.vue

@ -29,18 +29,32 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-form-item label="提交时间"> <br>
<el-date-picker @change='setRegistTime' <el-form-item label="提交时间"
v-model="time" prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:250px;">
end-placeholder="结束日期"> </el-date-picker>
</el-date-picker> &nbsp; </el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</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:news:save')" <el-button v-if="$hasPermission('news:news:save')"
@ -175,7 +189,23 @@ export default {
onLine: { onLine: {
id: '', id: '',
onLineState: '' onLineState: ''
},
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()
}
}
},
} }
}, },
created () { created () {

48
src/views/modules/news/news.vue

@ -67,18 +67,32 @@
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<br> <br>
<span class="demonstration">提交时间</span>&nbsp;&nbsp; <el-form-item label="提交时间"
<el-date-picker @change='setRegistTime' prop="startTime">
v-model="time" <el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:250px;">
end-placeholder="结束日期"> </el-date-picker>
</el-date-picker> &nbsp; &nbsp; </el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</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:news:save')" <el-button v-if="$hasPermission('news:news:save')"
@ -228,7 +242,23 @@
onLine: { onLine: {
id: '', id: '',
onLineState: '' onLineState: ''
},
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()
}
}
},
} }
}, },
created() { created() {

94
src/views/modules/news/newsdraft.vue

@ -10,54 +10,8 @@
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable></el-cascader> clearable></el-cascader>
</el-form-item> </el-form-item>&nbsp;
<!--<el-form-item label="所属街道"
prop="deptId">
<el-select v-model="dataForm.streetId"
clearable
@change="changeStreet"
placeholder="所属街道">
<el-option v-for="item in streetList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属社区">
<el-select v-model="dataForm.communityId"
@change="changeCommunity"
clearable
placeholder="所属社区">
<el-option v-for="item in communityList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属网格">
<el-select v-model="dataForm.gridId"
@change="changeGrid"
clearable
placeholder="所属网格">
<el-option v-for="item in gridList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>-->
<span class="demonstration">提交时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker> &nbsp; &nbsp;
<br>
<el-form-item label="类别" label-width="68px"> <el-form-item label="类别" label-width="68px">
<el-select v-model="dataForm.category" <el-select v-model="dataForm.category"
clearable clearable
@ -76,8 +30,32 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<br>
<el-form-item label="提交时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:250px;">
</el-date-picker>
</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:news:save')" <el-button v-if="$hasPermission('news:news:save')"
@ -204,7 +182,23 @@ export default {
options: [], options: [],
deptIdList: [], deptIdList: [],
categorys: [], categorys: [],
id: '' id: '',
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()
}
}
},
} }
}, },
created () { created () {

18
src/views/modules/organize/deptofficer.vue

@ -102,7 +102,23 @@ export default {
dataForm: { dataForm: {
id: '' id: ''
}, },
deptofficerAddVisible: false deptofficerAddVisible: false,
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()
}
}
},
} }
}, },
mounted () { mounted () {

42
src/views/modules/oss/oss-config.vue

@ -22,26 +22,36 @@
<el-form-item prop="qiniuDomain" <el-form-item prop="qiniuDomain"
:label="$t('oss.qiniuDomain')"> :label="$t('oss.qiniuDomain')">
<el-input v-model="dataForm.qiniuDomain" <el-input v-model="dataForm.qiniuDomain"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qiniuDomainTips')"></el-input> :placeholder="$t('oss.qiniuDomainTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qiniuPrefix" <el-form-item prop="qiniuPrefix"
:label="$t('oss.qiniuPrefix')"> :label="$t('oss.qiniuPrefix')">
<el-input v-model="dataForm.qiniuPrefix" <el-input v-model="dataForm.qiniuPrefix"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qiniuPrefixTips')"></el-input> :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qiniuAccessKey" <el-form-item prop="qiniuAccessKey"
:label="$t('oss.qiniuAccessKey')"> :label="$t('oss.qiniuAccessKey')">
<el-input v-model="dataForm.qiniuAccessKey" <el-input v-model="dataForm.qiniuAccessKey"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qiniuAccessKeyTips')"></el-input> :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qiniuSecretKey" <el-form-item prop="qiniuSecretKey"
:label="$t('oss.qiniuSecretKey')"> :label="$t('oss.qiniuSecretKey')">
<el-input v-model="dataForm.qiniuSecretKey" <el-input v-model="dataForm.qiniuSecretKey"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qiniuSecretKeyTips')"></el-input> :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qiniuBucketName" <el-form-item prop="qiniuBucketName"
:label="$t('oss.qiniuBucketName')"> :label="$t('oss.qiniuBucketName')">
<el-input v-model="dataForm.qiniuBucketName" <el-input v-model="dataForm.qiniuBucketName"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qiniuBucketNameTips')"></el-input> :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -49,31 +59,43 @@
<el-form-item prop="aliyunDomain" <el-form-item prop="aliyunDomain"
:label="$t('oss.aliyunDomain')"> :label="$t('oss.aliyunDomain')">
<el-input v-model="dataForm.aliyunDomain" <el-input v-model="dataForm.aliyunDomain"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunDomainTips')"></el-input> :placeholder="$t('oss.aliyunDomainTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="aliyunPrefix" <el-form-item prop="aliyunPrefix"
:label="$t('oss.aliyunPrefix')"> :label="$t('oss.aliyunPrefix')">
<el-input v-model="dataForm.aliyunPrefix" <el-input v-model="dataForm.aliyunPrefix"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunPrefixTips')"></el-input> :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="aliyunEndPoint" <el-form-item prop="aliyunEndPoint"
:label="$t('oss.aliyunEndPoint')"> :label="$t('oss.aliyunEndPoint')">
<el-input v-model="dataForm.aliyunEndPoint" <el-input v-model="dataForm.aliyunEndPoint"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunEndPointTips')"></el-input> :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="aliyunAccessKeyId" <el-form-item prop="aliyunAccessKeyId"
:label="$t('oss.aliyunAccessKeyId')"> :label="$t('oss.aliyunAccessKeyId')">
<el-input v-model="dataForm.aliyunAccessKeyId" <el-input v-model="dataForm.aliyunAccessKeyId"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input> :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="aliyunAccessKeySecret" <el-form-item prop="aliyunAccessKeySecret"
:label="$t('oss.aliyunAccessKeySecret')"> :label="$t('oss.aliyunAccessKeySecret')">
<el-input v-model="dataForm.aliyunAccessKeySecret" <el-input v-model="dataForm.aliyunAccessKeySecret"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input> :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="aliyunBucketName" <el-form-item prop="aliyunBucketName"
:label="$t('oss.aliyunBucketName')"> :label="$t('oss.aliyunBucketName')">
<el-input v-model="dataForm.aliyunBucketName" <el-input v-model="dataForm.aliyunBucketName"
maxlength="50"
show-word-limit
:placeholder="$t('oss.aliyunBucketNameTips')"></el-input> :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -81,31 +103,43 @@
<el-form-item prop="qcloudDomain" <el-form-item prop="qcloudDomain"
:label="$t('oss.qcloudDomain')"> :label="$t('oss.qcloudDomain')">
<el-input v-model="dataForm.qcloudDomain" <el-input v-model="dataForm.qcloudDomain"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudDomainTips')"></el-input> :placeholder="$t('oss.qcloudDomainTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudPrefix" <el-form-item prop="qcloudPrefix"
:label="$t('oss.qcloudPrefix')"> :label="$t('oss.qcloudPrefix')">
<el-input v-model="dataForm.qcloudPrefix" <el-input v-model="dataForm.qcloudPrefix"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudPrefixTips')"></el-input> :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudAppId" <el-form-item prop="qcloudAppId"
:label="$t('oss.qcloudAppId')"> :label="$t('oss.qcloudAppId')">
<el-input v-model="dataForm.qcloudAppId" <el-input v-model="dataForm.qcloudAppId"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudAppIdTips')"></el-input> :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudSecretId" <el-form-item prop="qcloudSecretId"
:label="$t('oss.qcloudSecretId')"> :label="$t('oss.qcloudSecretId')">
<el-input v-model="dataForm.qcloudSecretId" <el-input v-model="dataForm.qcloudSecretId"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudSecretIdTips')"></el-input> :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudSecretKey" <el-form-item prop="qcloudSecretKey"
:label="$t('oss.qcloudSecretKey')"> :label="$t('oss.qcloudSecretKey')">
<el-input v-model="dataForm.qcloudSecretKey" <el-input v-model="dataForm.qcloudSecretKey"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudSecretKeyTips')"></el-input> :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudBucketName" <el-form-item prop="qcloudBucketName"
:label="$t('oss.qcloudBucketName')"> :label="$t('oss.qcloudBucketName')">
<el-input v-model="dataForm.qcloudBucketName" <el-input v-model="dataForm.qcloudBucketName"
maxlength="50"
show-word-limit
:placeholder="$t('oss.qcloudBucketNameTips')"></el-input> :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="qcloudRegion" <el-form-item prop="qcloudRegion"
@ -141,6 +175,8 @@
<el-form-item prop="fastdfsDomain" <el-form-item prop="fastdfsDomain"
:label="$t('oss.fastdfsDomain')"> :label="$t('oss.fastdfsDomain')">
<el-input v-model="dataForm.fastdfsDomain" <el-input v-model="dataForm.fastdfsDomain"
maxlength="50"
show-word-limit
:placeholder="$t('oss.fastdfsDomainTips')"></el-input> :placeholder="$t('oss.fastdfsDomainTips')"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -148,16 +184,22 @@
<el-form-item prop="localDomain" <el-form-item prop="localDomain"
:label="$t('oss.localDomain')"> :label="$t('oss.localDomain')">
<el-input v-model="dataForm.localDomain" <el-input v-model="dataForm.localDomain"
maxlength="50"
show-word-limit
:placeholder="$t('oss.localDomainTips')"></el-input> :placeholder="$t('oss.localDomainTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="localPrefix" <el-form-item prop="localPrefix"
:label="$t('oss.localPrefix')"> :label="$t('oss.localPrefix')">
<el-input v-model="dataForm.localPrefix" <el-input v-model="dataForm.localPrefix"
maxlength="50"
show-word-limit
:placeholder="$t('oss.localPrefixTips')"></el-input> :placeholder="$t('oss.localPrefixTips')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="localPath" <el-form-item prop="localPath"
:label="$t('oss.localPath')"> :label="$t('oss.localPath')">
<el-input v-model="dataForm.localPath" <el-input v-model="dataForm.localPath"
maxlength="50"
show-word-limit
:placeholder="$t('oss.localPathTips')"></el-input> :placeholder="$t('oss.localPathTips')"></el-input>
</el-form-item> </el-form-item>
</template> </template>

13
src/views/modules/sys/app-menu-add-or-update.vue

@ -9,7 +9,6 @@
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px" label-width="120px"
> >
<el-form-item prop="type" :label="$t('menu.type')" size="mini"> <el-form-item prop="type" :label="$t('menu.type')" size="mini">
@ -22,18 +21,24 @@
<el-input <el-input
v-model="dataForm.name" v-model="dataForm.name"
:placeholder="$t('menu.name')" :placeholder="$t('menu.name')"
maxlength="30"
show-word-limit
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="menuCode" :label="$t('menu.menuCode')"> <el-form-item prop="menuCode" :label="$t('menu.menuCode')">
<el-input <el-input
v-model="dataForm.menuCode" v-model="dataForm.menuCode"
:placeholder="$t('menu.menuCode')" :placeholder="$t('menu.menuCode')"
maxlength="30"
show-word-limit
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="className" label="样式名称"> <el-form-item prop="className" label="样式名称">
<el-input <el-input
v-model="dataForm.className" v-model="dataForm.className"
placeholder="样式名称" placeholder="样式名称"
maxlength="30"
show-word-limit
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -124,7 +129,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="remark" label="备注"> <el-form-item prop="remark" label="备注">
<el-input v-model="dataForm.remark" placeholder="备注"></el-input> <el-input v-model="dataForm.remark"
type="text"
maxlength="100"
show-word-limit
placeholder="备注"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="numFlag" <el-form-item prop="numFlag"
label="是否显示数字" label="是否显示数字"

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

@ -10,11 +10,15 @@
<el-form-item prop="name" <el-form-item prop="name"
:label="$t('dept.name')"> :label="$t('dept.name')">
<el-input v-model="dataForm.name" <el-input v-model="dataForm.name"
maxlength="50"
show-word-limit
:placeholder="$t('dept.name')"></el-input> :placeholder="$t('dept.name')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="partyCode" <el-form-item prop="partyCode"
:label="$t('dept.partyCode')"> :label="$t('dept.partyCode')">
<el-input v-model="dataForm.partyCode" <el-input v-model="dataForm.partyCode"
maxlength="50"
show-word-limit
:placeholder="$t('dept.partyCode')"></el-input> :placeholder="$t('dept.partyCode')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="parentName" <el-form-item prop="parentName"

25
src/views/modules/sys/dict-add-or-update.vue

@ -2,19 +2,34 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
<el-form-item prop="dictName" :label="$t('dict.dictName')"> <el-form-item prop="dictName" :label="$t('dict.dictName')">
<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input> <el-input v-model="dataForm.dictName"
maxlength="50"
show-word-limit
:placeholder="$t('dict.dictName')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.pid === '0'" prop="dictType" :label="$t('dict.dictType')"> <el-form-item v-if="dataForm.pid === '0'" prop="dictType" :label="$t('dict.dictType')">
<el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input> <el-input v-model="dataForm.dictType"
maxlength="50"
show-word-limit
:placeholder="$t('dict.dictType')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.pid !== '0'" prop="dictValue" :label="$t('dict.dictValue')"> <el-form-item v-if="dataForm.pid !== '0'" prop="dictValue" :label="$t('dict.dictValue')">
<el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input> <el-input v-model="dataForm.dictValue"
maxlength="50"
show-word-limit
:placeholder="$t('dict.dictValue')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="sort" :label="$t('dict.sort')"> <el-form-item prop="sort" :label="$t('dict.sort')">
<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number> <el-input-number v-model="dataForm.sort"
maxlength="50"
show-word-limit
controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item prop="remark" :label="$t('dict.remark')"> <el-form-item prop="remark" :label="$t('dict.remark')">
<el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input> <el-input v-model="dataForm.remark"
maxlength="100"
show-word-limit
:placeholder="$t('dict.remark')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">

7
src/views/modules/sys/menu-add-or-update.vue

@ -6,7 +6,6 @@
<el-form :model="dataForm" <el-form :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"> label-width="120px">
<el-form-item prop="type" <el-form-item prop="type"
:label="$t('menu.type')" :label="$t('menu.type')"
@ -20,12 +19,16 @@
<el-form-item prop="name" <el-form-item prop="name"
:label="$t('menu.name')"> :label="$t('menu.name')">
<el-input v-model="dataForm.name" <el-input v-model="dataForm.name"
maxlength="30"
show-word-limit
:placeholder="$t('menu.name')"></el-input> :placeholder="$t('menu.name')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.type === 0" <el-form-item v-if="dataForm.type === 0"
prop="menuCode" prop="menuCode"
:label="$t('menu.menuCode')"> :label="$t('menu.menuCode')">
<el-input v-model="dataForm.menuCode" <el-input v-model="dataForm.menuCode"
maxlength="50"
show-word-limit
:placeholder="$t('menu.menuCode')"></el-input> :placeholder="$t('menu.menuCode')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="parentName" <el-form-item prop="parentName"
@ -59,6 +62,8 @@
prop="url" prop="url"
:label="$t('menu.url')"> :label="$t('menu.url')">
<el-input v-model="dataForm.url" <el-input v-model="dataForm.url"
maxlength="60"
show-word-limit
:placeholder="$t('menu.url')"></el-input> :placeholder="$t('menu.url')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="sort" <el-form-item prop="sort"

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

@ -1,14 +1,23 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
<el-form-item prop="paramCode" :label="$t('params.paramCode')"> <el-form-item prop="paramCode" :label="$t('params.paramCode')">
<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input> <el-input v-model="dataForm.paramCode"
maxlength="50"
show-word-limit
:placeholder="$t('params.paramCode')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="paramValue" :label="$t('params.paramValue')"> <el-form-item prop="paramValue" :label="$t('params.paramValue')">
<el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input> <el-input v-model="dataForm.paramValue"
maxlength="50"
show-word-limit
:placeholder="$t('params.paramValue')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="remark" :label="$t('params.remark')"> <el-form-item prop="remark" :label="$t('params.remark')">
<el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input> <el-input v-model="dataForm.remark"
maxlength="100"
show-word-limit
:placeholder="$t('params.remark')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">

4
src/views/modules/sys/params.vue

@ -6,10 +6,10 @@
<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable @keyup.native="btKeyUpParamCode"></el-input> <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable @keyup.native="btKeyUpParamCode"></el-input>
</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-item> <el-form-item>
<el-button v-if="$hasPermission('sys:params:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

17
src/views/modules/sys/totalconfig-add-or-update.vue

@ -1,11 +1,17 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="统计名称" prop="totalName"> <el-form-item label="统计名称" prop="totalName">
<el-input v-model="dataForm.totalName" placeholder="统计名称"></el-input> <el-input v-model="dataForm.totalName"
maxlength="50"
show-word-limit
placeholder="统计名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统计类型" prop="totalType"> <el-form-item label="统计类型" prop="totalType">
<el-input v-model="dataForm.totalType" placeholder="统计类型(自定义)"></el-input> <el-input v-model="dataForm.totalType"
maxlength="50"
show-word-limit
placeholder="统计类型(自定义)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统计方式" prop="totalStyle"> <el-form-item label="统计方式" prop="totalStyle">
<el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable> <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
@ -15,7 +21,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="统计规格" prop="spec"> <el-form-item label="统计规格" prop="spec">
<el-input v-model="dataForm.spec" placeholder="统计规格"></el-input> <el-input v-model="dataForm.spec"
maxlength="50"
show-word-limit
placeholder="统计规格"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="sort" label="排序"> <el-form-item prop="sort" label="排序">
<el-input-number <el-input-number

4
src/views/modules/sys/totalconfig-list.vue

@ -25,10 +25,10 @@
</el-select> </el-select>
</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('workRecord:totalconfig:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>

13
src/views/modules/sys/user-add-or-update.vue

@ -6,11 +6,12 @@
<el-form :model="dataForm" <el-form :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"> label-width="120px">
<el-form-item prop="username" <el-form-item prop="username"
:label="$t('user.username')"> :label="$t('user.username')">
<el-input v-model="dataForm.username" <el-input v-model="dataForm.username"
maxlength="30"
show-word-limit
:placeholder="$t('user.username')"></el-input> :placeholder="$t('user.username')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="deptName" <el-form-item prop="deptName"
@ -51,6 +52,8 @@
:class="{ 'is-required': !dataForm.id }"> :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.password" <el-input v-model="dataForm.password"
type="password" type="password"
maxlength="30"
show-word-limit
:placeholder="$t('user.password')"></el-input> :placeholder="$t('user.password')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="comfirmPassword" <el-form-item prop="comfirmPassword"
@ -58,11 +61,15 @@
:class="{ 'is-required': !dataForm.id }"> :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.comfirmPassword" <el-input v-model="dataForm.comfirmPassword"
type="password" type="password"
maxlength="30"
show-word-limit
:placeholder="$t('user.comfirmPassword')"></el-input> :placeholder="$t('user.comfirmPassword')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="realName" <el-form-item prop="realName"
:label="$t('user.realName')"> :label="$t('user.realName')">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
maxlength="30"
show-word-limit
:placeholder="$t('user.realName')"></el-input> :placeholder="$t('user.realName')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="gender" <el-form-item prop="gender"
@ -76,11 +83,15 @@
<el-form-item prop="email" <el-form-item prop="email"
:label="$t('user.email')"> :label="$t('user.email')">
<el-input v-model="dataForm.email" <el-input v-model="dataForm.email"
maxlength="30"
show-word-limit
:placeholder="$t('user.email')"></el-input> :placeholder="$t('user.email')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="mobile" <el-form-item prop="mobile"
:label="$t('user.mobile')"> :label="$t('user.mobile')">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
maxlength="30"
show-word-limit
:placeholder="$t('user.mobile')"></el-input> :placeholder="$t('user.mobile')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="roleIdList" <el-form-item prop="roleIdList"

4
src/views/modules/sys/user.vue

@ -16,10 +16,10 @@
<el-input v-model="dataForm.mobile" placeholder="手机号" clearable @keyup.native="btKeyUpMobile"></el-input> <el-input v-model="dataForm.mobile" placeholder="手机号" clearable @keyup.native="btKeyUpMobile"></el-input>
</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-item> <el-form-item>
<el-button v-if="$hasPermission('sys:user:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

Loading…
Cancel
Save