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

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%;