mdmweb.git - Gitblit

			@@ -1,7 +1,7 @@
			<!--
			* @Date: 2025-06-18 09:17:09
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-22 22:39:59
			* @LastEditTime: 2025-07-23 22:20:42
			* @FilePath: /mdmweb/src/views/flowmgr/processQuery.vue
			-->
			<template>
			@@ -18,11 +18,12 @@
			</el-button>
			</template>
			<template #menu="scope">
			<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'"
			<el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
			@click.stop="handleAction(scope.row, scope.index, 1)">审批表打印
			</el-button>
			<el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">删除
			</el-button>

			</template>
			</avue-crud>
			<el-dialog title="指派" append-to-body v-model="reassignBox" width="30%">
			@@ -79,7 +80,7 @@
			search: true,
			searchType: 'select',
			hide: true,
			dicUrl: `/blade-system/dict/dictionary?code=flow`,
			dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
			props: {
			label: 'dictValue',
			value: 'remark',
			@@ -102,6 +103,51 @@
			searchType: 'input',
			hide: true,
			},
			{
			label: '流程名称',
			prop: 'processDefinitionName',
			width: 80,
			},
			{
			label: '标题',
			prop: '',
			width: 150,
			render: ({ row }) => {
			return h('p',
			{
			attrs: {},
			class: {},
			style: {},
			}, row?.variables?.title)
			}
			},
			{
			label: '图号',
			prop: '',
			width: 100,
			render: ({ row }) => {
			return h('p',
			{
			attrs: {},
			class: {},
			style: {},
			}, row?.variables?.drawingNo)
			}
			},
			{
			label: '产品型号',
			prop: '',
			width: 100,
			render: ({ row }) => {
			return h('p',
			{
			attrs: {},
			class: {},
			style: {},
			}, row?.variables?.productModel)
			}
			},

			{
			label: '机床',
			prop: '',
			@@ -117,7 +163,8 @@
			{
			label: '创建人',
			prop: 'startUserName',
			},
			width: 80,
			},/*
			{
			label: '工序名称',
			prop: '',
			@@ -129,11 +176,7 @@
			style: {},
			}, row?.variables?.processName)
			}
			},
			{
			label: '加工车间',
			prop: '',
			},
			},*/
			{
			label: '创建时间',
			prop: 'processCreateTime',
			@@ -141,6 +184,7 @@
			{
			label: '当前节点',
			prop: 'taskName',
			width: 90
			},
			],

			@@ -207,8 +251,8 @@
			console.log('toPerson', form);
			reassgin({
			...form,
			taskId: this.transferTaskSelection[0].taskId,
			processInstanceId: this.transferTaskSelection[0].processInstanceId,
			taskId: this.selectedList[0].taskId,
			processInstanceId: this.selectedList[0].processInstanceId,
			}).then(res => {
			this.$message.success('指派成功');
			this.reassignBox = false;
			@@ -231,7 +275,9 @@
			type: 'warning',
			})
			.then(() => {
			deleteRow({ processInstanceId: row.processInstanceId })
			deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
			this.onLoad(this.page, this.query);
			})
			})
			} else if (flag === 1) {
			printRow({ processInstanceId: row.processInstanceId })
			@@ -315,10 +361,10 @@
			// keyword: params.keyword \|\| ''
			// }
			data = {
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			createTimeBegin: params.createTimeBegin \|\| undefined,
			createTimeEnd: params.createTimeEnd \|\| undefined,
			keyword: params.keyword \|\| undefined,
			processDefinitionKey: params.processDefinitionKey \|\| undefined
			}
			this.query = data
			this.onLoad(this.page, data);
			@@ -360,9 +406,14 @@
			};
			this.loading = true;
			getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
			const data = res.data.data;
			const data = res.data.data
			this.page.total = data.total;
			this.data = data.records;
			this.data = data.records.map(v=> {
			return {
			...v,
			id: v.processInstanceId,
			}
			});
			this.loading = false;
			}, () => {
			this.data = [];