From de0f4a2bc3d1417212e599f135be55ad780a8bc1 Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Mon, 26 Jul 2021 17:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/details.vue                             | 15 +++++++++++----
 .../nonConfomity/pages/rectificationDatabase.vue  |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 9cf6991c4..f73e7aa91 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -585,16 +585,23 @@ export default {
             ids+=',\''+this.selectList[i].standId+'\''
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
-          console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+          console.log(exportURL)
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
+        let ids = ''
+        if (this.selectList.length === 0) {
+          ids='\''+this.dataList[0].standId+'\''
+          for(let i=1;i<this.dataList.length;i++){
+            ids+=',\''+this.dataList[i].standId+'\''
+          }
+        }
         const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-            'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
-        console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+        console.log(exportURL)
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 3ef6e2189..38daf3d9b 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -116,7 +116,7 @@
               prop="standId"
               fixed="left"
               width="180"
-              label="标准编号">
+              label="标准号">
 <!--              <template slot-scope="scope">-->
 <!--                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
 <!--&lt;!&ndash;                {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
                 style="width: 100%;"
                 :model="historySeeForm"
               >
-                <el-form-item class="add-form-item" label="标准编号:">
+                <el-form-item class="add-form-item" label="标准号:">
                   <div class="seeItem">{{historySeeForm.standId}}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="标准名称:">