Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/components/import/task/components/index.vue

@@ -90,6 +90,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { downLoad2 } from '@/utils'
 export default {
   components: {},
   props: {
@@ -353,7 +354,7 @@ export default {
     },
     //下载附件
     handleDownload(row) {
-
+      downLoad2()
     }
   },
 };

src/views/components/indicia/components/indicia.vue

@@ -24,7 +24,7 @@
         </component>
       </div>
       <!-- collapse分页 -->
-      <div style="text-align: center;">
+      <div style="text-align: right;">
         <el-pagination background layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
           :page-size.sync="queryParams.size" @current-change="handleCurrentChange" :total="total">
         </el-pagination>

src/views/project/patentDetails/components/patentDetails.vue

@@ -243,7 +243,7 @@ export default {
           value: 'PatentPDF',
           label: '说明书'
         },
-        
+
       ],
       menuList2: [
         {
@@ -320,7 +320,7 @@ export default {
   methods: {
     // 获取批注
     getPiZhuData(val) {
-      
+
       // if (val) {
       //   var index = this.piZhuContrastList.findIndex(item => {
       //     item.patentNo == val
@@ -331,7 +331,7 @@ export default {
       // }
       let params = {
         patentNo: val ? val : this.patentNo,
-        projectId:this.projectId,
+        projectId: this.projectId,
       }
       this.$api.queryScratchWords(params).then(response => {
         if (response.code == 200) {
@@ -413,12 +413,22 @@ export default {
 
     },
     handleSelect(index) {
+      // 导出文档
       if (index === 'PatentExport') {
+        let obj = {
+          isAdd: [this.patentNo],
+          isDelete: [],
+          startNumber: 1,
+          endNumber: 0,
+          searchQuery: '',
+          customFields: [],
+          orderDTOList: [],
+        }
         const router = this.$router.resolve({
-          path: '/workspace/folder/export/patent',
+          path: '/exportPatent',
           query: {
-            id: this.projectId,
-            patent: this.patent.id
+            projectId: this.projectId,
+            condition: JSON.stringify(obj)
           }
         })
         window.open(router.href, '_blank');