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

yangys

2025-08-22 c1343ffa4bb95941a70ceb8bc64e72d8a982b873

 src/views/wel/shemi.vue

@@ -17,15 +17,24 @@
    >
      <template #search>
        <el-row :gutter="24">
          <el-col :span="6">
            <el-input v-model="search.name" placeholder="请输入节点名称" clearable/>
          <el-col :span="8" class="search-data-flex">
            <span class="search-data-title">程序状态:</span>
            <el-checkbox-group v-model="searchTreeData.programStatus">
              <el-checkbox value="1" label="试切" />
              <el-checkbox value="2" label="固化" />
              <el-checkbox value="3" label="偏离" />
            </el-checkbox-group>
          </el-col>
          <el-col :span="6">
            <el-select v-model="search.nodeType" placeholder="请输入节点类型" clearable>
              <el-option v-for="item in nodeTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictKey"/>
            </el-select>
          <el-col :span="8" class="search-data-flex">
            <span class="search-data-title">零组件号:</span>
            <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="零组件号" :remote-method="remoteMethod" :loading="searchLoading">
              <el-option v-for="item in drawingNoList" :key="item.value" :label="item.label" :value="item.value"/></el-select>
          </el-col>
          <el-col :span="6">
          <el-col :span="8" class="search-data-flex">
            <span class="search-data-title">时间范围:</span>
            <el-date-picker v-model="searchTreeData.createTime" type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="createTimeChange"/>
          </el-col>
          <el-col :span="8">
            <el-button type="primary" @click="searchTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Search /></el-icon>搜索</el-button>
            <el-button :icon="Delete" @click="setClearTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Delete /></el-icon>清空</el-button>
          </el-col>
@@ -46,7 +55,8 @@
        <!-- <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="下发" title="下发"></el-button> -->
        <!-- 替换 -->
        <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,')>-1" icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="替换" title="替换"></el-button>
        <!-- <el-icon><Switch /></el-icon> -->
        <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1 && row.isLocked != 1" icon="el-icon-lock" type="primary" @click="locked(row,true)" placeholder="锁定" title="锁定"></el-button>
        <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1 && row.isLocked == 1" icon="el-icon-unlock" type="primary" @click="locked(row,false)" placeholder="解锁" title="解锁"></el-button>
      </template>
    </avue-crud>
    <!-- 新增节点 -->
@@ -65,7 +75,7 @@
    </el-dialog>
    <avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
    <avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
    <span v-else-if="tabsType == 'tab2'">版本信息</span>
    <!--<span v-else-if="tabsType == 'tab2'">版本信息</span>-->
    <template v-else-if="tabsType == 'tab3'">
        <div v-html="convertToHtml(fileContent)" class="convertToHtml"></div>
    </template>
@@ -91,7 +101,7 @@
  <el-drawer title="替换" append-to-body v-model="todolistModel" size="100%" class="code-box">
    <div class="approve-box">
        <div class="left">
            <TodolistLeft :row="row" :replaceDataId="replaceDataId" :drawingNo="drawingNo" :processNo="processNo" @selection-change="todoSelectionChange" />
            <TodolistLeft :row="row" :replaceDataId="replaceDataId" :drawingNo="drawingNo" :processNo="processNo" :processEdition="processEdition" @selection-change="todoSelectionChange" />
        </div>
        <div class="right">
            <TodolistRightTop :row="row" :name="name" />
@@ -113,8 +123,18 @@
  data() {
    let rejectText = '驳回';//+this.row.categoryName;
    return {
      drawingNoList: [],
      searchLoading: false,
      searchTreeData: {
        programStatus: [],
        drawingNo: "",
        createTime: [],
        createTimeBegin: "",
        createTimeEnd: ""
      },
      drawingNo: '',
      processNo: '',
       processEdition: '',
      replaceDataId: "",
      formApprove: {
        title: '',
@@ -209,22 +229,22 @@
          icon: 'el-icon-info',
          label: '节点信息',
          prop: 'tab1',
        }, {
        }/*, {
          icon: 'el-icon-warning',
          label: '版本信息',
          prop: 'tab2',
        }]
        }*/]
      },
      tabsOption2: {
        column: [{
          icon: 'el-icon-info',
          label: '节点信息',
          prop: 'tab1',
        }, {
        },/* {
          icon: 'el-icon-warning',
          label: '版本信息',
          prop: 'tab2',
        }, {
        }, */{
          icon: 'el-icon-warning',
          label: '文件内容',
          prop: 'tab3'
@@ -261,25 +281,25 @@
            prop: 'createTime',
            disabled: true,
            placeholder: " "
          },
          },/*
          {
            label: '节点描述',
            prop: 'description',
            disabled: true,
            placeholder: " "
          },
          },*/
          {
            label: '修改时间',
            prop: 'updateTime',
            disabled: true,
            placeholder: " "
          },
          }/*,
          {
            label: '备注',
            prop: 'remark',
            disabled: true,
            placeholder: " "
          }
          }*/
        ]
      },
      tabsForm: {},
