mdmweb.git - Gitblit

			@@ -1,35 +1,45 @@
			<!--
			* @Date: 2025-06-18 09:17:09
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-20 20:48:15
			* @LastEditTime: 2025-07-22 22:39:59
			* @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">
			@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">导出到EXCEL</el-button> -->
			<el-button type="primary" plain @click="reassign">重新指派
			</el-button>
			</template>
			<template #menu="scope">
			<el-button type="danger" text size="default"
			@click.stop="handleAction(scope.row, scope.index, 0)">删除
			<el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">删除
			</el-button>
			<el-button type="danger" text size="default" v-if="scope.row.processDefinitionKey = 'dispatch'"
			@click.stop="handleAction(scope.row, scope.index, 1)">审批表打印
			</el-button>
			</template>
			</avue-crud>
			<el-dialog title="指派" append-to-body v-model="reassignBox" width="30%">
			<avue-form ref="reassginform" :option="reassignOption" v-model="reassignForm"
			@submit="toPerson"></avue-form>
			</el-dialog>
			</basic-container>
			</template>

			<script>
			import { getList, deleteRow } from '@/api/flowmgr/processQuery.js';
			import { exportBlob } from '@/api/common';
			import { getToken } from '@/utils/auth';
			import { getList, deleteRow, printRow } from '@/api/flowmgr/processQuery.js';
			import { getAssignee, reassgin } from '@/api/flow/todolist';
			import { exportBlobPost } from '@/api/common';
			import NProgress from 'nprogress';
			import { downloadXls } from '@/utils/util';
			import { downloadFile } from '@/utils/util';
			import 'nprogress/nprogress.css';

			export default {
			name: 'MachineReturnFileOp',
			data() {
			@@ -58,21 +68,21 @@
			border: true,
			index: true,
			selection: true,


			menuWidth: 200,
			// menu: false,
			dialogClickModal: false,
			column: [
			{
			label: '流程类型',
			prop: '',
			prop: 'processDefinitionKey',
			search: true,
			searchType: 'select',
			hide: true,
			dicUrl: `/blade-system/dict/dictionary?code=flow`,
			props: {
			label: 'dictValue',
			value: 'dictKey',
			value: 'remark',
			},
			},
			{
			@@ -93,28 +103,32 @@
			hide: true,
			},
			{
			label: '流程模版',
			prop: '',
			},
			{
			label: '机床',
			prop: '',
			},
			{
			label: '标题',
			prop: '',
			render: ({ row }) => {
			return h('p',
			{
			attrs: {},
			class: {},
			style: {},
			}, row?.variables?.machineCode)
			}
			},
			{
			label: '创建人',
			prop: 'startUserName',
			},
			{
			label: '编制',
			prop: '',
			},
			{
			label: '工序名称',
			prop: '',
			render: ({ row }) => {
			return h('p',
			{
			attrs: {},
			class: {},
			style: {},
			}, row?.variables?.processName)
			}
			},
			{
			label: '加工车间',
			@@ -129,24 +143,121 @@
			prop: 'taskName',
			},
			],
			selectedList: [],
			}

			},
			selectedList: [],
			reassignBox: false,
			reassignForm: {},
			reassignOption: {
			submitBtn: true,
			emptyBtn: false,
			column: [
			{
			label: '发送给',
			prop: 'newAssigneeId',
			type: 'select',
			// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
			// dicFlag: true,
			props: {
			label: 'name',
			value: 'id',
			},
			span: 24,
			disabled: false,
			dicData: [

			],
			rules: [{ required: true, message: '请输入选择', trigger: 'blur' }],
			},
			{
			label: '备注',
			span: 24,
			prop: 'comment',
			type: 'textarea',
			rules: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
			},
			],
			},
			}
			},
			mounted() {
			getAssignee().then(res => {
			this.reassignOption.column[0].dicData = res.data.data;
			})
			},
			methods: {
			handleAction (row, index, flag) {
			// 处理接受或拒绝操作
			let ids = [row.id].toString();
			this.$confirm('确定将选择数据删除?', {
			confirmButtonText: '确定',
			cancelButtonText: '取消',
			type: 'warning',
			})
			.then(() => {
			deleteRow({processInstanceId: row.processInstanceId})
			})
			reassign() {// 重新指派
			console.log(this.selectedList.length)
			if (this.selectedList.length === 0) {
			this.$message.warning('请选择需要重新指派的任务');
			return;
			}
			if (this.selectedList.length > 1) {
			this.$message.warning('请选择一条');
			return;
			}
			this.reassignBox = true;
			},
			selectionChange (list) {
			toPerson(form, done) {
			this.$confirm('请确认是否指派', '', {
			confirmButtonText: this.$t('submitText'),
			cancelButtonText: this.$t('cancelText'),
			type: 'warning',
			}).then(() => {
			console.log('toPerson', form);
			reassgin({
			...form,
			taskId: this.transferTaskSelection[0].taskId,
			processInstanceId: this.transferTaskSelection[0].processInstanceId,
			}).then(res => {
			this.$message.success('指派成功');
			this.reassignBox = false;
			this.$refs?.reassginform?.resetForm();
			this.onLoad(this.page, this.query);

			}).catch(err => {
			console.error(err);
			})
			});
			done();
			},
			handleAction(row, index, flag) {
			if (flag === 0) {
			// 处理接受或拒绝操作
			let ids = [row.id].toString();
			this.$confirm('确定将选择数据删除?', {
			confirmButtonText: '确定',
			cancelButtonText: '取消',
			type: 'warning',
			})
			.then(() => {
			deleteRow({ processInstanceId: row.processInstanceId })
			})
			} else if (flag === 1) {
			printRow({ processInstanceId: row.processInstanceId })
			this.$confirm('是否导出?', '提示', {
			confirmButtonText: '确定',
			cancelButtonText: '取消',
			type: 'warning',
			}).then(() => {
			console.log(this.selection)
			NProgress.start();
			exportBlobPost(
			`/blade-mdm/flow/mgr/export-approve-table`,
			{ processInstanceId: row.processInstanceId },
			{ processInstanceId: row.processInstanceId },
			).then(res => {
			let name = res.headers['content-disposition'].split('filename=')[1]
			console.log(res.headers['content-disposition'].split('filename=')[1]);
			downloadFile(res.data, `审批打印-${name}`);
			NProgress.done();
			});
			});
			}

			},
			selectionChange(list) {
			console.log('selectionChange', list);
			this.selectedList = list;
			},
			// exportWebSite() {
			@@ -206,6 +317,8 @@
			data = {
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			}
			this.query = data
			this.onLoad(this.page, data);
			@@ -213,12 +326,13 @@
			},
			searchReset() {
			let data = {}
			this.query = params;
			this.query = data;
			this.page.currentPage = 1;
			data = {
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| ''
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			}
			this.onLoad(this.page, data);
			done();
			@@ -237,19 +351,15 @@
			*/
			onLoad(page, params = {}) {
			console.log('onLoad', page, params);
			const query = {
			const data = {
			...this.query,
			// category: params.category ? flowCategory(params.category) : null,
			mode: this.mode,
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			};
			try {
			delete query.confirmTime; // 删除不必要的查询条件
			} catch (error) {
			console.error('日期格式化错误', error);
			}

			this.loading = true;
			getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
			getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
			const data = res.data.data;
			this.page.total = data.total;
			this.data = data.records;

	src/api/flowmgr/processQuery.js	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flowmgr/processQuery.vue	208 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1,7 +1,7 @@
			/*
			* @Date: 2025-06-12 22:38:05
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-20 20:33:26
			* @LastEditTime: 2025-07-22 22:10:43
			* @FilePath: /mdmweb/src/api/flowmgr/processQuery.js
			*/
			import request from '@/axios';
			@@ -17,10 +17,22 @@
			})
			};

			export const deleteRow = (data) => {
			export const deleteRow = (params,data) => {
			return request({
			url: '/blade-mdm/flow/mgr/delete-instance',
			method: 'post',
			params,
			data: {
			...data,
			},
			})
			};

			export const printRow = (params,data) => {
			return request({
			url: '/blade-mdm/flow/mgr/export-approve-table',
			method: 'post',
			params,
			data: {
			...data,
			},