From f1b4ff31d9cb91fcda228a9781ddb8b3c792f8ba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 00:57:43 +0800
Subject: [PATCH] 审批按钮调整
---
src/views/flowmgr/backImport.vue | 6
src/views/flowmgr/processQuery.vue | 10 ++
src/views/flowmgr/programexport.vue | 64 +++++++++++++++
src/views/flow/components/TodolistRightTop.vue | 19 +++-
src/views/basesetting/produceplan.vue | 13 ---
src/views/flow/donelist.vue | 10 ++
src/views/flow/todolist.vue | 68 ++++++++++++-----
7 files changed, 144 insertions(+), 46 deletions(-)
diff --git a/src/views/basesetting/produceplan.vue b/src/views/basesetting/produceplan.vue
index 9562c22..f610200 100644
--- a/src/views/basesetting/produceplan.vue
+++ b/src/views/basesetting/produceplan.vue
@@ -128,19 +128,6 @@
hide: true,
display: false,
},
- // {
- // label: '搴忓彿',
- // prop: 'index',
- // type: 'index',
- // },
- {
- label: '鍥惧彿',
- prop: 'drawingNo',
- type: 'input',
- display: true,
- span: 24,
- rules: [{ required: true, message: '璇疯緭鍏ュ浘鍙�', trigger: 'blur' }],
- },
{
label: '涓撲笟缁勯暱',
prop: 'teamLeaderId',
diff --git a/src/views/flow/components/TodolistRightTop.vue b/src/views/flow/components/TodolistRightTop.vue
index 65eb20a..16a80f3 100644
--- a/src/views/flow/components/TodolistRightTop.vue
+++ b/src/views/flow/components/TodolistRightTop.vue
@@ -16,15 +16,19 @@
<el-form-item label="鍒涘缓浜�">
<el-input v-model="formInline.startUserName" placeholder="" style="width: 200px"></el-input>
</el-form-item>
+ <el-form-item label="浠诲姟杞﹂棿">
+ <el-input v-model="formInline.workshop" placeholder="" style="width: 200px"></el-input>
+ </el-form-item>
+ <el-form-item label="闆剁粍浠跺彿">
+ <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
+ </el-form-item>
<el-form-item label="鍥惧彿鐗堟">
<el-input v-model="formInline.drawingNoEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="宸ヨ壓鐗堟">
<el-input v-model="formInline.craftEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
- <el-form-item label="浠诲姟杞﹂棿">
- <el-input v-model="formInline.workshop" placeholder="" style="width: 200px"></el-input>
- </el-form-item>
+
<el-form-item label="浜у搧鍨嬪彿">
<el-input v-model="formInline.productModel" placeholder="" style="width: 200px"></el-input>
</el-form-item>
@@ -37,9 +41,7 @@
<el-form-item label="宸ュ簭鐗堟">
<el-input v-model="formInline.processEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
- <el-form-item label="闆剁粍浠跺彿">
- <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
- </el-form-item>
+
<el-form-item label="鍔犲伐鏈哄簥">
<el-input v-model="formInline.machineCode" placeholder="" style="width: 200px"></el-input>
</el-form-item>
@@ -54,6 +56,9 @@
</el-form-item>
<el-form-item label="绋嬪簭鍖呭悕">
<el-input v-model="formInline.programPackageName" placeholder="" style="width: 200px"></el-input>
+ </el-form-item>
+ <el-form-item label="鍋忕鍗�">
+ <el-input v-model="formInline.deviation" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鑺傜偣">
<el-input v-model="formInline.taskName" placeholder="" style="width: 200px"></el-input>
@@ -89,7 +94,7 @@
processName: this.row.variables.processName || '',
processNo: this.row.variables.processNo || '',
processEdition: this.row.variables.processEdition || '',
-
+ deviation: this.row.variables.deviation || '',
planStartTime: this.row.variables.planStartTime || '',
productModel: this.row.variables.productModel || '',
programPackageName: this.row.variables.programPackageName || '',
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index dc1c27c..7c664b6 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -68,8 +68,16 @@
},
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
+ prop: '',
width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.myProcessName)
+ }
},/*
{
label: '娴佺▼绫诲瀷',
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 57d8b44..1818285 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -198,8 +198,16 @@
},
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
+ prop: '',
width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.myProcessName)
+ }
},/*
{
label: '娴佺▼绫诲瀷',
@@ -402,35 +410,55 @@
}
},
setAssignee (row, approve) {
- if (approve === 'Y') {
- if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+ if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
+
+ this.optionApprove.column[1].disabled = false;
+ if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
this.formApprove.assignee = row.variables.senior;
- } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+ } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
- } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
+ this.optionApprove.column[1].disabled = false;
this.formApprove.assignee = row.variables.programmer
- } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
} else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
+ this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
}
} else if(approve === 'N'){
- this.formApprove.assignee = ''
- if(row.taskDefinitionKey == "teamLeaderTask") {
- this.optionApprove.column[1].display = false;
+ //涓嶉�氳繃鐨勬儏鍐�
+ //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝椹冲洖'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+ this.optionApprove.column[1].disabled = true;
+
+ //this.formApprove.assignee = ''
+ //if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
+ //鏁版帶绋嬪簭瀹℃牳(楂樺笀)锛屾槸鏈�鍚庝竴涓妭鐐癸紝涓嶉�氳繃 閮芥槸绂佺敤'鍙戦�佺粰'锛岀洿鎺ョ粰 鏍″浜哄憳
+ //this.optionApprove.column[1].disabled = true;
+ //}
+ if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ //鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃灏辩粨鏉熶簡锛宎ssignee璁剧疆=''
+ this.formApprove.assignee = '';
}
- if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- getPrevius({processInstanceId: row.processInstanceId}).then(res => {
- console.log(res)
- if(res.data.code === 200) {
-
- this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- }
- })
+ if(["teamLeaderTask" ,'repalceProgrammingTask'].includes(row.taskDefinitionKey)) {
+ //缁勯暱锛屾浛鎹㈡祦绋嬬殑绋嬪簭缂栧埗锛岀鐢�'鍙戦�佺粰'
+ //this.optionApprove.column[1].disabled = true;
+ }else {
+ //闄や簡缁勯暱锛屾浛鎹㈡祦绋嬬殑缂栧埗锛屽叾浠栬妭鐐圭殑涓嶉�氳繃锛岄兘鏄粰涓婁竴涓楠ょ殑澶勭悊浜�
+ if(!["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ //闈炲浐鍖栫紪鍒惰妭鐐癸紝闇�瑕佸垵濮嬪寲榛樿澶勭悊浜�
+ getPrevius({processInstanceId: row.processInstanceId}).then(res => {
+ console.log(res)
+ if(res.data.code === 200) {
+ this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ });
+ }
}
+
+
+
}
},
diff --git a/src/views/flowmgr/backImport.vue b/src/views/flowmgr/backImport.vue
index 542641b..b319915 100644
--- a/src/views/flowmgr/backImport.vue
+++ b/src/views/flowmgr/backImport.vue
@@ -126,9 +126,9 @@
},
handleWarehouse() {
- // if (this.selection.length == 0) {
- // return this.$message.error("璇烽�夋嫨鏁版嵁")
- // }
+ if (this.selection.length == 0) {
+ return this.$message.error("璇烽�夋嫨鏁版嵁")
+ }
let selection = [];
this.selection.forEach(item => {
selection.push(item.id);
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index 9166426..2acf1c7 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -147,8 +147,16 @@
},
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
+ prop: '',
width: 80,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.myProcessName)
+ }
},
{
label: '宸ヨ壓鐗堟',
diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 2fe94b4..453e0cc 100644
--- a/src/views/flowmgr/programexport.vue
+++ b/src/views/flowmgr/programexport.vue
@@ -23,7 +23,7 @@
</avue-crud>
</el-tab-pane>
<el-tab-pane label="宸插姙" name="completed">
- <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
+ <avue-crud :option="optionCompleted" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
<template #menu-left>
<!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
@@ -120,6 +120,68 @@
searchSpan: 8,
},
],
+ },
+ optionCompleted: {
+ 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,
+ // viewBtn: true,
+ menuWidth: 200,
+ menu: false,
+ dialogClickModal: false,
+ column: [
+ {
+ label: '娴佺▼鏍囬',
+ prop: 'title',
+ },
+ {
+ label: '鍥惧彿',
+ prop: 'drawingNo',
+ },
+ {
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ },
+ {
+ label: '宸ュ簭鍚嶇О',
+ prop: 'processName',
+ },
+ {
+ label: '绋嬪簭鍚嶇О',
+ prop: 'name',
+ search: true,
+ },
+ {
+ label: '閫氳繃鏃堕棿',
+ prop: 'createTime',
+ },
+ {
+ label: '宸插姙鏃堕棿',
+ prop: 'updateTime',
+ },
+ {
+ label: '閫氳繃鏃堕棿',
+ prop: 'passTime',
+ search: true,
+ hide: true,
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ searchRange: true,
+ searchSpan: 8,
+ },
+ ],
}
};
},
--
Gitblit v1.9.3