@@ -342,10 +362,6 @@
      modalTitle: "",
      id: "",
      parentId:1,
      search: {
        name: "",
        nodeType: ""
      },
      loading: true,
      mypage: {
        size: 10,
@@ -411,7 +427,7 @@
                    return '';
                }
            }
          },
          },/*
          {
            label: '版次',
            prop: 'processEdition',
@@ -426,16 +442,16 @@
          {
            label: '描述',
            prop: 'abc'
          },
          },*/
          {
            label: '类型',
            prop: 'nodeTypeName'
          },
          },/*
          {
            label: '设备',
            prop: 'machineCode'
          },
          
          */
          {
            label: '锁定状态',
            prop: 'isLocked',
@@ -458,25 +474,30 @@
                        //非程序节点
                        return '';
                    }else{
                        if(value==0||value==null){
                        if(value==0||value==-1){
                            return '未启动';
                        }else if(value == 1){
                            return '审批中';
                        }else if(value == 2){
                            return '已通过';
                        }else{
                            return '未定义';
                            return '';
                        }
                      }
                  },
          },
          },/*
          {
            label: '测试程序',
            prop: 'abc'
          },
          },*/
          {
            label: '创建人',
            prop: 'createUserName',
            width: '180'
          },
        {
            label: '创建时间',
            prop: 'createTime',
            width: '180'
          }
        ],
@@ -623,27 +644,74 @@
    
  },
  methods: {
    createTimeChange(value) {
      this.searchTreeData.createTimeBegin = value[0];
      this.searchTreeData.createTimeEnd = value[1];
    },
    remoteMethod(query) {
      if (query) {
        this.searchLoading = true;
        axios({
          url: '/blade-mdm/program/node/drawing-no-pick',
          method: 'get',
          params: {drawingNo: query}
        }).then(resp => {
          this.searchLoading = false;
          var drawingNoList = [];
          resp.data.data.forEach(item=> {
            drawingNoList.push({label: item,value: item})
          })
          this.drawingNoList = drawingNoList;
        });
      }else {
        this.drawingNoList = [];
      }
    },
    locked(row, isLock) {
      row.isLocked == isLock
      this.$confirm(`是否${isLock ? '解锁' : '锁定'}`, {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      }).then(() => {
        axios({
          url: isLock ? '/blade-mdm/flow/lock/start-unlock' : '/blade-mdm/program/node/lock',
          method: 'post',
          params: {id: row.id,nodeId: row.id}
        }).then(res => {
          if(res.data.code == 200) {
            this.$message({type: 'success',message: '操作成功!'});
            this.addLocalTreeNode(row.parentId);
          }else {
            this.$message({type: 'success',message: res.data.msg});
          }
        });
      });
    },
    handleSubmit(form, done) {
      //发起程序替换流程
      var obj = {
        title: this.formApprove.title,
        nodeId: this.id,
        tempInstanceId: this.replaceDataId,
          comment: this.formApprove.comment,
        assignee: this.formApprove.assignee
      }
      axios({
        url: '/blade-mdm/flow/replace/start',
        method: 'post',
        data: obj
      }).then(
      resp => {
        this.$message({
          type: 'success',
          message: '操作成功!',
      }).then(resp => {
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          this.todolistModel = false;
        }).catch(error =>{
          window.console.log('haha',error);
          done();
        });
        done();
        this.todolistModel = false;
      });
      // if(this.row.taskDefinitionKey === 'programmingTask') {
      //     // if(this.applist.length !== 1) {
      //     //     done();
@@ -684,14 +752,29 @@
        url: '/blade-mdm/flow/replace/pre',
        method: 'post',
        params: {nodeId: row.id}
      }).then(
      resp => {
      }).then(resp => {
        this.row = row;
        this.replaceDataId = resp.data.data.processInstanceId;
        this.processNo = resp.data.data.processNo;
        this.drawingNo = resp.data.data.drawingNo;
        this.processEdition = resp.data.data.processEdition;
          this.drawingNo = resp.data.data.drawingNo;
        this.formApprove.title = resp.data.data.name + "替换";
        this.getHandler(); //获取处理人
        this.todolistModel = true;
      });
    },
    getHandler() {  //获取处理人
      axios({
        url: '/blade-mdm/flow/replace/default-assignees',
        method: 'get',
        params: {drawingNo: this.drawingNo}
      }).then(
      resp => {
        if(resp.data.code == 200) {
          this.formApprove.assignee = resp.data.data.checkerId;
        }else {
          this.$message.success(resp.msg);
        }
      });
    },
    convertToHtml(text) {
@@ -702,9 +785,13 @@
        if (node.children && node.children.length > 0) {
          node.children = this.removeHasChildren(node.children);
        }
        if(node.children.length > 0) {
           const { hasChildren, ...rest } = node;
          return rest;
        } else {
          return node;
        }
        // 删除当前节点的 hasChildren 属性
        const { hasChildren, ...rest } = node;
        return rest;
      });
    },
     // 递归查找目标行（name="机床1"）
@@ -728,11 +815,14 @@
      }
    },
    searchTree() {
      if(this.searchTreeData.programStatus.length == 0) return;
      if(this.searchTreeData.drawingNo == "") return;
      axios({
        url: '/blade-mdm/program/node/search-list',
        method: 'get',
        params: this.search,
        params: this.searchTreeData,
      }).then(res => {
        if(res.data.data.length == 0) return;
        this.option.defaultExpandAll = true;
        this.treeData = this.removeHasChildren(res.data.data);
        this.$nextTick(() => {
@@ -751,6 +841,13 @@
    },
    setClearTree() {
      this.option.defaultExpandAll = false;
      this.searchTreeData = {
        programStatus: [],
        drawingNo: "",
        createTime: [],
        createTimeBegin: "",
        createTimeEnd: ""
      };
      this.treeData = [];
      this.$nextTick(()=> {
        this.onLoad();
@@ -1170,4 +1267,14 @@
  .code-box .el-drawer__header {
    margin-bottom: 0;
  }
  .search-data-title {
    font-size: 12px;
    margin-right: 8px;
    display: inline-block;
    width: 68px;
  }
  .search-data-flex {
    display: flex!important;
    align-items: center;
  }
</style>