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

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -882,7 +882,7 @@ export default {
         this.probaseOptions = res.data.PROBASE;
         this.productTypeOptions = res.data.XMLB;
         this.targetMarketOptions = res.data.SCXX;
-      });
+      })
     },
     // 更多
     handleCommand(command) {
@@ -1541,6 +1541,7 @@ export default {
     }
   },
   created() {
+    console.log(this.productTypeOptions)
     this.getDept().then(res => {
       this.getUser(res);
     }, e => {
@@ -1590,7 +1591,7 @@ export default {
   }
 
   /deep/ .pagination {
-    position: relative;
+    position: absolute;
   }
 
   .row-col-box {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -453,7 +453,7 @@
       </div>
     </el-drawer>
     <!--导出-->
-    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="700" :show-close="false">
+    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="500px" :show-close="false">
       <label-input v-model="exportName" placeholder="请输入导出文件名" clearable label="导出名称"/>
       <div slot="footer">
         <el-button class="common-button-primary" icon="el-icon-check" type="primary"