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

李喆(开发组)

2025-07-25 604ac4fe83bf0641a58fb7dd1a7e2d3481d1be83

 src/views/wel/index.vue

@@ -57,7 +57,7 @@
</template>

<script>

import { ElMessage } from 'element-plus';
export default {
  data() {
    return {
@@ -274,7 +274,24 @@
          },
          {
            label: '流程状态',
            prop: 'abc'
            prop: 'flowStatus',
         formatter: (val, value, label) => {
            if(val.nodeType != '70'){
               //非程序节点
               return '';
            }else{
				
               if(value==0||value==null){
                  return '未启动';
               }else if(value == 1){
                  return '审批中';
               }else if(value == 2){
                  return '已通过';
               }else{
                  return '未定义';
               }
            }
         },
          },
          {
            label: '测试程序',
@@ -495,6 +512,9 @@
      var formData = new FormData();
      formData.append('file', this.file);
      formData.append('nodeId', this.id);
      if(this.isRepeatUpload) {
        formData.append('cofirm','1');
      }
      Object.keys(this.uploadmodalForm).forEach(key => {
        formData.append(key, this.uploadmodalForm[key]);
      });
@@ -503,11 +523,33 @@
        url: '/blade-mdm/program/ncfile/upload',
        method: 'post',
        data: formData,
      }).then(
        res => {
      }).then(res => {
          this.loading = false;
          this.uploadmodalBox = false;
          this.addLocalTreeNode(row.id);  //重新加载下一级
          if(res.data.code == 2) {
            this.$confirm('文件名已存在，确定上传吗?', '提示', {
              distinguishCancelAndClose: true,
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              type: 'warning'
            }).then(() => {
              this.isRepeatUpload = true;
              this.uploadmodalSubmit(row,done);
            }).catch(action => {
              this.isRepeatUpload = false;
              this.$message({
                type: 'info',
                message:'取消上传'
              })
            });
          }else if(res.data.success) {
            this.isRepeatUpload = false;
            this.uploadmodalBox = false;
            this.$message({type: 'success',message: '操作成功!'});
            this.addLocalTreeNode(row.id);  //重新加载下一级
          }else {
            this.isRepeatUpload = false;
            alert(1)
          }
          done();
        }
      );
@@ -677,7 +719,6 @@
        params: obj,
      }).then(
        res => {
          console.log(res.data,111)
          this.loading = false;
          resolve(res.data.data);
        }
@@ -723,7 +764,7 @@
        this.nodeTypeList = res.data.data;
      }
    );
    //判断版本  0:涉密网，1:工控网；//工控网5个，涉密网4个  
    //判断版本  0:涉密网，1:工控网；//工控网5个，涉密网4个  ,工控网取消
    // axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
    //     if(res.data.data === "0") {
    //       this.isSM = true;