From b97726424bdbac7284c233d6afb994306b80eea2 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 02 八月 2025 13:59:21 +0800
Subject: [PATCH] update
---
src/api/flow/todolist.js | 15 ++++++-
src/views/flowmgr/taskassign.vue | 11 ++++-
src/views/flow/components/TodolistLeft.vue | 77 ++++++++++++++++++++++++++++++--------
src/views/flow/todolist.vue | 10 ++--
4 files changed, 85 insertions(+), 28 deletions(-)
diff --git a/src/api/flow/todolist.js b/src/api/flow/todolist.js
index fafee0f..0a4c132 100644
--- a/src/api/flow/todolist.js
+++ b/src/api/flow/todolist.js
@@ -1,7 +1,7 @@
/*
* @Date: 2025-06-12 22:38:05
* @LastEditors: gaoshp
- * @LastEditTime: 2025-07-08 23:52:49
+ * @LastEditTime: 2025-08-02 13:51:54
* @FilePath: /mdmweb/src/api/flow/todolist.js
*/
import request from '@/axios';
@@ -43,16 +43,25 @@
}
export const getSelectedAppList = processInstanceId => {
return request({
- url: '/blade-mdm/program/ncfile/list-by-process',
+ url: '/blade-mdm/flow/mgr/nclist-by-instanceid',
method: 'get',
params: {
processInstanceId
},
})
}
+export const removeAtt = (id, processInstanceId) => {
+ return request({
+ url: '/blade-mdm/flow/mgr/remove',
+ method: 'post',
+ params: {
+ id
+ },
+ })
+}
export const getContent = id => {
return request({
- url: '/blade-mdm/program/ncfile/content',
+ url: '/blade-mdm/flow/mgr/nc-content',
method: 'get',
params: {
id
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 66fb71b..5302b8f 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -1,17 +1,19 @@
<!--
* @Date: 2025-07-01 20:45:15
* @LastEditors: gaoshp
- * @LastEditTime: 2025-07-08 20:03:15
+ * @LastEditTime: 2025-08-02 13:57:52
* @FilePath: /mdmweb/src/views/flow/components/TodolistLeft.vue
-->
<template>
<basic-container>
<div class="tool" v-show="row.taskDefinitionKey === 'programmingTask'">
- <el-button type="primary" @click="addApp">娣诲姞绋嬪簭</el-button>
+ <avue-form :option="attOption"
+ v-model="attForm"
+ :upload-after="uploadAfter"></avue-form>
</div>
<el-table :data="tableData" border @row-click="showContent" max-height="200">
- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
- </el-table-column>
+ <!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
+ </el-table-column> -->
<el-table-column prop="name" label="绋嬪簭鍚嶇О">
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="100">
@@ -39,7 +41,7 @@
</template>
<script>
-import { getAppList,getSelectedAppList,getContent } from '@/api/flow/todolist';
+import { getAppList,getSelectedAppList,getContent,removeAtt} from '@/api/flow/todolist';
export default {
props: {
row: {
@@ -48,6 +50,26 @@
},
data() {
return {
+ attForm: {
+ att: '',
+ }, //绋嬪簭涓婁紶琛ㄥ崟
+ attOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: '娣诲姞绋嬪簭',
+ prop: 'att',
+ type: 'upload',
+ multiple: true,
+ action: '/api/blade-mdm/flow/mgr/ncupload',
+ span: 24,
+ data: {
+ processInstanceId: this.row.processInstanceId
+ },
+ }
+ ]
+ }, //绋嬪簭涓婁紶
tableData: [],//宸查�夌▼搴�
appContent: '',//绋嬪簭鍐呭
appDialog: false,
@@ -94,19 +116,33 @@
}
},
mounted() {
- console.log(this.row,'row')
- getSelectedAppList(this.row.processInstanceId).then(res => {
- if (res.data.code !== 200) {
- this.$message.error('鑾峰彇宸查�夌▼搴忓け璐�');
- return;
- } else {
- this.tableData = res.data.data || [];
- }
- this.$emit('selection-change',this.tableData)
- })
+ this.getAttList();
this.onLoad(this.page);
},
methods: {
+ uploadAfter(res, done, loading, column) {
+ if (res.code === 200) {
+ this.getAttList();
+ this.$message.success('涓婁紶鎴愬姛');
+ this.attForm.att = '';
+ return done();
+ } else {
+ console.log(res)
+ this.$message.warning(res.msg || '涓婁紶澶辫触');
+ done()
+ }
+ },
+ getAttList () {
+ getSelectedAppList(this.row.processInstanceId).then(res => {
+ if (res.data.code !== 200) {
+ this.$message.error('鑾峰彇宸查�夌▼搴忓け璐�');
+ return;
+ } else {
+ this.tableData = res.data.data || [];
+ }
+ // this.$emit('selection-change',this.tableData)
+ })
+ },
addApp() {
this.appDialog = true;
},
@@ -145,8 +181,14 @@
})
},
del (index,row) {
- this.tableData = this.tableData.filter(item => item.id !== row.id);
- this.$emit('selection-change',this.tableData)
+ removeAtt(row.id).then(res => {
+ if(res.data.code === 200) {
+ this.$message.success('鍒犻櫎鎴愬姛');
+ this.getAttList();
+ } else {
+ this.$message.error('鍒犻櫎澶辫触');
+ }
+ })
}
},
}
@@ -167,5 +209,6 @@
min-height: 100px;
overflow: auto;
max-height: 400px;
+ white-space: pre-wrap;
}
</style>
\ No newline at end of file
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 004b53d..d33d352 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -339,16 +339,16 @@
},
handleSubmit(form, done) {
if(this.row.taskDefinitionKey === 'programmingTask') {
- if(this.applist.length !== 1) {
- done();
- return this.$message.success('璇烽�夋嫨1涓▼搴�');
- }
+ // if(this.applist.length !== 1) {
+ // done();
+ // return this.$message.success('璇烽�夋嫨1涓▼搴�');
+ // }
}
approve({
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
- programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+ // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 046cc36..f09ff66 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -1,8 +1,8 @@
<!--
* @Author: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
* @Date: 2025-05-28 12:03:55
- * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
- * @LastEditTime: 2025-08-01 10:45:48
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2025-08-02 13:07:00
* @FilePath: /mdmweb/src/views/flowmgr/taskassign.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -58,7 +58,11 @@
prop: 'processNo',
type: 'input',
span: 12,
- dataType: 'string',
+ type: 'number',
+ step: 1,
+ precision: 0,
+ dataType: 'number',
+ maxlength: 3,
},
{
label: '宸ュ簭鍚嶇О',
@@ -66,6 +70,7 @@
type: 'input',
span: 12,
dataType: 'string',
+ maxlength: 2,
},
{
label: '宸ュ簭鐗堟',
--
Gitblit v1.9.3