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

src/pages/config/pages/mechanismManage/index.vue

@@ -264,6 +264,7 @@ export default {
           item.NameList = NameList
         })
         this.data = res.data
+        this.total = res.data.length
       })
     },
     pageChange (page) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -345,7 +345,8 @@ export default {
       this.$router.push({
         name: "ListOfStandardsAndRegulationsDetails",
         query: {
-          id: item.id
+          id: item.id,
+          fileIds: item.fileIds
         }
       });
     }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -533,6 +533,7 @@ export default {
         id: '',
         sortKey: 1,
         countryArea: '',
+        fileIds: '',
         detailedListName: '',
         energyKind: '',
         type: '',
@@ -844,7 +845,6 @@ export default {
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
         this.fileInfoList = fileList
-        console.log(this.fileInfoList)
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
@@ -1184,8 +1184,7 @@ export default {
             this.fileInfoList.map(item => {
               relateFile.push(item.id)
             })
-            sarAccessEO.relateFile = relateFile.join(',')
-            console.log(sarAccessEO.relateFile)
+            sarAccessEO.fileIds = relateFile.join(',')
           }
           if (!sarAccessEO.id) {
             // 新增
@@ -1199,12 +1198,8 @@ export default {
                 this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
-                  name: 'AccessStandardsAndRegulations',
-                  query: {
-                    relateFile: sarAccessEO.relateFile
-                  }
+                  name: 'AccessStandardsAndRegulations'
                 })
-                console.log(sarAccessEO)
               }
             }, e => {
             })
@@ -1602,7 +1597,7 @@ export default {
     // 请求上传的文件信息
     getFileInfo () {
       this.$http.get('att/attFile/getMultiFileInfos', {
-        fileIds: this.sarAccessEO.relateFile
+        fileIds: this.$route.query.fileIds
       }, {
         _this: this
       }, res => {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -21,7 +21,7 @@
           <label class="transition-box-label">附件：</label>
           <div class="file-box" v-if="fileInfoList.length > 0">
             <p v-for="item in fileInfoList"
-               :key="item.id">
+               :key="item.id"> {{ item.name }}
               <i
                 title="下载"
                 @click="downloadFile(item.id)"
@@ -251,6 +251,7 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
+import { exportFile } from '@/api/unqualProcess'
 
 export default {
   name: "AccessStandardDetails",
@@ -452,9 +453,8 @@ export default {
     },
     // 请求上传的文件信息
     getFileInfo() {
-      console.log(this.sarAccessEO)
       this.$http.get("att/attFile/getMultiFileInfos", {
-        fileIds: this.sarAccessEO.relateFile
+        fileIds: this.sarAccessEO.fileIds
       }, {
         _this: this
       }, res => {
@@ -474,7 +474,7 @@ export default {
     },
     // 附件下载事件
     fileDownLoad(attId) {
-      window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
+      window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
     },
     // 点击查看
     handlePreview(item) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1151,7 +1151,6 @@ export default {
     },
     // 提交按钮 事件
     saveSarAccess () {
-      alert()
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -293,6 +293,7 @@ export default {
           this.sarProject.country = ''
           this.sarProject.standCode=''
           this.sarProject.standName = ''
+          this.sarProject.standNumber=''
           this.queryStandAndLaws()
       }, // 外层清空条件查询
       handleProjectCompliance (row) {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -264,6 +264,7 @@ name: "technologyInvolveProject",
           this.sarProject.country = ''
           this.sarProject.standCode=''
           this.sarProject.standName = ''
+          this.sarProject.standNumber=''
           this.queryStandAndLaws()
       }, // 外层清空条件查询
       handleProjectCompliance (row) {