|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
* @Author: ysh
|
|
3
|
3
|
* @Date: 2024-02-29 11:44:28
|
|
4
|
4
|
* @LastEditors: wrh
|
|
5
|
|
- * @LastEditTime: 2024-07-05 17:57:11
|
|
|
5
|
+ * @LastEditTime: 2024-07-10 11:27:00
|
|
6
|
6
|
-->
|
|
7
|
7
|
|
|
8
|
8
|
<template>
|
|
|
@@ -171,6 +171,24 @@
|
|
171
|
171
|
</el-form-item>
|
|
172
|
172
|
</el-col>
|
|
173
|
173
|
</el-row>
|
|
|
174
|
+ <!-- 董事长审核意见 -->
|
|
|
175
|
+ <el-form-item label="董事长审核意见" prop="dszComment" label-width="120px" v-if="showFormItem('董事长审核')">
|
|
|
176
|
+ <el-input type="textarea" :rows="2" placeholder="请输入董事长审核意见" v-model="form.dszComment"
|
|
|
177
|
+ :disabled="taskName != '董事长审核'">
|
|
|
178
|
+ </el-input>
|
|
|
179
|
+ </el-form-item>
|
|
|
180
|
+ <el-row>
|
|
|
181
|
+ <el-col :span="6" :xs="24" :offset="12">
|
|
|
182
|
+ <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核签名')">
|
|
|
183
|
+ <span class="auditor"> {{ form.dszUser ? form.dszUser.nickName : dszUser }} </span>
|
|
|
184
|
+ </el-form-item>
|
|
|
185
|
+ </el-col>
|
|
|
186
|
+ <el-col :span="6">
|
|
|
187
|
+ <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核签名')">
|
|
|
188
|
+ <span> {{ form.dszTime ? form.dszTime : dszTime }} </span>
|
|
|
189
|
+ </el-form-item>
|
|
|
190
|
+ </el-col>
|
|
|
191
|
+ </el-row>
|
|
174
|
192
|
<el-divider></el-divider>
|
|
175
|
193
|
<!-- 安排用车意见 -->
|
|
176
|
194
|
<el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px">
|
|
|
@@ -296,6 +314,10 @@ export default {
|
|
296
|
314
|
this.gmUser = this.$store.getters.name;
|
|
297
|
315
|
this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
298
|
316
|
}
|
|
|
317
|
+ if (this.taskName == '董事长审核') {
|
|
|
318
|
+ this.dszUser = this.$store.getters.name;
|
|
|
319
|
+ this.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
320
|
+ }
|
|
299
|
321
|
if (this.taskName == '安排用车') {
|
|
300
|
322
|
this.dispatchUser = this.$store.getters.name;
|
|
301
|
323
|
this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
@@ -316,11 +338,13 @@ export default {
|
|
316
|
338
|
managerUser: '',
|
|
317
|
339
|
unionUser: '',
|
|
318
|
340
|
gmUser: '',
|
|
|
341
|
+ dszUser: '',
|
|
319
|
342
|
dispatchUser: '',
|
|
320
|
343
|
deptTime: undefined,
|
|
321
|
344
|
managerTime: undefined,
|
|
322
|
345
|
unionTime: undefined,
|
|
323
|
346
|
gmTime: undefined,
|
|
|
347
|
+ dszTime: undefined,
|
|
324
|
348
|
dispatchTime: undefined,
|
|
325
|
349
|
form: {
|
|
326
|
350
|
carUsage: '0',
|
|
|
@@ -396,6 +420,12 @@ export default {
|
|
396
|
420
|
{ required: true, message: '请输入总经理审核意见', trigger: 'blur' }
|
|
397
|
421
|
]
|
|
398
|
422
|
}
|
|
|
423
|
+ } else if (this.taskName == '董事长审核') {
|
|
|
424
|
+ this.rules = {
|
|
|
425
|
+ dszComment: [
|
|
|
426
|
+ { required: true, message: '请输入董事长审核意见', trigger: 'blur' }
|
|
|
427
|
+ ]
|
|
|
428
|
+ }
|
|
399
|
429
|
} else if (this.taskName == '党工团审核') {
|
|
400
|
430
|
this.rules = {
|
|
401
|
431
|
unionComment: [
|
|
|
@@ -510,10 +540,19 @@ export default {
|
|
510
|
540
|
// 获取下一个审批人
|
|
511
|
541
|
getNextFlowNodeApproval() {
|
|
512
|
542
|
if (this.taskName == '用车申请') {
|
|
513
|
|
- if (this.dept < 102 && this.dept != 0)
|
|
514
|
|
- this.dept = 102
|
|
|
543
|
+ // if (this.dept < 102 && this.dept != 0)
|
|
|
544
|
+ // this.dept = 102
|
|
515
|
545
|
this.$set(this.taskForm.variables, "dept", this.dept);
|
|
516
|
|
- if (this.dept == 102) {
|
|
|
546
|
+ if (this.dept == 101) {
|
|
|
547
|
+ getUserByPost({ postName: '董事长' }).then(result => {
|
|
|
548
|
+ this.$set(this.taskForm.variables, "approval", result.data[0].userId);
|
|
|
549
|
+ complete(this.taskForm).then(response => {
|
|
|
550
|
+ this.$modal.msgSuccess(response.msg);
|
|
|
551
|
+ this.$emit('goBack')
|
|
|
552
|
+ })
|
|
|
553
|
+ })
|
|
|
554
|
+ }
|
|
|
555
|
+ else if (this.dept == 102) {
|
|
517
|
556
|
getUserByPost({ postName: '总经理' }).then(result => {
|
|
518
|
557
|
this.$set(this.taskForm.variables, "approval", result.data[0].userId);
|
|
519
|
558
|
complete(this.taskForm).then(response => {
|
|
|
@@ -533,24 +572,15 @@ export default {
|
|
533
|
572
|
})
|
|
534
|
573
|
}
|
|
535
|
574
|
else {
|
|
536
|
|
- if (this.deptId == 105)
|
|
537
|
|
- getDeptLeaders({ userId: this.form.drafter }).then(res => {
|
|
538
|
|
- this.$set(this.taskForm.variables, "approval", res.data[1].userId);
|
|
|
575
|
+ getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
|
|
|
576
|
+ if (res.data) {
|
|
|
577
|
+ this.$set(this.taskForm.variables, "approval", res.data.userId);
|
|
539
|
578
|
complete(this.taskForm).then(response => {
|
|
540
|
579
|
this.$modal.msgSuccess(response.msg);
|
|
541
|
580
|
this.$emit('goBack')
|
|
542
|
|
- });
|
|
543
|
|
- })
|
|
544
|
|
- else
|
|
545
|
|
- getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
|
|
546
|
|
- if (res.data) {
|
|
547
|
|
- this.$set(this.taskForm.variables, "approval", res.data.userId);
|
|
548
|
|
- complete(this.taskForm).then(response => {
|
|
549
|
|
- this.$modal.msgSuccess(response.msg);
|
|
550
|
|
- this.$emit('goBack')
|
|
551
|
|
- })
|
|
552
|
|
- }
|
|
553
|
|
- })
|
|
|
581
|
+ })
|
|
|
582
|
+ }
|
|
|
583
|
+ })
|
|
554
|
584
|
}
|
|
555
|
585
|
} else if (this.taskName == '部门审核') {
|
|
556
|
586
|
getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
|
|
|
@@ -561,7 +591,7 @@ export default {
|
|
561
|
591
|
this.$emit('goBack')
|
|
562
|
592
|
});
|
|
563
|
593
|
})
|
|
564
|
|
- } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
|
|
|
594
|
+ } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核' || this.taskName == '董事长审核') {
|
|
565
|
595
|
getUserByRole({ roleId: 5 }).then(result => {
|
|
566
|
596
|
this.$set(this.taskForm.variables, "approvalList", result.data);
|
|
567
|
597
|
complete(this.taskForm).then(response => {
|
|
|
@@ -699,6 +729,9 @@ export default {
|
|
699
|
729
|
else if (name == '总经理审核')
|
|
700
|
730
|
isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
|
|
701
|
731
|
|| (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
|
|
|
732
|
+ else if (name == '董事长审核')
|
|
|
733
|
+ isShow = (this.dept == 101 && this.taskName == '用车申请') || this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
|
|
|
734
|
+ || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
|
|
702
|
735
|
else if (name == '部门审核签名')
|
|
703
|
736
|
isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
|
|
704
|
737
|
|| (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
|
|
|
@@ -711,6 +744,9 @@ export default {
|
|
711
|
744
|
else if (name == '总经理审核签名')
|
|
712
|
745
|
isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
|
|
713
|
746
|
|| (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
|
|
|
747
|
+ else if (name == '董事长审核签名')
|
|
|
748
|
+ isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
|
|
|
749
|
+ || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
|
|
714
|
750
|
return isShow;
|
|
715
|
751
|
},
|
|
716
|
752
|
},
|
