任务导入+翻页修复

yangys

2025-10-16 cb04b8ed8a616c5b9fae9d432c093985b56f044c

 src/views/flowmgr/programexport.vue

@@ -9,9 +9,8 @@
        <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="tabsClick">
            <el-tab-pane label="待办" name="todo">
                <avue-crud :option="option" :search="searchData" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
                    @size-change="sizeChange" @refresh-change="refreshChange" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @on-load="onLoad">
                    <template #menu-left>
                      <!-- @on-load="onLoad"-->
                        <el-button type="primary" :disabled="this.selection.length==0" plain @click="exportExcel">导出</el-button>
                    </template>
                    <template #menu="scope">
@@ -19,11 +18,9 @@
                </avue-crud>
            </el-tab-pane>
            <el-tab-pane label="已办" name="completed">
                <avue-crud :option="optionCompleted" :search="searchData" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud1" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
                <avue-crud :option="optionCompleted" :search="searchData2" :table-loading="loading" :data="data2" v-model:page="page2" v-model="form" ref="crud1" @current-change="currentChange2"
                    @size-change="sizeChange2" @refresh-change="refreshChange2" @search-change="searchChange2" @search-reset="searchReset2" @selection-change="selectionChange" @on-load="onLoad2">
                    <template #menu-left>
                        <!-- <el-button type="primary" plain @click="exportWebSite">导出回传涉密网</el-button> @on-load="onLoad" -->
                        <!-- <el-button type="primary" plain @click="reassign">挂载车床程序库</el-button> -->
                        <el-button type="primary" :disabled="this.selection.length==0" plain @click="exportExcel">导出</el-button>
                    </template>
                    <template #menu="scope">
@@ -46,17 +43,24 @@
    data() {
        return {
            activeName: "todo",
            // Define your data properties here
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            page2: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            form: {},
            searchData:{},
            searchData2:{},
            query: {},
            query2: {},
            loading: true,
            data: [],
            data2: [],
            selection: [],
            option: {
                addBtn: false,
@@ -147,16 +151,13 @@
                viewBtn: true,
                columnBtn: false,
                tip: false,
                // simplePage: true,
                searchShow: true,
                searchEnter:true,
                searchMenuSpan: 6,
                dialogWidth: '60%',
                // tree: true,
                border: true,
                index: true,
                selection: true,
                // viewBtn: true,
                menuWidth: 200,
                menu: false,
                dialogClickModal: false,
@@ -197,6 +198,15 @@
                        search: true,
                    },
                    {
                        label: '查询范围',
                        prop: 'queryType',
                        type: 'select',
                        search: true,
                        clearable:false,
                        searchSpan:4,
                        with: 100,
                    },
                    {
                        label: '通过时间',
                        prop: 'createTime',
                        sortable: true,
@@ -211,6 +221,7 @@
                        prop: 'updateTime',
                        sortable: true,
                    },
                    
                    {
                        label: '通过时间',
                        prop: 'passTime',
@@ -230,21 +241,34 @@
    methods: {
        
        tabsClick(tab,event) {
            this.onLoad(this.page, this.query);
            if(tab.paneName == 'todo'){
                this.onLoad(this.page, this.searchData);
            }else{
               // console.log(this.searchData2)
                this.onLoad2(this.page2, this.searchData2);
            }
        },
        selectionChange(list) {
            this.selection = list;
        },
        // Define your methods here

        currentChange(currentPage) {
            this.page.currentPage = currentPage;
            // this.onLoad();
        },
        currentChange2(currentPage) {
            this.page2.currentPage = currentPage;
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize;
        },
        sizeChange2(pageSize) {
            this.page2.pageSize = pageSize;
        },
        refreshChange() {
            this.onLoad(this.page, this.query);
        },
        refreshChange2() {
            this.onLoad2(this.page2, this.query2);
        },
        searchChange(params, done) {
            let data = {}
@@ -265,10 +289,34 @@
            this.onLoad(this.page, data);
            done();
        },
        searchChange2(params, done) {
            let data = {}
            
            this.query2 = params;
            this.page2.currentPage = 1;
            //console.log('searchChange', params);
            params.passTimeBegin = params?.passTime?.[0] || '';
            params.passTimeEnd = params?.passTime?.[1] || '';
            //console.log(params);
            data = {
                createTimeBegin: params.passTimeBegin,
                createTimeEnd: params.passTimeEnd,
                name: params.name || '',
                queryType:this.query2.queryType
            }
            this.query2 = data
            this.onLoad2(this.page2, data);
            done();
        },
        searchReset() {
            this.query = {};
            this.query.queryType = this.searchData.queryType;
            this.onLoad(this.page);
        },
        searchReset2() {
            this.query2 = {};
            this.query2.queryType = this.searchData2.queryType;
            this.onLoad2(this.page2);
        },
        /** * 页面加载时获取数据
         */
@@ -276,9 +324,7 @@
            const query = {
                ...this.query,
            };
            var status = this.activeName == 'todo'?null:2;
            params.status = status;
           
          
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
                const data = res.data.data;
@@ -290,6 +336,27 @@
                this.loading = false;
            }).catch(err => {
                this.data = [];
                this.loading = false;
            });
        },
        onLoad2(page, params = {}) {
            const query = {
                ...this.query2,
            };

            params.status = 2;
            //params.queryType = this.searchData2.queryType;
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
                const data = res.data.data;
                this.page2.total = data.total;
                this.data2 = data.records;
                this.loading = false;
            }, () => {
                this.data2 = [];
                this.loading = false;
            }).catch(err => {
                this.data2 = [];
                this.loading = false;
            });
        },
@@ -371,11 +438,13 @@
        if(this.permission.program_allexport==true){
            queryTypeDicData.push({label:'全部数据',value:'all'});
            this.searchData.queryType = 'all'
            this.searchData2.queryType = 'all'
        }else{
            this.searchData.queryType = 'self';
            this.searchData2.queryType = 'self';
        }
        this.option.column[7].dicData = queryTypeDicData;

        this.optionCompleted.column[7].dicData = queryTypeDicData;
        this.onLoad(this.page, this.searchData);
    }
}