commit

src/pages/details/otherBussStandardDetails/index.vue

@@ -363,14 +363,14 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
                                 title="下载带水印"
                                 v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                             />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
@@ -384,13 +384,13 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
                                 title="下载带水印"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
                         <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->

src/pages/details/otherStandardDetails/index.vue

@@ -954,7 +954,6 @@
         </el-table>
         <loading :loading="tableLoading">数据加载中...</loading>
       </div>
-
       <pagination
         :page="page7"
         :total="total7"
@@ -2790,18 +2789,16 @@ export default {
       this.$refs.multipleTable.toggleRowSelection(row, true)
     },
     selectAllStand(alldata) {
-      this.selectedItemList = []
-      this.selectedItemList.push(alldata[alldata.length - 1])
+      this.selectedItemList = alldata
     },
     editResolveList() {
       if (this.selectedItemList.length > 0) {
-        this.editResolveListShowflag = true
-        let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
-        this.resolveListForm = editItem
+        this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0]))
         this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
         // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
         this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
         this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
+        this.editResolveListShowflag = true
       } else {
         this.$message.warning('请选择一条数据')
       }
@@ -2832,6 +2829,8 @@ export default {
       )
     },
     resetEditResolveListForm() {
+      this.resolveListForm.applyArctic = ''
+      this.resolveListForm.dutyEngineer = ''
       this.editResolveListShowflag = false
     },
     // 分页点击后方法
@@ -2851,7 +2850,6 @@ export default {
         this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
           _this: this
         }, res => {
-          console.log(res.data);
           this.sarStandardsInfoEO = res.data || {}
           this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
           if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
@@ -3114,7 +3112,9 @@ export default {
       }
     },
     showItemsModel(attField) {
-      this.fileType = attField
+      if (attField) {
+        this.fileType = attField
+      }
       this.getOrgTreeSource()
       this.selectedItemList = []
       this.selectSarStandItems()
@@ -3846,7 +3846,6 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
-        console.log(displayLocation);
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false