Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

2025-09-29 045fbc240ced1e1bc005b734098e59779b67bb1c

 ui/admin-ui3/src/views/cwgl/returnLog/index.vue

@@ -92,10 +92,21 @@
        reqTime: {
            label: '存入时间',
            minWidth: 150,
            search: true,
            type: 'datetime',  // 改为 datetime 类型
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
        },
        reqTimeArray: {
            label: '存入时间',
            search: true,
            searchRange: true,
            type: 'daterange',
            startPlaceholder: '开始日期',
            endPlaceholder: '结束日期',
            valueFormat: 'YYYY-MM-DD',
            hide: true,
            addDisplay: false,
            editDisplay: false,
        },
        // reqTime: {
        //   label: '请求时间',
@@ -135,9 +146,11 @@
            selectionList.value = selection;
        },
        getBeginListFunc: (params = {}) => {
            params.type = 1;
            return params

            let newParams = { ...params };
            newParams.type = 1;
            newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
            delete newParams.reqTimeArray;
            return newParams
        }
    })