+
指派:{{ assignedUsername }}
-
- 同意
+
+ 提交
完结
-
-
-
-
-
存为草稿
-
暂存待办
+
提交
+
+ 完结
+
@@ -254,7 +247,7 @@ export default {
assignedUsername: '',
// 审批表单数据
approvalForm: {
- result: '指派', // 默认为同意
+ result: '', // 默认为同意
remark: '', // 处理意见
hideOpinion: false, // 意见隐藏
track: false, // 跟踪
@@ -409,9 +402,14 @@ export default {
this.ticketsData = data.tickets;
}
const user = this.ticketsData.processInstanceUser;
- if (user && (user.includes('指派') || user.includes('完结'))) {
- this.approvalForm.result = '提交'; // 自动选中“同意”
+ if (user.includes('完结')) {
+ this.approvalForm.result = '提交' // 自动选中“同意”
+ } else if (user.includes('指派')) {
+ this.approvalForm.result = '指派' // 自动选中“同意”
+ }else if (user.includes('技术员')|| user.includes('维修员')) {
+ this.approvalForm.result = '提交' // 自动选中“同意”
}
+
this.$http({
url: this.$http.adornUrl(`/flw/instance/flowProcessList`),
method: 'get',
@@ -423,7 +421,6 @@ export default {
},
// 提交审批
submitApproval() {
- debugger
if (!this.approvalForm.remark && this.approvalForm.result === '完结') {
this.$message.warning('完结时请填写处理意见');
return;
@@ -434,7 +431,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- debugger
+
var formdata = new FormData()
this.fileList.forEach(a => {
formdata.append('file', a.raw)
diff --git a/base-vue/src/views/modules/tickets/备用.vue b/base-vue/src/views/modules/tickets/备用.vue
index 71e1f57..2836fa0 100644
--- a/base-vue/src/views/modules/tickets/备用.vue
+++ b/base-vue/src/views/modules/tickets/备用.vue
@@ -144,7 +144,7 @@
-