From 6fd200f8bd80a158a2555b77bdaa2cb60406063d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 15:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/workRecord/dailyrecordinfo.vue | 8 +
.../modules/workRecord/monthexcellentcase.vue | 18 +-
.../workRecord/monthexcellentcaseDetail.vue | 2 +-
.../modules/workRecord/monthexcellentgrid.vue | 18 +-
.../workRecord/monthexcellentgridDetail.vue | 42 ++-
.../workRecord/monthexcellentperson.vue | 165 ++++++++-
.../workRecord/monthexcellentpersonDetail.vue | 312 ++++++++++++++++++
.../workRecord/monthexcellentpersonroute.vue | 29 ++
.../modules/workRecord/monthgridsort.vue | 142 +++++++-
.../workRecord/monthgridsortDetail.vue | 197 +++++++++++
.../modules/workRecord/monthgridsortroute.vue | 29 ++
.../modules/workRecord/monthrecordinfo.vue | 12 +-
.../workRecord/monthrecordinfoDetail.vue | 2 +-
.../workRecord/monthrecordinforoute.vue | 6 +-
14 files changed, 920 insertions(+), 62 deletions(-)
create mode 100644 src/views/modules/workRecord/monthexcellentpersonDetail.vue
create mode 100644 src/views/modules/workRecord/monthexcellentpersonroute.vue
create mode 100644 src/views/modules/workRecord/monthgridsortDetail.vue
create mode 100644 src/views/modules/workRecord/monthgridsortroute.vue
diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 9cdd5177..3c5efede 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -225,3 +225,11 @@ export default {
}
}
+
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index 70aed4a5..6671f577 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -59,7 +59,7 @@
-
+
@@ -159,7 +159,23 @@ export default {
this.options = res.data.options
})
.catch(() => {})
+ },
+ btKeyUpContent (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.content = e.target.value
+ },
+ btKeyUpNickName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.nickName = e.target.value
}
}
}
+
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index a57c4412..57463faf 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -44,7 +44,7 @@
:on-error="handelError"
:on-preview="handleFileCardPreview"
style="width:480px">
- 点击上传
+ 点击上传
支持.word、PDF、Excel文件
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 62803410..84fb022c 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -60,7 +60,7 @@
-
+
@@ -160,7 +160,23 @@ export default {
this.options = res.data.options
})
.catch(() => {})
+ },
+ btKeyUpContent (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.content = e.target.value
+ },
+ btKeyUpNickName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.nickName = e.target.value
}
}
}
+
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index c8e08353..3e4c0f5a 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -2,17 +2,18 @@
-
+
-
+
- 点击上传
+ 点击上传
支持.word、PDF、Excel文件
@@ -107,7 +108,6 @@ export default {
isAutoRemoveFile: true,
fileloading: false,
pageloading: true,
- ids: [],
options: []
}
},
@@ -116,26 +116,19 @@ export default {
return {
content: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
+ ],
+ deptId: [
+ { required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
- watch: {
- ids: function (val) {
- if (val.length === 0) {
- this.dataForm.deptId = ''
- } else {
- this.dataForm.deptId = this.ids[val.length - 1]
- }
- this.dataForm.deptName = this.$refs['name'].getCheckedNodes()[0].label
- }
- },
created: function () {
this.getOptions()
- // this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
- // this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
- this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
- this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+ this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+ this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+ // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+ // this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
},
components: {
MapSelect
@@ -159,13 +152,18 @@ export default {
}
},
methods: {
+ changeHandle (value, selectedData) {
+ console.log(this.$refs['name'].getCheckedNodes()[0])
+ this.dataForm.deptName = this.$refs['name'].getCheckedNodes()[0].label
+ this.dataForm.deptId = this.$refs['name'].getCheckedNodes()[0].value
+ },
init () {
this.dataForm.id = this.$route.query.id
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
- this.getInfo()
+ // this.getInfo()
}
})
},
@@ -212,8 +210,8 @@ export default {
},
// --------------文件上传-----------------
handleFileCardPreview (file) {
- // window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
- window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
+ window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
+ // window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
},
beforeFileRemove (file, fileList) {
if (this.isAutoRemoveFile) {
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 34a17142..dcd165c5 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -2,12 +2,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ {{ $t('query') }}
- {{ $t('query') }}
+ {{ $t('export') }}
+
{{ $t('add') }}
@@ -16,21 +67,21 @@
-
-
-
+
+
+ {{scope.$index+1}}
+
+
-
-
-
-
-
-
-
+
+
+
+ {{ $t('update') }}
+ {{ '查看' }}
{{ $t('update') }}
{{ $t('delete') }}
@@ -59,18 +110,100 @@ export default {
data () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/news/monthexcellentperson/page',
+ getDataListURL: '/workRecord/monthexcellentperson/page',
getDataListIsPage: true,
- deleteURL: '/news/monthexcellentperson',
- deleteIsBatch: true
+ deleteURL: '/workRecord/monthexcellentperson',
+ deleteIsBatch: true,
+ exportURL: '/workRecord/monthexcellentperson/export'
},
dataForm: {
- id: ''
+ id: '',
+ name: '',
+ mobile: '',
+ partyFlag: '',
+ content: '',
+ nickName: ''
+ },
+ partyFlagArr: [
+ { dictValue: '0', dictName: '居民' },
+ { dictValue: '1', dictName: '党员' }
+ ],
+ 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()
+ }
+ }
+ },
+ ids: [],
+ options: []
+ }
+ },
+ watch: {
+ ids: function (val) {
+ if (val.length === 0) {
+ this.dataForm.deptId = ''
+ } else {
+ this.dataForm.deptId = this.ids[val.length - 1]
}
}
},
+ created: function () {
+ this.getDataList()
+ this.getOptions()
+ },
components: {
AddOrUpdate
+ },
+ methods: {
+ addHandle (id, disabled) {
+ this.$parent.selectComponent = 'MonthexcellentpersonDetail'
+ this.$router.push({ path: '/workRecord-Monthexcellentpersonroute', query: { id: id, disabled: disabled } })
+ },
+ getDataListOverWrite () {
+ this.page = 1
+ this.getDataList()
+ },
+ getOptions () {
+ this.$http
+ .get(`/sys/user/deptOptions/getByLoginUser`)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.options = res.data.options
+ })
+ .catch(() => {})
+ },
+ btKeyUpName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.name = e.target.value
+ },
+ btKeyUpNickName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.nickName = e.target.value
+ },
+ btKeyUpMobile (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.mobile = e.target.value
+ }
}
}
+
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
new file mode 100644
index 00000000..e9eb7582
--- /dev/null
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ 1~9张图
+
+
+
+ 点击上传
+ 支持.word、PDF、Excel文件
+
+
+
+
+
+ {{"返回"}}
+ {{ $t('confirm') }}
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ {{ $t('query') }}
- {{ $t('query') }}
+ {{ $t('export') }}
{{ $t('add') }}
@@ -16,20 +53,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+ {{ $t('update') }}
+ {{ '查看' }}
{{ $t('update') }}
{{ $t('delete') }}
@@ -58,18 +93,89 @@ export default {
data () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/news/monthgridsort/page',
+ getDataListURL: '/workRecord/monthgridsort/page',
getDataListIsPage: true,
- deleteURL: '/news/monthgridsort',
- deleteIsBatch: true
+ deleteURL: '/workRecord/monthgridsort',
+ deleteIsBatch: true,
+ exportURL: '/workRecord/monthgridsort/export'
},
dataForm: {
- id: ''
+ id: '',
+ deptName: '',
+ 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()
+ }
+ }
+ },
+ ids: [],
+ options: []
+ }
+ },
+ watch: {
+ ids: function (val) {
+ if (val.length === 0) {
+ this.dataForm.deptId = ''
+ } else {
+ this.dataForm.deptId = this.ids[val.length - 1]
}
}
},
components: {
AddOrUpdate
+ },
+ created: function () {
+ this.getDataList()
+ this.getOptions()
+ },
+ methods: {
+ addHandle (infoId, disabled) {
+ this.$parent.selectComponent = 'MonthgridsortDetail'
+ this.$router.push({ path: '/workRecord-Monthgridsortroute', query: { isAdd: '0', disabled: disabled, infoId: infoId } })
+ },
+ getDataListOverWrite () {
+ this.page = 1
+ this.getDataList()
+ },
+ getOptions () {
+ this.$http
+ .get(`/sys/user/deptOptions/getByLoginUser`)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.options = res.data.options
+ })
+ .catch(() => {})
+ },
+ btKeyUpDeptName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.deptName = e.target.value
+ },
+ btKeyUpNickName (e) {
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+ this.dataForm.nickName = e.target.value
+ }
}
}
+
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
new file mode 100644
index 00000000..5a169c57
--- /dev/null
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+ {{"删除"}}
+
+
+
+
+
+
+ {{"添加排名-名额"}}
+
+
+
+
+ {{"返回"}}
+ {{ $t('confirm') }}
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
支持.word、PDF、Excel文件
diff --git a/src/views/modules/workRecord/monthrecordinforoute.vue b/src/views/modules/workRecord/monthrecordinforoute.vue
index efb8a4fe..4df085c9 100644
--- a/src/views/modules/workRecord/monthrecordinforoute.vue
+++ b/src/views/modules/workRecord/monthrecordinforoute.vue
@@ -8,6 +8,8 @@ import Monthrecordinfo from './monthrecordinfo'
import MonthrecordinfoDetail from './monthrecordinfoDetail'
import MonthexcellentcaseDetail from './monthexcellentcaseDetail'
import MonthexcellentgridDetail from './monthexcellentgridDetail'
+import MonthexcellentpersonDetail from './monthexcellentpersonDetail'
+import MonthgridsortDetail from './monthgridsortDetail'
export default {
data () {
return {
@@ -18,7 +20,9 @@ export default {
Monthrecordinfo,
MonthrecordinfoDetail,
MonthexcellentcaseDetail,
- MonthexcellentgridDetail
+ MonthexcellentgridDetail,
+ MonthexcellentpersonDetail,
+ MonthgridsortDetail
},
methods: {
init () {