zs
2025-05-07 58497c4d028c306e98249ccdff2bf86dd3b4ee87
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
@@ -10,9 +10,8 @@
import { columns } from './Config' 
import TdButton from '@/components/TdButton/TdButton' 
import { vPermission } from '@/libs/Permission/Permission' 
import {
  getWmsEnumData
} from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
import { getWmsEnumData } from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
import dayjs from 'dayjs'
import { 
  ElInput, 
  ElSelect, 
@@ -63,18 +62,15 @@
    } = useWmsTask(props, ctx) 
 
    //定义高级查询引用 
   const wmsTaskQueryDrawerRef=ref(null);
    const wmsTaskQueryDrawerRef = ref(null)
    // 新增的查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[]
      str_searchFormInputAttrs: [],
    }) 
    //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([
     'TaskNo', 'ContainerNo'
    ]);
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码');
    const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码')
 
    // 动态枚举选项 
    const enumOptions = reactive({ 
@@ -107,7 +103,6 @@
  label: item.description, 
  value: item.value, 
})) 
      } catch (error) { 
        console.error('获取枚举数据失败:', error) 
      } 
@@ -119,40 +114,45 @@
    }) 
 
    // 定义响应式查询数据 
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
    const _curHighQueryData = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
    })
    // 新版的查询方法(主页面中的按钮【查询】) 
    const handleQueryForMain = async () => { 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal;
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
      tableRef.value.getList(_curHighQueryData.value) 
    } 
    // 新版的查询方法(高级查询中的按钮【查询】) 
    const handleQuery = async (extraParams = {}) => { 
      let filteredData = commonGetHighQueryForm(extraParams);
      commonSaveCurHighQueryData(filteredData);
      let filteredData = commonGetHighQueryForm(extraParams)
      commonSaveCurHighQueryData(filteredData)
      tableRef.value.getList(filteredData) 
    } 
    // 新版的查询重置 
    const resetQuery = () => { 
      queryForm.value.searchVal = '' 
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
      queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
    } 
     //新版的导出方法 
     const handleExport=()=>{ 
      onExport(_curHighQueryData.value);
      onExport(_curHighQueryData.value)
    } 
    // 新版的查询弹出框关闭方法 
    const closeQuery = (extraParams={}) => { 
      let filteredData = commonGetHighQueryForm(extraParams);
      console.log("closeQuery方法");
      console.log(filteredData);
      commonSaveCurHighQueryData(filteredData);
      let filteredData = commonGetHighQueryForm(extraParams)
      console.log('closeQuery方法')
      console.log(filteredData)
      commonSaveCurHighQueryData(filteredData)
    } 
    //保存查询值 
    const commonSaveCurHighQueryData=(filteredData={})=>{ 
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
      _curHighQueryData.value.searchVal = queryForm.value.searchVal 
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
    } 
     //获取高级查询弹出框的查询值 
     const commonGetHighQueryForm=(extraParams={})=>{ 
@@ -165,10 +165,9 @@
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
      return filteredData;
      filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
      return filteredData
    } 
 
    /** 
     * @returns 表格 
@@ -206,6 +205,15 @@
            isHidePagination={isHidePagination} 
            pageSize={20} 
            v-slots={{ 
              creationTime: ({ row }: any) => {
                return (
                  <div>
                    {row.creationTime != null
                      ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
                      : '-'}
                  </div>
                )
              },
              name: ({ row }: any) => { 
                return row?.name ? ( 
                  <TdButton 
@@ -294,7 +302,11 @@
                  class={styles.formItem} 
                /> 
              </ElFormItem> 
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}>
              <IconButton
                type="primary"
                icon="search"
                onClick={handleQueryForMain}
              >
                查询 
              </IconButton> 
              {/* <IconButton style="" icon="refresh" onClick={resetQuery}>