From ae2c3f847da927b6124e872d8d74c0457a1eea14 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:27:00 +0800
Subject: [PATCH] 现场编制功能适配
---
src/views/flow/todolist.vue | 346 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 282 insertions(+), 64 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index c207d0d..576535d 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -1,6 +1,7 @@
<template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
+ :search="query"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
@@ -10,23 +11,31 @@
</el-button>
<el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
</el-button>
- <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">杞淳</el-button>
<el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
+ </el-button>
+
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_on_machine" plain @click="showBatchOnMachine()">鐜板満缂栧埗
</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
- {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '娲惧伐' : '瀹℃壒'}}
+ {{approveButtonText(scope.row.taskDefinitionKey)}}
</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>
- <el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
+ <el-dialog title="鐜板満缂栧埗" append-to-body v-model="onMachineBox" width="30%">
+ <avue-form :option="onMachineOption" v-model="onMachineForm" @submit="batchOnMachine"></avue-form>
+ </el-dialog>
+ <div class="box-drawer">
+ <el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox" class="remark-drawer">
<div class="approve-box">
<div class="left">
- <TodolistLeft :row="row" @selection-change="selectionChange" />
+ <TodolistLeft ref="todolistLeft" :row="row" @selection-change="selectionChange" />
</div>
<div class="right">
<TodolistRightTop :row="row" />
@@ -36,7 +45,9 @@
v-model="activeName"
>
<el-tab-pane label="瀹℃壒" name="approve">
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" >
+
+ </avue-form>
</el-tab-pane>
<el-tab-pane label="娴佺▼杞ㄨ抗" name="log">
<processTrace :item="row" v-if="activeName==='log'"></processTrace>
@@ -46,13 +57,11 @@
</div>
</div>
</el-drawer>
+ </div>
</basic-container>
- <div>
- <!--<top-todo ref="topTodoComponent" />-->
- </div>
</template>
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,getAssigneeTree,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove, batchApproveOnMachine } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -72,13 +81,18 @@
assigneeData: [],
allAssigneeData: [],
managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
+
+ assignee2Data:[],
+
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
- assignee: ''
+ approve: '',
+ assignee: '',
},
+
+
optionApprove: {
labelWidth: 100,
column: [
@@ -97,26 +111,25 @@
{
label: '鍙戦�佺粰',
prop: 'assignee',
- type: 'select',
- props: {
- label: 'name',
- value: 'id',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
},
display: true,
filterable: true,
span: 24,
disabled: false,
- dicData: [
-
- ],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
rules: [
{
validator: (rule, value, callback) => {
@@ -131,6 +144,7 @@
}
]
},
+
],
},
page: {
@@ -139,7 +153,12 @@
total: 0,
},
form: {},
- query: {},
+ query: {
+ machineSpec: ['1','2']
+ },
+ defaultQuery: {
+ machineSpec: ['1','2']
+ },
loading: true,
option: {
rowKey: "taskId",
@@ -148,12 +167,10 @@
delBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchEnter:true,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 4,
dialogWidth: '60%',
- // tree: true,
border: true,
index: true,
selection: true,
@@ -164,7 +181,7 @@
{
label: '鍏抽敭瀛�',
prop: 'keyword',
- width: 300,
+ width: 200,
search: true,
searchType: 'input',
hide: true,
@@ -176,6 +193,27 @@
{
label: '宸ユ帶缃戣溅搴婄▼搴�',
value: 2,
+ },
+ ],
+ },
+ {
+ label: '鏈哄簥绫诲瀷',
+ prop: 'machineSpec',
+ width: 200,
+ search: true,
+ searchType: 'select',
+ multiple:true,
+ clearable:false,
+ hide: true,
+ emptyValues :["1",'2'],
+ dicData: [
+ {
+ label: '杞﹀簥',
+ value: '1',
+ },
+ {
+ label: '鍔犲伐涓績',
+ value: '2',
},
],
},
@@ -221,7 +259,7 @@
label: '鏈哄簥',
width: 100,
prop: '',
-
+ showOverflowTooltip:true,
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
@@ -242,6 +280,7 @@
search: true,
searchRange: true,
searchSpan: 8,
+ showOverflowTooltip:true,
// hide: true,
},
{
@@ -254,7 +293,8 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 100,
+ width: 120,
+ showOverflowTooltip:true,
prop: 'taskName',
},
{
@@ -302,6 +342,25 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },
+ /*
+ {
+ label: '鍙戦�佺粰',
+ prop: 'newAssigneeId',
filterable:true,
type: 'select',
props: {
@@ -315,17 +374,61 @@
],
rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },*/
+ {
+ label: '澶囨敞',
+ span: 24,
+ prop: 'comment',
+ type: 'textarea',
+ },
+ ],
+ },
+ reassignForm: {},
+
+ onMachineBox: false,//鐜板満缂栧埗妗�
+ onMachineForm: {},
+ onMachineOption: {
+ submitBtn: true,
+ emptyBtn: false,
+ column: [
+ {
+ label: '瀹℃壒缁撴灉',
+ prop: 'approve',
+ type: 'radio',
+ span: 24,
+ display: false,
+ dicData: [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '椹冲洖', value: 'N' },
+ ],
+ rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
+ },
+ {
+ label: '鍙戦�佺粰',
+ prop: 'assignee',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
},
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
- reassignForm: {}
};
},
watch: {
@@ -361,6 +464,7 @@
},
mounted() {
//this.setApproveBtn(row)
+ /*
getAssignee({
taskId: 0,
}).then(res => {
@@ -368,9 +472,46 @@
this.assigneeData = res.data.data;
this.reassignOption.column[1].dicData = this.assigneeData;
});
+ */
+ getAssigneeTree({
+ taskId: 0,
+ }).then(res => {
+ this.assigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
+ }
+ }
+
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
+ this.onMachineOption.column[1].data = this.assigneeData;
+ });
},
methods: {
-
+ approveButtonText(taskDefinitionKey){
+ let lower = taskDefinitionKey.toLowerCase();
+ if(taskDefinitionKey === 'teamLeaderTask') {
+ return '娲惧伐'
+ }else if(taskDefinitionKey == 'unlockProgramConfirm') {
+ //瑙ｉ攣锛岀紪鍒跺鏍�
+ return '澶嶆牳'
+ }else if(taskDefinitionKey == 'programMgrConfirm') {
+ //鍥哄寲锛岀▼搴忕鐞嗗憳纭
+ return '纭'
+ }else if(lower.indexOf('program')>-1) {
+ return '缂栧埗'
+ }else if(lower.indexOf('check')>-1) {
+ return '鏍″'
+ }else if(lower.indexOf('useable')>-1) {
+ return '妫�鏌�'
+ }else{
+ return '瀹℃壒'
+ }
+ },
setApproveBtn (row) { // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
// 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
@@ -431,10 +572,10 @@
if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
if(approve === 'N'){
- this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ this.optionApprove.column[1].data = this.managerAssigneeData;
}else{
- //this.assigneeData = this.allAssigneeData;
- this.optionApprove.column[1].dicData = this.allAssigneeData;
+ //this.optionApprove.column[1].dicData = this.allAssigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
}
}
if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
@@ -442,7 +583,7 @@
this.optionApprove.column[1].disabled = false;
if (["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
this.formApprove.assignee = row.variables.senior;
- } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
+ } else if (["programmingTask",'cureProgramTask','replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
} else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
this.optionApprove.column[1].disabled = false;
@@ -461,10 +602,16 @@
//鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
this.optionApprove.column[1].disabled = true;
- if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
+ if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
- //this.formApprove.assignee = row.variables.programmer;
- this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ if(row.variables.actProgrammer){
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ }else{
+ this.formApprove.assignee = row.variables.programmer;//鏃犵紪绋嬪憳缁欎富绠″伐鑹�
+ }
+ }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
+ //瑙ｉ攣楂樺笀瀹℃壒鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;//缁欎富绠″伐鑹�
} else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
//this.formApprove.assignee = row.variables.programmer;
@@ -476,17 +623,14 @@
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
this.optionApprove.column[1].disabled = false;
- for(var i=0;i<this.assigneeData.length;i++){
- if(this.assigneeData[i].manager == true){
- this.formApprove.assignee = this.assigneeData[i].id;
- break;
- }
+
+ if(this.managerAssigneeData.length>0){
+ this.formApprove.assignee = this.managerAssigneeData[0].id;
}
- //this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
- }if(['teamLeaderTask','repalceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
+ }if(['teamLeaderTask','replaceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
//鍒濆鑺傜偣涓嶉�氳繃灏辨槸缁撴潫娴佺▼锛屽鐞嗕汉涓虹┖
this.formApprove.assignee = '';
}
@@ -567,8 +711,41 @@
}
}
-
},
+ showBatchOnMachine(){//鏄剧ず鐜板満缂栧埗瀵硅瘽妗�
+ this.onMachineBox = true;
+ this.onMachineForm.assignee = this.transferTaskSelection[0].variables.checker;
+
+ },
+ batchOnMachine() {//缂栧埗鎵归噺澶勭悊锛堢幇鍦虹紪鍒讹級
+
+ this.$confirm('璇风‘璁ゆ槸鍚﹀皢閫夊畾浠诲姟璁剧疆涓虹幇鍦虹紪鍒讹紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ batchApproveOnMachine({
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ assignee: this.onMachineForm.assignee,
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.onMachineBox = false;
+ this.onLoad(this.page, this.query);
+ todoChangeNotify();
+ }).catch(err => {
+ this.$message.success('鎿嶄綔澶辫触');
+ })
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
+ });
+
+ },
+
toPerson(form, done) {
let tip = ''
this.reassignType === 1 ? tip = '璇风‘璁ゆ槸鍚︽墜鍔ㄦ淳宸�' : this.reassignType === 2 ? tip = '璇风‘璁ゆ槸鍚﹁嚜鍔ㄦ淳宸�' : tip = '璇风‘璁ゆ槸鍚﹂噸鏂版寚娲�';
@@ -676,20 +853,24 @@
}
},
handleAction(row, index) {
- getAssignee({
+ getAssigneeTree({
taskId: row.taskId,
}).then(res => {
- //if(row.taskDefinitionKey === '')
+
this.assigneeData = res.data.data;
this.allAssigneeData = res.data.data;
+
+ this.managerAssigneeData=[];
//鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
- for(var i=0;i<this.allAssigneeData.length;i++){
- if(this.allAssigneeData[i].manager == true){
- this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
}
}
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[1].dicData = this.assigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
})
this.formApprove = {
comment: '',
@@ -700,20 +881,42 @@
this.setAssignee(row, this.formApprove.approve);
this.setApproveBtn(row);
- console.log('handleAction', row, index);
+ //console.log('handleAction', row, index);
},
- handleSubmit(form, done) {
- if(this.row.taskDefinitionKey === 'programmingTask') {
- // if(this.applist.length !== 1) {
- // done();
- // return this.$message.success('璇烽�夋嫨1涓▼搴�');
- // }
+ async handleSubmit(form, done) {
+
+ let programOnMachine = 'N'
+ let goApprove = true;
+ if(this.row.taskDefinitionKey==='programmingTask' || this.row.taskDefinitionKey==='cureProgramTask'){
+ programOnMachine = this.$refs.todolistLeft.programOnMachine?'Y':'N';
+
+ let atts = this.$refs.todolistLeft.tableData;
+ let otherFileCOunt = atts.filter(att => att.program === false).length;
+ if(otherFileCOunt == 0){
+ let confirResult = await this.$confirm('鏂囦欢鍒楄〃涓棤鍏朵粬鏂囦欢锛岀‘璁よ鎻愪氦鍚楋紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(()=>{
+ goApprove = true;
+ }).catch(action => {
+ //鍙栨秷鎿嶄綔
+ goApprove = false;
+ });
+
+ }
+
}
+ if(goApprove == false){
+ done();
+ return;
+ }
+
approve({
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
- // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+ programOnMachine: programOnMachine
}).then(res => {
if(res.data.code !== 200) {
this.$message.error(res.data.msg);
@@ -735,6 +938,7 @@
let data = {}
this.query = params;
this.page.currentPage = 1;
+ /*
console.log('searchChange', params);
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
@@ -744,11 +948,12 @@
keyword: params.keyword || ''
}
this.query = data
- this.onLoad(this.page, data);
+ */
+ this.onLoad(this.page, {});
done();
},
searchReset() {
- this.query = {};
+ this.query = this.defaultQuery;
this.onLoad(this.page);
},
currentChange(currentPage) {
@@ -764,7 +969,6 @@
onLoad(page, params = {}) {
const query = {
...this.query,
- // category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
try {
@@ -772,7 +976,9 @@
} catch (error) {
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
-
+ console.log('params',params);
+ console.log('q',query);
+ console.log('thisq',this.query);
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
@@ -788,7 +994,19 @@
};
</script>
+<style lang="scss">
+.remark-drawer {
+ .el-drawer__header {
+ padding-top:5px;
+ margin-bottom: 0px !important;
+ }
+ .el-drawer__body{
+ padding-top:5px;
+ }
+}
+</style>
<style scoped="scoped" lang="scss">
+
.approve-box {
display: flex;
--
Gitblit v1.9.3