From cafa9ae77da5ae18db0336a353a79a639b7cc299 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/processQuery.vue | 281 +++++--------------------------------------------------
1 files changed, 27 insertions(+), 254 deletions(-)
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index db902c0..0490309 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -1,269 +1,42 @@
<!--
- * @Date: 2025-06-18 09:17:09
+ * @Date: 2025-08-10 14:14:58
* @LastEditors: gaoshp
- * @LastEditTime: 2025-07-20 20:48:15
+ * @LastEditTime: 2025-08-17 08:40:49
* @FilePath: /mdmweb/src/views/flowmgr/processQuery.vue
-->
<template>
<basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
- @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
- @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
- <template #menu-left>
- <!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
- <!-- <el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button> -->
- <!-- <el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button> -->
- </template>
- <template #menu="scope">
- <el-button type="danger" text size="default"
- @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
- </el-button>
- </template>
- </avue-crud>
+ <el-tabs
+ v-model="activeName"
+ type="card"
+ class="demo-tabs"
+ >
+ <el-tab-pane label="杩涜涓�" name="todo">
+ <processQuery1 v-if="activeName==='todo'"></processQuery1>
+ </el-tab-pane>
+ <el-tab-pane label="宸茬粨鏉�" name="done">
+ <processQuery2 v-if="activeName==='done'"> </processQuery2>
+ </el-tab-pane>
+ </el-tabs>
</basic-container>
</template>
-
<script>
-import { getList, deleteRow } from '@/api/flowmgr/processQuery.js';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import NProgress from 'nprogress';
-import { downloadXls } from '@/utils/util';
-import 'nprogress/nprogress.css';
+import processQuery1 from './processQuery1.vue';
+import processQuery2 from './processQuery2.vue';
export default {
- name: 'MachineReturnFileOp',
+ components: {
+ processQuery2,
+ processQuery1
+ },
data() {
return {
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- form: {},
- query: {},
- loading: true,
- data: [],
- option: {
- addBtn: false,
- editBtn: false,
- delBtn: false,
- viewBtn: true,
- columnBtn: false,
- tip: false,
- // simplePage: true,
- searchShow: true,
- searchMenuSpan: 6,
- dialogWidth: '60%',
- // tree: true,
- border: true,
- index: true,
- selection: true,
-
- menuWidth: 200,
- // menu: false,
- dialogClickModal: false,
- column: [
- {
- label: '娴佺▼绫诲瀷',
- prop: '',
- search: true,
- searchType: 'select',
- hide: true,
- dicUrl: `/blade-system/dict/dictionary?code=flow`,
- props: {
- label: 'dictValue',
- value: 'dictKey',
- },
- },
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'createTime',
- type: 'datetime',
- format: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- search: true,
- searchRange: true,
- hide: true,
- },
- {
- label: '鍏抽敭瀛�',
- prop: 'keyword',
- search: true,
- searchType: 'input',
- hide: true,
- },
- {
- label: '娴佺▼妯＄増',
- prop: '',
- },
- {
- label: '鏈哄簥',
- prop: '',
- },
- {
- label: '鏍囬',
- prop: '',
- },
- {
- label: '鍒涘缓浜�',
- prop: 'startUserName',
- },
- {
- label: '缂栧埗',
- prop: '',
- },
- {
- label: '宸ュ簭鍚嶇О',
- prop: '',
- },
- {
- label: '鍔犲伐杞﹂棿',
- prop: '',
- },
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'processCreateTime',
- },
- {
- label: '褰撳墠鑺傜偣',
- prop: 'taskName',
- },
- ],
- selectedList: [],
- }
- }
+ activeName: 'todo',
+ };
},
methods: {
- handleAction (row, index, flag) {
- // 澶勭悊鎺ュ彈鎴栨嫆缁濇搷浣�
- let ids = [row.id].toString();
- this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(() => {
- deleteRow({processInstanceId: row.processInstanceId})
- })
+ handleTabClick(tab, event) {
+ console.log(tab, event);
},
- selectionChange (list) {
- this.selectedList = list;
- },
- // exportWebSite() {
- // if (this.selectedList.length === 0) {
- // this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
- // return;
- // }
- // this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning',
- // }).then(() => {
- // NProgress.start();
- // exportBlob(
- // `/blade-mdm/machineback/filehandle/export-to-inner`,
- // {
- // ids: this.selectedList.map(item => item.id).join(','),
- // }
- // ).then(res => {
- // downloadXls(res.data, `瀵煎嚭鍥炰紶娑夊瘑缃�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
- // NProgress.done();
- // });
- // });
- // },
- // exportExcel() {
- // if (this.selectedList.length === 0) {
- // this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
- // return;
- // }
- // this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning',
- // }).then(() => {
- // NProgress.start();
- // exportBlob(
- // `/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
- // ).then(res => {
- // downloadXls(res.data, `瀵煎嚭鏈哄簥鍥炰紶绋嬪簭${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
- // NProgress.done();
- // });
- // });
- // },
- searchChange(params, done) {
- let data = {}
- this.query = params;
- this.page.currentPage = 1;
- console.log('searchChange', params);
- params.createTimeBegin = params?.createTime?.[0] || '';
- params.createTimeEnd = params?.createTime?.[1] || '';
- console.log(params);
- // data = {
- // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
- data = {
- createTimeBegin: params.createTimeBegin,
- createTimeEnd: params.createTimeEnd,
- }
- this.query = data
- this.onLoad(this.page, data);
- done();
- },
- searchReset() {
- let data = {}
- this.query = params;
- this.page.currentPage = 1;
- data = {
- createTimeBegin: params.createTimeBegin,
- createTimeEnd: params.createTimeEnd,
- keyword: params.keyword || ''
- }
- this.onLoad(this.page, data);
- done();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- // this.onLoad();
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- /** * 椤甸潰鍔犺浇鏃惰幏鍙栨暟鎹�
- */
- onLoad(page, params = {}) {
- console.log('onLoad', page, params);
- const query = {
- ...this.query,
- // category: params.category ? flowCategory(params.category) : null,
- mode: this.mode,
- };
- try {
- delete query.confirmTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
- } catch (error) {
- console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
- }
-
- this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- }, () => {
- this.data = [];
- this.loading = false;
- }).catch(err => {
- this.data = [];
- this.loading = false;
- });
- }
- }
-};
-</script>
-
-<style lang="scss" scoped></style>
\ No newline at end of file
+ },
+}
+</script>
\ No newline at end of file
--
Gitblit v1.9.3