From 4b10fde9de6672b046c063e6e1b1d8e859c54f5a Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 13:59:58 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/api/flow/todolist.js | 10 ++++
src/views/flowmgr/taskassign.vue | 58 +++++++++++++++++++----------
src/views/flow/todolist.vue | 16 ++++++--
src/views/wel/components/TodolistRightTop.vue | 2 +
4 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/src/api/flow/todolist.js b/src/api/flow/todolist.js
index 5da2964..9f59320 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-08-10 00:26:43
+ * @LastEditTime: 2025-08-10 13:52:14
* @FilePath: /mdmweb/src/api/flow/todolist.js
*/
import request from '@/axios';
@@ -94,4 +94,12 @@
params: data,
data: {}
})
+}
+export const getPrevius = data => {
+ return request({
+ url: '/blade-mdm/flow/previus-approve-user',
+ method: 'get',
+ params: data,
+ data: {}
+ })
}
\ No newline at end of file
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 5f6b693..d00d514 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -34,7 +34,7 @@
</template>
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -319,6 +319,7 @@
this.optionApprove.column[1].dicData = this.assigneeData;
this.reassignOption.column[0].dicData = this.assigneeData;
})
+ this.setApproveBtn()
},
methods: {
// 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
@@ -364,15 +365,22 @@
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
}
} else if(approve === 'N'){
this.formApprove.assignee = ''
- if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = row.varables.assignee; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ 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/taskassign.vue b/src/views/flowmgr/taskassign.vue
index d06a24d..e89b0ce 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -2,7 +2,7 @@
* @Author: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
* @Date: 2025-05-28 12:03:55
* @LastEditors: gaoshp
- * @LastEditTime: 2025-08-02 21:58:47
+ * @LastEditTime: 2025-08-10 13:05:56
* @FilePath: /mdmweb/src/views/flowmgr/taskassign.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -14,6 +14,18 @@
<script>
export default {
+ watch: {
+ 'attachForm.drawingNo': function (val) {
+ if(val && this.attachForm.processNo) {
+ this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
+ }
+ },
+ 'attachForm.processNo': function (val) {
+ if(val && this.attachForm.drawingNo) {
+ this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
+ }
+ },
+ },
data() {
var that = this;
return {
@@ -25,7 +37,7 @@
emptyBtn: false,
tip: false,
column: [
- {
+ {
label: '娴佺▼鏍囬',
prop: 'title',
type: 'input',
@@ -98,7 +110,7 @@
type: 'input',
span: 12,
dataType: 'string',
- maxlength: 2,
+ maxlength: 2,
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
{
@@ -106,7 +118,7 @@
prop: 'machineCode',
type: 'select',
dicUrl: `/blade-mdm/machine/page`,
- dicFormatter: function(res) {
+ dicFormatter: function (res) {
that.machineCodeList = res.data.records;
return res.data.records;
},
@@ -135,36 +147,44 @@
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
+ {
+ label: '鍋忕鍗曞彿',
+ prop: 'deviation',
+ type: 'input',
+ span: 12,
+ dataType: 'string',
+ // rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ },
],
},
attachForm: {},
};
},
methods: {
- formSubmit(form,done) {
- var form = {...form};
- this.machineCodeList.forEach(item=> {
- if(form.machineCode == item.code) {
+ formSubmit(form, done) {
+ var form = { ...form };
+ this.machineCodeList.forEach(item => {
+ if (form.machineCode == item.code) {
form.machineMode = item.name;
}
})
-
+
axios({
url: '/blade-mdm/flow/dispatch/start',
method: 'post',
data: form,
}).then(
res => {
- this.$message({
- type: 'success',
- message: '鎿嶄綔鎴愬姛!',
- });
- this.$refs.form.resetForm();
- done();
+ this.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+ this.$refs.form.resetForm();
+ done();
},
error => {
- window.console.log(error);
- done();
+ window.console.log(error);
+ done();
}
);
}
@@ -172,6 +192,4 @@
};
</script>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>
diff --git a/src/views/wel/components/TodolistRightTop.vue b/src/views/wel/components/TodolistRightTop.vue
index abcbe5d..50e82de 100644
--- a/src/views/wel/components/TodolistRightTop.vue
+++ b/src/views/wel/components/TodolistRightTop.vue
@@ -34,9 +34,11 @@
<el-form-item label="鍔犲伐鏈哄簥">
<el-input v-model="formInline.machineCode" placeholder=""></el-input>
</el-form-item>
+ <!--
<el-form-item label="杩囩▼鍗″彿">
<el-input v-model="formInline.empty" placeholder=""></el-input>
</el-form-item>
+ -->
<el-form-item label="鍒涘缓鏃堕棿">
<el-input v-model="formInline.createTime" placeholder=""></el-input>
</el-form-item>
--
Gitblit v1.9.3