From bd8ce07047f80072026718245e26836c25f7227a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 6 Jun 2022 17:32:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../my-questions/components/answerItem.vue | 24 +++++++---- .../components/questionItemInfo.vue | 16 +++++--- .../personal/pages/my-questions/index.vue | 41 +++++++++++++++++-- 3 files changed, 63 insertions(+), 18 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index 2f6d9e2fc..5d5e90a5a 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -4,12 +4,12 @@
- + + v-model="form.reply">
@@ -88,12 +88,11 @@ export default { importModalshowflagtemp: false, fileList: [], form:{ - textarea: '', - invitationId: '', - invitationName: '', + reply: '', + answerer: this.$store.getters.userInfo.userId, }, rules: { - textarea: [ + reply: [ { required: true, message: '请输入回复内容', trigger: 'blur' }, { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' } ] @@ -103,8 +102,16 @@ export default { methods:{ //提交 handleSubmit(){ + let asdId = sessionStorage.getItem('queId') this.form.fileList = this.fileList - console.log(this.form); + this.form.askId = asdId + this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{ + _this: this + }, res => { + + }, e => { + + }) }, //上传文件 openUploadFileDialog(){ @@ -173,7 +180,8 @@ export default { }, //问题归档 queArchive(){ - + let mergeList = JSON.parse(sessionStorage.getItem('mergeList')) + console.log(mergeList); }, //邀请 invitation(){ diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 4ce7073a7..cc88ae26f 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -11,8 +11,8 @@
-
附件： - {{answer.annex}} +
附件： + {{answer.appendixName}}
@@ -23,9 +23,9 @@
- - - +
+ 归档 +
@@ -39,9 +39,13 @@ export default { props:['answer'], data(){ return{ - checked: true, + checked: '', } }, + methods:{ + answerChang(val){ + }, + }, watch:{ answer: { immediate: true, diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index d06761c6a..6ab4f5065 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -770,7 +770,7 @@
@@ -781,7 +781,17 @@ 企业标准 公共 - 选择标准 +
+ + + + +
+ 选择标准 @@ -1202,6 +1212,7 @@ export default { }, data(){ return{ + mergeList: [], handleSelectForm: { standName: '', //标准名称 numberName: '', //政策名称 @@ -1234,9 +1245,11 @@ export default { activeType: 'INLAND', activestand: '', activeQue: '', + pubOptions: [], //公共问题 standType: 'INLAND', dialogVisible: false, questionForm:{ + pubQue: '', //公共问题 classification: 'INLAND', //标准类型 problemDescription: '', //问题 questioner: this.$store.getters.userInfo.userId, //提问人 @@ -1271,9 +1284,25 @@ export default { }, res => { this.setMap(res.data.WBZTCLASS);// 文本状态 this.textState = res.data.WBZTCLASS // 文本状态 + this.pubOptions = res.data.DYGGWT //问答公共问题 }, e => { }); }, + watch:{ + answerList: { + immediate: true, + deep: true, + handler(val) { + this.mergeList = [] + val.forEach(item =>{ + if(item.checked){ + this.mergeList.push(item.id) + } + }) + sessionStorage.setItem('mergeList', JSON.stringify(this.mergeList)) + } + } + }, methods:{ // 点击查看 handlePreview(item) { @@ -1488,7 +1517,7 @@ export default { }) }, standClick3(){ - this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{ + this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{ standardId: this.activestand, answerer: this.$store.getters.userInfo.userId, },{ @@ -1633,9 +1662,13 @@ export default { }, //提交问题 queSubmit(){ + if(this.standType === 'OTHER'){ + this.questionForm.standardId = this.questionForm.pubQue + this.questionForm.standardName = this.questionForm.pubQue + this.questionForm.standardEncdoing = this.questionForm.pubQue + } if(this.questionForm.standardId){ this.questionForm.fileList = this.fileList - console.log(this.questionForm); this.$refs['queForm'].validate((valid) => { if(valid){ this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm }, From 1aed87142c30a7dcb9c904b95ae8704270e066a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 6 Jun 2022 17:54:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/my-questions/components/answerItem.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index 5d5e90a5a..7855ce2a4 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -180,8 +180,20 @@ export default { }, //问题归档 queArchive(){ + let list = [] let mergeList = JSON.parse(sessionStorage.getItem('mergeList')) - console.log(mergeList); + for (let i = 0; i < mergeList.length; i++) { + list.push(mergeList[i]) + } + let listId = list.join(',') + this.$http.post('lawss/Reply/updateReply', { + id: listId, + },{ + _this: this + }, res => { + }, e => { + + }) }, //邀请 invitation(){