Merge remote-tracking branch 'origin/feature/v5.0/5.0.3' into feature/v5.0/...

罗广辉

2025-08-22 f01ffeea79a1b4234ea9c270b68b6a19e54258f5

Merge remote-tracking branch 'origin/feature/v5.0/5.0.3' into feature/v5.0/5.0.3

 src/views/job/components/SearchBox.vue

@@ -61,13 +61,9 @@
        <div class="more" v-if="isExpand" @click="toggleExpand">收起</div>
        <div class="more" v-else @click="toggleExpand">更多</div>
        <div class="search-btn" :style="{ bottom: isExpand ? '5px' : '-3px' }">
          <div class="btn clear" @click="handleReset">
            <img src="@/assets/images/task/clear.png" />重置
          </div>
          <div class="btn search" @click="handleSearch">
            <img src="@/assets/images/task/search.png" />搜索
          </div>
          <!-- <div class="btn add" @click="addTask"><img src="@/assets/images/task/add.png"/>新增</div> -->
          
          <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
          <el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
        </div>
        <el-form-item label="任务算法:" v-if="isExpand" class="taskAlgorithm">
          <!-- <TaskAlgorithmBusiness
@@ -77,17 +73,25 @@
            @algorithmChange="algorithmChange"
          /> -->
          <el-tree-select
              popper-class="custom-tree-select"
              :style="{ width: pxToRem(186) }"
              v-model="dictKey"
              :data="dataList"
              :default-expanded-keys="[dictKey]"
              check-strictly
              node-key="id"
              :props="treePropsSF"
              @node-click="handleSFNodeClick"
              clearable
              @clear="handleClear"
          style="z-index: 1000"
            :teleported="false"
            class="custom-tree-select"
            :style="{ width: pxToRem(186) }"
            v-model="dictKey"
            :data="dataList"
            :default-expanded-keys="[dictKey]"
            :props="treePropsSF"
            :render-after-expand="false"
            :default-checked-keys="checkedKeys"
            node-key="id"
            multiple
            show-checkbox
            collapse-tags
            collapse-tags-tooltip
            clearable
            @node-click="handleNodeClick"
            @check="handleCheck"
            @clear="handleClear"
          />
        </el-form-item>
        <!-- <el-form-item label="所属部门:" v-if="isExpand">
@@ -107,6 +111,7 @@
        </el-form-item> -->
        <el-form-item label="任务状态:" v-if="isExpand">
          <el-select
          style="z-index: 1000"
            :teleported="false"
            v-model="searchForm.status"
            placeholder="请选择"
@@ -394,6 +399,16 @@
//   { immediate: true, deep: true }
// );

const checkedKeys = ref([])

const handleCheck = (data, { checkedKeys, checkedNodes }) => {
    dictKey.value = checkedKeys
    // 获取所有选中节点的 dictKey
    const selectedDictKeys = checkedNodes.map(node => node.dictKey).filter(Boolean)
  searchForm.ai_types = selectedDictKeys
  handleSearch()
}

onBeforeUnmount(() => {
  checked.value = 'today';
  searchForm.date_enum = 'TODAY';

 src/views/tickets/ticket.vue

@@ -83,7 +83,7 @@
                :value="item.dict_key"
              />
            </el-select> -->
            <el-tree-select
            <!-- <el-tree-select
              popper-class="custom-tree-select"
              :style="{ width: pxToRem(186) }"
              placeholder="请选择关联算法"
@@ -96,7 +96,28 @@
              @node-click="handleSFNodeClick"
              clearable
              @clear="handleClear"
          />
            /> -->
            <el-tree-select
              style="z-index: 1000"
              :teleported="false"
              class="custom-tree-select"
              :style="{ width: pxToRem(186) }"
              v-model="dictKey"
              :data="dataList"
              :default-expanded-keys="[dictKey]"
              :props="treePropsSF"
              :render-after-expand="false"
              :default-checked-keys="checkedKeys"
              node-key="id"
              multiple
              show-checkbox
              collapse-tags
              collapse-tags-tooltip
              clearable
              @check="handleCheck"
              @node-click="handleSFNodeClick"
              @clear="handleClear"
            />
            <el-select
              v-model="filters.isReview"
              placeholder="请选择复核状态"
@@ -1133,6 +1154,7 @@
      },
      dictKey: '',
      dataList: [],
      checkedKeys: [],
    };
  },
  created() {
@@ -1416,6 +1438,13 @@
  },

  methods: {
    handleCheck(data, { checkedKeys, checkedNodes }) {
      this.checkedKeys = checkedKeys
      // 获取所有选中节点的 dictKey
      const selectedDictKeys = checkedNodes.map(node => node.dictKey).filter(Boolean)
      this.filters.type = selectedDictKeys
      this.fetchTableData();
    },
    // 算法
    getAlgorithmList() {
      getSFDictionaryTree({code:'SF'}).then((res) => {
@@ -1439,16 +1468,12 @@
    },

    handleSFNodeClick(data) {
      console.log(data.dictKey, '666666666')
      this.filters.type = ''
      this.filters.algorithm = ''
        if (data.children && data.children.length) {
            // 获取子节点dictKey
            this.filters.type = data.dictKey
        } else {
            this.filters.algorithm = data.dictKey
        }
        // 更新列表请求
        this.fetchTableData();
      this.filters.type = data.dictKey
      // 更新列表请求
      this.fetchTableData();
    },
    handleClear() {
        this.dictKey = ''
@@ -1677,7 +1702,7 @@
      try {
        const currentTab = this.tabs.find(tab => tab.name === this.activeTab);
        const params = {
          word_order_type: this.filters.type || undefined,
          word_order_types: this.filters.type || undefined,
          status:
            currentTab?.name === 'myTickets'
              ? undefined
@@ -3106,7 +3131,7 @@
  }

  .date-picker {
    width: 240px; // 日期选择器宽度适当调整
    // width: 240px; // 日期选择器宽度适当调整
  }

  .el-button {