yangys
2025-08-22 02aad919c193a50948cfdd6bef5bf50882578baf
Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

# Conflicts:
# src/views/basesetting/machine.vue
已修改2个文件
24 ■■■■■ 文件已修改
src/views/basesetting/machine.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wel/shemi.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basesetting/machine.vue
@@ -27,14 +27,16 @@
          @on-load="onLoad"
        >
          <template #menu-left>
            <div class="menuLeft">
            <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">导出</el-button>
            <el-upload :show-file-list="false" class="upload-demo"
                action="/api/blade-mdm/machine/import"
                       :on-change="handleChange">
              <el-button type="primary" plain size="default">导入</el-button>
            </el-upload>
            <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">新增</el-button>
            </div>
          </template>
          <template #menu="scope">
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
@@ -540,4 +542,8 @@
  margin-left: 6px;
  margin-right: 6px;
}
.menuLeft {
  display: flex;
  align-items: center;
}
</style>
src/views/wel/shemi.vue
@@ -32,7 +32,7 @@
          </el-col>
          <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-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" :disabled-date="disabledDate" @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>
@@ -644,6 +644,19 @@
    
  },
  methods: {
    disabledDate(time) {
      // 获取当前日期
      const today = new Date();
      today.setHours(0, 0, 0, 0); // 设置为当天开始时间
      // 获取三个月前的日期
      const threeMonthsAgo = new Date();
      threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
      threeMonthsAgo.setHours(0, 0, 0, 0);
      // 禁用今天之后的日期和三个月前的日期之前的日期
      return time.getTime() > today.getTime() || time.getTime() < threeMonthsAgo.getTime();
    },
    createTimeChange(value) {
      this.searchTreeData.createTimeBegin = value[0];
      this.searchTreeData.createTimeEnd = value[1];
@@ -829,6 +842,7 @@
        this.$nextTick(() => {
          this.highlightTargetRow();  // 设置当前行高亮
          this.tabsForm = this.targetRow;  //tabs节点信息
          if(this.tabsForm == null) return;
          this.nodeTypeList.forEach(item=> {
            if(item.dictKey == this.tabsForm.nodeType) {
              this.tabsForm.nodeTypeName = item.dictValue;