Merge remote-tracking branch 'origin/develop' into develop

src/pages/personal/pages/my-questions/components/answerItem.vue

@@ -108,7 +108,10 @@ export default {
       this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
         _this: this
       }, res => {
-
+          if(res.merge === '添加成功'){
+            this.form.reply = ''
+            this.fileList = []
+          }
       }, e => {
 
       })

src/pages/personal/pages/my-questions/components/questionItemInfo.vue

@@ -10,20 +10,20 @@
         </div>
       </div>
       <div class="row">
-        <div class="item">
+        <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
             <span style="color: #409EFF">{{answer.appendixName}}</span>
           </div>
         </div>
       </div>
-      <div class="row" style="float: right; margin-right: 10px">
+      <div class="row" style="float: left;">
         <div class="item">
           <div>{{answer.answerer}}
             <span>{{answer.replyTime}}</span>
           </div>
         </div>
       </div>
-      <div>
+      <div style="float: right; margin-top: 20px">
         <el-checkbox v-if="answer.checkedShow" @change="answerChang"  v-model="answer.checked">归档</el-checkbox>
       </div>
     </div>
@@ -43,7 +43,10 @@ export default {
     }
   },
   methods:{
-    answerChang(val){
+    //点击预览
+    clickButtonTo() {
+      const attId = this.answer.appendixId
+      this.$preview(attId)
     },
   },
   watch:{

src/pages/personal/pages/my-questions/index.vue

@@ -320,7 +320,7 @@
                               <template slot="label">
                                 <questions-item :question="question"></questions-item>
                               </template>
-                              <div>
+                              <div class="ansBox">
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
@@ -380,7 +380,7 @@
                               <template slot="label">
                                 <questions-item :question="question"></questions-item>
                               </template>
-                              <div>
+                              <div class="ansBox">
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
@@ -440,7 +440,7 @@
                               <template slot="label">
                                 <questions-item :question="question"></questions-item>
                               </template>
-                              <div>
+                              <div class="ansBox">
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
@@ -500,7 +500,7 @@
                               <template slot="label">
                                 <questions-item :question="question"></questions-item>
                               </template>
-                              <div>
+                              <div class="ansBox">
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
@@ -1373,6 +1373,7 @@ export default {
       this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
     },
     addList() {
+      this.handleSelectForm.lawNumber = ''
       this.handleSelectForm.dataSource = this.standType
       this.handleSelectForm.standType = this.standType
       this.searchLawBtn()
@@ -1587,6 +1588,7 @@ export default {
     },
     //提问按钮
     queBtn(){
+      this.fileList = []
       this.questionForm = {
         pubQue :  '',//公共问题
         classification: 'INLAND', //标准类型
@@ -1843,6 +1845,10 @@ export default {
   text-align: left;
   height: auto;
 }
+.ansBox{
+  height: calc(~ '100% - 190px');
+  overflow: auto;
+}
 .answer-box{
   height: auto;
   width: auto;
@@ -1858,7 +1864,7 @@ export default {
   //border-top: 1px solid #cccccc;
 }
 /deep/.el-upload-dragger{
-  width: 450px !important;
+  width: 495px !important;
 }
 .el-input{
   width: 90%;

src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue

@@ -10,13 +10,13 @@
         </div>
       </div>
       <div class="row">
-        <div class="item">
+        <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
-            <span style="color: #409EFF">{{answer.appendixName}}</span>
+            <span style="color: #409EFF" >{{answer.appendixName}}</span>
           </div>
         </div>
       </div>
-      <div class="row" style="float: right; margin-right: 10px">
+      <div class="row" style="float: left; ">
         <div class="item">
           <div>{{answer.answerer}}
             <span>{{answer.replyTime}}</span>
@@ -36,6 +36,11 @@ export default {
     }
   },
   methods:{
+    //点击预览
+    clickButtonTo() {
+      const attId = this.answer.appendixId
+      this.$preview(attId)
+    },
   },
   watch:{
     answer: {

src/pages/regulatoryRepository/standQA/index.vue

@@ -847,6 +847,7 @@ export default {
       this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
     },
     addList() {
+      this.handleSelectForm.lawNumber = ''
       this.handleSelectForm.dataSource = this.standType
       this.handleSelectForm.standType = this.standType
       this.searchLawBtn()
@@ -1004,6 +1005,7 @@ export default {
     },
     //提问按钮
     queBtn(){
+      this.fileList = []
       this.questionForm = {
           pubQue :  '',//公共问题
           classification: 'INLAND', //标准类型
@@ -1242,7 +1244,7 @@ export default {
   //border-top: 1px solid #cccccc;
 }
 /deep/.el-upload-dragger{
-  width: 450px !important;
+  width: 490px !important;
 }
 .el-input{
   width: 90%;