-
-
+
+
+
-
- {{ $t('query') }}
+
+
+
+
+
- {{ $t('add') }}
+ {{ $t('query') }}
- {{ $t('deleteBatch') }}
+ {{ $t('add') }}
-
-
-
-
-
-
-
-
-
+
+
+ {{scope.$index+1}}
+
+
-
-
+
+
+
+
+
+ 查看详情
+
+
+
+
+
- {{ $t('update') }}
- {{ $t('delete') }}
+ 回复
@@ -58,18 +72,73 @@ export default {
data () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/news/messageboradreply/page',
+ getDataListURL: '/events/borad/page',
getDataListIsPage: true,
deleteURL: '/news/messageboradreply',
deleteIsBatch: true
},
dataForm: {
- id: ''
+ boradType: '',
+ deptId: ''
+ },
+ ids: [],
+ options: [],
+ boradType: [
+ {
+ typeName:"全部",
+ value:""
+ },
+ {
+ typeName:"待回复",
+ value:"0"
+ },
+ {
+ typeName:"回复",
+ value:"1"
+ }
+ ],
+ stateFormat (row, column) {
+ if (row.state === '0') {
+ return '已回复'
+ } else {
+ return '待回复'
+ }
}
}
},
components: {
AddOrUpdate
+ },
+ created: function () {
+ this.getOptions()
+ },
+ watch: {
+ ids: function (val) {
+ if (val.length === 0) {
+ this.dataForm.deptId = ''
+ } else {
+ this.dataForm.deptId = this.ids[val.length - 1]
+ }
+ }
+ },
+ methods: {
+ getOptions () {
+ var paa = {deptType:'party'}
+ this.$http
+ .post(`/sys/user/deptOptions/getByLoginUserNew`,paa)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.options = res.data.options
+ })
+ .catch(() => {})
+ },
+ addOrUpdateHandle (id, disabled) {
+ this.$parent.selectComponent = 'MessageBoradReplyDetail'
+ this.$router.push({ path: '/events-borad-boradReplyRoute', query: { id: id, disabled: disabled } })
+ }
+
}
}
diff --git a/src/views/modules/events/borad/messageboradreplyDetail.vue b/src/views/modules/events/borad/messageboradreplyDetail.vue
new file mode 100644
index 0000000..b6691fe
--- /dev/null
+++ b/src/views/modules/events/borad/messageboradreplyDetail.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.dept}}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ 1~3张图
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ 1~3张图
+
+
+ {{dataForm.replyName}}
+
+
+ {{dataForm.replyTime}}
+
+
+
+
+
+ {{"返回"}}
+ {{ $t('confirm') }}
+
+
+
+
+
+
From f90de8f4ec56907425453eaddd1b6b242cb9ada4 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 18 Nov 2020 14:57:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E6=88=91=E8=A6=81=E9=97=AE=E4=BA=8B?=
=?UTF-8?q?=E3=80=91-=E3=80=90=E7=95=99=E8=A8=80=E6=9D=BF=20-=20=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
=?UTF-8?q?1-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../events/borad/messageboradreply.vue | 13 +--
.../events/borad/messageboradreplyDetail.vue | 96 +++++++++----------
2 files changed, 50 insertions(+), 59 deletions(-)
diff --git a/src/views/modules/events/borad/messageboradreply.vue b/src/views/modules/events/borad/messageboradreply.vue
index 89e774e..e430f27 100644
--- a/src/views/modules/events/borad/messageboradreply.vue
+++ b/src/views/modules/events/borad/messageboradreply.vue
@@ -20,9 +20,6 @@
{{ $t('query') }}
-
- {{ $t('add') }}
-
@@ -37,7 +34,7 @@
查看详情
+ @click="addOrUpdateHandle(scope.row.id,true)">查看详情
@@ -45,7 +42,7 @@
- 回复
+ 回复
@@ -74,8 +71,6 @@ export default {
mixinViewModuleOptions: {
getDataListURL: '/events/borad/page',
getDataListIsPage: true,
- deleteURL: '/news/messageboradreply',
- deleteIsBatch: true
},
dataForm: {
boradType: '',
@@ -99,9 +94,9 @@ export default {
],
stateFormat (row, column) {
if (row.state === '0') {
- return '已回复'
- } else {
return '待回复'
+ } else {
+ return '已回复'
}
}
}
diff --git a/src/views/modules/events/borad/messageboradreplyDetail.vue b/src/views/modules/events/borad/messageboradreplyDetail.vue
index b6691fe..6906e72 100644
--- a/src/views/modules/events/borad/messageboradreplyDetail.vue
+++ b/src/views/modules/events/borad/messageboradreplyDetail.vue
@@ -11,11 +11,11 @@
-
+
{{dataForm.dept}}
@@ -23,18 +23,18 @@
type="textarea"
:rows="3"
placeholder="请输入会议内容，2000字以内"
- v-model="dataForm.content"
+ v-model="dataForm.boradContent"
maxlength="2000"
style="width:50%">
-
+
1~3张图
-
+
{{dataForm.replyName}}
-
+
{{dataForm.replyTime}}
@@ -113,16 +113,20 @@ export default {
boradName: '',
dept: '',
deptId: '',
- content: '',
+ boradContent: '',
images: [],
- replyimages: [],
- createTime: '',
+ replyPicture: [],
+ boradPicture: [],
+ boradTime: '',
replyContent: '',
replyName: '',
- replyTime: ''
+ replyTime: '',
+ state: '',
+ boradId: '',
},
isAble: false,
replyState: true,
+ replyInfoState: false,
meetTypeArr: [],
dailyTypeArr: [],
hideUpload: false,
@@ -142,41 +146,13 @@ export default {
computed: {
dataRule () {
return {
- boradId: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- userId: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- userName: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- replyContent: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- delFlag: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- revision: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- createdBy: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- createdTime: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- updatedBy: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- updatedTime: [
+ content: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
mounted () {
- debugger
this.pageDisabled = this.$route.query.disabled
this.hideUpload = this.$route.query.disabled
if (this.$route.query.id !== '' && this.$route.query.id != null) {
@@ -199,10 +175,23 @@ export default {
},
// 获取信息
getInfo () {
- this.$http.get(`/news/messageboradreply/${this.dataForm.id}`).then(({ data: res }) => {
+ this.$http.get(`/events/borad/details/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
+ let infoObj = res.data.state ;
+ if (infoObj == '0' && this.pageDisabled == true){ //表示是留言 查看详情状态 就显示留言内容
+ this.pove = true;
+ this.replyState = false
+ }else if (infoObj == '0' && this.pageDisabled == false){ //表示是留言 回复状态 就显示回复框
+ this.pove = false;
+ this.replyState = true;
+ this.dataForm.boradId = this.$route.query.id;
+ }else if (infoObj == '1' && this.pageDisabled == true){ //表示留言已经回复 的 查看详情状态 显示全部信息
+ this.pove = true;
+ this.replyState = true;
+ this.replyInfoState = true;
+ }
this.dataForm = {
...this.dataForm,
...res.data
@@ -215,7 +204,7 @@ export default {
if (!valid) {
return false
}
- this.$http[!this.dataForm.id ? 'post' : 'put']('/news/messageboradreply/', this.dataForm).then(({ data: res }) => {
+ this.$http['post']('/events/borad/reply/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -226,6 +215,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
+ this.backToUserRelationList();
}
})
}).catch(() => {})
@@ -240,8 +230,8 @@ export default {
this.handleErrorRemove(file)
return false
}
- this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1 })
- this.hideUpload = this.dataForm.images.length >= 3
+ this.dataForm.replyPicture.push({ url: res.data.imgUrl, breviaryUrl: res.data.thumbnail, fileType: 1 })
+ this.hideUpload = this.dataForm.replyPicture.length >= 3
},
handleErrorRemove (file) {
// 实现缩略图模板时删除文件
@@ -263,16 +253,16 @@ export default {
this.dialogVisible = true
},
handleRemove (file, fileList) {
- for (var i = 0; i < this.dataForm.images.length; i++) {
- let item = this.dataForm.images[i]
+ for (var i = 0; i < this.dataForm.replyPicture.length; i++) {
+ let item = this.dataForm.replyPicture[i]
if (item.url === file.url) {
- this.dataForm.images.splice(i, 1)
+ this.dataForm.replyPicture.splice(i, 1)
}
}
- this.hideUpload = this.dataForm.images.length >= 9
+ this.hideUpload = this.dataForm.replyPicture.length >= 3
},
beforeAvatarUpload (file) {
- if (this.dataForm.images.length === 3) {
+ if (this.dataForm.replyPicture.length === 3) {
this.$message.error('最多上传3张图片!')
return false
}
@@ -298,3 +288,9 @@ export default {
}
}
+
+
From d42ddfb913bf1a02e2a63fd0a5bfec2e9f91e986 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 19 Nov 2020 13:23:04 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E6=88=91=E8=A6=81=E9=97=AE=E4=BA=8B?=
=?UTF-8?q?=E3=80=91-=E3=80=90=E7=95=99=E8=A8=80=E6=9D=BF=20-=20=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
=?UTF-8?q?1-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/events/borad/messageboradreplyDetail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/events/borad/messageboradreplyDetail.vue b/src/views/modules/events/borad/messageboradreplyDetail.vue
index 6906e72..83a1d2e 100644
--- a/src/views/modules/events/borad/messageboradreplyDetail.vue
+++ b/src/views/modules/events/borad/messageboradreplyDetail.vue
@@ -15,10 +15,10 @@
style="width:50%">
-
+
{{dataForm.dept}}
-
+
Date: Thu, 19 Nov 2020 14:33:44 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E6=88=91=E8=A6=81=E9=97=AE=E4=BA=8B?=
=?UTF-8?q?=E3=80=91-=E3=80=90=E7=95=99=E8=A8=80=E6=9D=BF=20-=20=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
=?UTF-8?q?1-19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/events/borad/messageboradreplyDetail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/events/borad/messageboradreplyDetail.vue b/src/views/modules/events/borad/messageboradreplyDetail.vue
index 83a1d2e..87fe0d6 100644
--- a/src/views/modules/events/borad/messageboradreplyDetail.vue
+++ b/src/views/modules/events/borad/messageboradreplyDetail.vue
@@ -51,7 +51,7 @@
-
+