Merge remote-tracking branch 'origin/master'

dangan-ui/src/views/dangan/collection/index.vue

@@ -334,7 +334,6 @@ export default {
             type: 'error'
           });
         }else {
-          console.log(result.data);
           if(result.data.indexOf('M3230') !== -1){
             _this.WebScanSetParams()
           }else {
@@ -425,12 +424,12 @@ export default {
       catalogTreeselect().then(response => {
         this.dangAnOptions = response.data;
 
-        this.$nextTick(() => {
+        if(this.$route.query.id){
-          this.$refs.tree.setCurrentKey(this.$route.query.id);
+          this.$nextTick(() => {
-          this.dangAnNode = this.$refs.tree.getNode(this.$route.query.id);
+            this.$refs.tree.setCurrentKey(this.$route.query.id);
-
+            this.dangAnNode = this.$refs.tree.getNode(this.$route.query.id);
-          console.log(3132, this.dangAnNode);
+          });
-        });
+        }
 
       });
     },
@@ -441,33 +440,44 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data, Node) {
-      console.log(23132,Node);
       this.dangAnID = data.id;
       this.dangAnNode = Node;
     },
     /** 点击上传操作 */
     handleUpload() {
-      this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
+      if(this.dangAnNode){
-        this.getTreeselect();
+        this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
-        this.fileList = []
+          this.getTreeselect();
-        this.upload.shelfId=undefined;
+          this.fileList = []
-        this.upload.wlsjNode=undefined;
+          this.upload.shelfId=undefined;
-        this.upload.open = true;
+          this.upload.wlsjNode=undefined;
-      }).catch(() => {
+          this.upload.open = true;
-        this.upload.open = false;
+        }).catch(() => {
-      });
+          this.upload.open = false;
+        });
+      }else {
+        this.$alert(`请先选择档案目录`, `提示`, {
+          type: 'warning'
+        });
+      }
     },
     // 点击扫描上传
     handleScan(){
-      this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
+      if(this.dangAnNode){
-        this.getTreeselect();
+        this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
-        this.smwj.list = [];
+          this.getTreeselect();
-        this.smwj.shelfId=undefined;
+          this.smwj.list = [];
-        this.smwj.wlsjNode=undefined;
+          this.smwj.shelfId=undefined;
-        this.smwj.open = true;
+          this.smwj.wlsjNode=undefined;
-      }).catch(() => {
+          this.smwj.open = true;
-        this.smwj.open = false;
+        }).catch(() => {
-      });
+          this.smwj.open = false;
+        });
+      }else {
+        this.$alert(`请先选择档案目录`, `提示`, {
+          type: 'warning'
+        });
+      }
     },
     /** 查询目录下拉树结构 */
     getTreeselect() {