Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!179

src/views/material/basicFile/details.vue

@@ -1349,25 +1349,33 @@
       },
       // 除基本信息之后的修改
       handleOtherEdit(type) {
+        debugger
         console.log('除基本信息之后的修改', type);
-        this.otherDeatils.show = true;
-        this.otherDeatils.isEdit = true;
-        let activeTab = this.detailsTabs.filter(item => item.code == this.activeMainTab)[0];
-        this.otherDeatils.title = activeTab.label;
         if ('table' === type) {
           if (this.mainMsg.checkedList.length == 1) {
+            this.otherDeatils.show = true;
+            this.otherDeatils.isEdit = true;
+            let activeTab = this.detailsTabs.filter(item => item.code == this.activeMainTab)[0];
+            this.otherDeatils.title = activeTab.label;
             this.otherDeatils.queryKey = this.mainMsg.checkedList[0].id;
             console.log(this.otherDeatils, 'this.otherDeatils');
+            // 查询其他标签页列表详情
+            this.getOtherListDetails(activeTab.code, this.otherDeatils.queryKey);
           } else {
             this.$message({
               message: '修改请选择单个数据！',
               type: 'warning'
             });
           }
-        }
-        if (this.otherDeatils.queryKey) {
-          // 查询其他标签页列表详情
-          this.getOtherListDetails(activeTab.code, this.otherDeatils.queryKey);
+        } else if ('form' === type) {
+          if (this.otherDeatils.queryKey) {
+            this.otherDeatils.show = true;
+            this.otherDeatils.isEdit = true;
+            let activeTab = this.detailsTabs.filter(item => item.code == this.activeMainTab)[0];
+            this.otherDeatils.title = activeTab.label;
+            // 查询其他标签页列表详情
+            this.getOtherListDetails(activeTab.code, this.otherDeatils.queryKey);
+          }
         }
       },
       // 其他标签详情弹窗-刷新