Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx

@@ -5,6 +5,7 @@
import { useWmsTask } from '../../../Controllers/WmsTask'
import IconButton from '@/components/IconButton/IconButton'
import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
import ChangeToPlaceDialog from '../Dialog/ChangeToPlaceDialog/ChangeToPlaceDialog'
import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
import Search from '@/components/Search/Search'
import { columns } from './Config'
@@ -21,6 +22,7 @@
  ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
import { FILTER_MODE_OPTIONS_STRING_KEY } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'

interface RenderTableType {
  url?: string
@@ -43,6 +45,7 @@
      contextMenu,
      dialogConfig,
      dialogConfigForQuery,
      dialogChangeToPlaceConfig,
      tableRef,
      current,
      search,
@@ -67,15 +70,19 @@
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
      searchVal_FilterMode: '',
    })
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
    const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码')
    const _searchFormInputAttrs = ref(['taskNo', 'SourcePlace', 'ToPlace'])
    const searchFormInputAttrs_Placeholder =
      ref('请输入任务号/起始库位号/目标库位号')

    // 动态枚举选项
    const enumOptions = reactive({
      taskType: [] as Array<{ label: string; value: any }>,
      taskStatus: [] as Array<{ label: string; value: any }>,
      dodevicetype: [] as Array<{ label: string; value: any }>,
      taskDodeviceStatus: [] as Array<{ label: string; value: any }>,
      sonTaskType: [] as Array<{ label: string; value: any }>,
    })

@@ -96,6 +103,20 @@
          label: item.description,
          value: item.value,
        }))
        const dodevicetypeEnumData = await getWmsEnumData({
          EnumName: 'DodevicetypeEnum',
        })
        enumOptions.dodevicetype = dodevicetypeEnumData.map((item) => ({
          label: item.description,
          value: item.value,
        }))
        const taskDodeviceStatusData = await getWmsEnumData({
          EnumName: 'TaskDodeviceStatus',
        })
        enumOptions.taskDodeviceStatus = taskDodeviceStatusData.map((item) => ({
          label: item.description,
          value: item.value,
        }))
        const sonTaskTypeEnumData = await getWmsEnumData({
          EnumName: 'SonTaskTypeEnum',
        })
@@ -108,19 +129,28 @@
      }
    }

    // 组件挂载时获取枚举数据
    onMounted(() => {
      fetchEnumData()
    })

    // 定义响应式查询数据
    const _curHighQueryData = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
      searchVal_FilterMode: '',
    })
    // 组件挂载时获取枚举数据
    onMounted(() => {
      fetchEnumData()
      queryForm.value.searchVal_FilterMode =
        FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || ''
      _curHighQueryData.value.searchVal_FilterMode =
        queryForm.value.searchVal_FilterMode
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
    })

    // 新版的查询方法（主页面中的按钮【查询】）
    const handleQueryForMain = async () => {
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.searchVal_FilterMode =
        queryForm.value.searchVal_FilterMode
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
      tableRef.value.getList(_curHighQueryData.value)
@@ -134,6 +164,8 @@
    // 新版的查询重置
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.searchVal_FilterMode =
        FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || ''
      queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
    }
    //新版的导出方法
@@ -151,6 +183,8 @@
    const commonSaveCurHighQueryData = (filteredData = {}) => {
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.searchVal_FilterMode =
        queryForm.value.searchVal_FilterMode
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
    }
@@ -165,6 +199,7 @@
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
      filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
      return filteredData
    }
@@ -264,6 +299,16 @@
            onRestQuery={resetQuery}
            onClose={closeQuery}
          />
          <ChangeToPlaceDialog
            ref="changeToPlace"
            v-model={dialogChangeToPlaceConfig.visible}
            title={dialogChangeToPlaceConfig.title}
            row={current.value}
            sort={sort.value}
            onConfirmQuery={handleQuery}
            onRestQuery={resetQuery}
            onClose={closeQuery}
          />

          <div class={styles.headerContent}>
            <div class={styles.header}>
@@ -316,6 +361,21 @@
                  class={styles.formItem}
                />
              </ElFormItem>
              <ElFormItem label="" style="width:100px;">
                <ElSelect
                  v-model={queryForm.value.searchVal_FilterMode}
                  placeholder="请选择"
                  class={styles.formItem}
                >
                  {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
                    <ElOption
                      key={option.value}
                      label={option.label}
                      value={option.value}
                    />
                  ))}
                </ElSelect>
              </ElFormItem>
              <IconButton
                type="primary"
                icon="search"