Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

yangys

2025-09-07 67b6b98447c7295f5bea7a68fbc64ff9a9865cd1

 src/views/wel/shemi.vue

@@ -766,7 +766,6 @@
      return time.getTime() > today.getTime() || time.getTime() < threeMonthsAgo.getTime();//
    },
    createTimeChange(value) {
      console.log('createTimeChange', value)
      this.searchTreeData.createTimeBegin = value[0];
      this.searchTreeData.createTimeEnd = value[1];
    },
@@ -818,7 +817,6 @@
      this.unlockBox = true;
    },
    lockSubmit(row,done) {  
      //console.log(row,done)
      //锁定提交
      this.$confirm('是否锁定', {
        confirmButtonText: '确定',
@@ -826,7 +824,6 @@
        type: 'warning',
      }).then(() => {
        axios.post('/blade-mdm/program/node/lock',qs.stringify(this.lockForm)).then(res=>{
          console.log('res',res.data)
          if (res.data.code == 200) {
            this.$message({ type: 'success', message: '操作成功!' });
            this.addLocalTreeNode(this.lockForm.parentId);
@@ -891,7 +888,6 @@
        done();
        this.todolistModel = false;
      }).catch(error => {
        window.console.log('haha', error);
        done();
      });
      
@@ -974,7 +970,6 @@
      return treeData.map(node => {
        if (node.children && node.children.length > 0) {
          this.defaultExpandedKeys.push(node.id);
          console.log('>>>>>>>>', this.defaultExpandedKeys)
          node.children = this.removeHasChildren(node.children);
        }
        if (node.children.length > 0) {
@@ -1010,7 +1005,6 @@
        };
        // this.option.defaultExpandAll = true;
        let treeData = this.removeHasChildren(res.data.data);
        console.log('treeData', treeData)
        this.option = Object.assign({},this.option,{defaultExpandedKeys: this.defaultExpandedKeys,lazy: true,defaultExpandAll: true});
        setTimeout(() => {
          this.treeSearchLoad = false;
@@ -1312,7 +1306,6 @@
      this.uploadmodalBox = false;
    },
    treeLoad(tree, treeNode, resolve) {
      console.log('tree', tree, treeNode, this.option)
      this.loading = true;
      var obj = { parentId: tree.id }