Bladeren bron

修改用车申请 部门审核提交错误的问题

余思翰 10 maanden geleden
bovenliggende
commit
f30b9634c8
2 gewijzigde bestanden met toevoegingen van 15 en 13 verwijderingen
  1. 2
    3
      oa-ui/src/views/flowable/form/budget/budgetInfo.vue
  2. 13
    10
      oa-ui/src/views/flowable/form/oa/carForm.vue

+ 2
- 3
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Bestand weergeven

@@ -2,14 +2,13 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-04-03 16:28:09
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-07-11 18:17:52
5
+ * @LastEditTime: 2024-07-16 16:18:22
6 6
 -->
7 7
 <template>
8 8
   <div class="main">
9 9
     <div>
10 10
       <h2 class="text-center">项目直接生产成本预算表</h2>
11
-      <p style="text-align: center;">编制人:{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 审核人:{{
12
-        budgetForm.managerUser ? budgetForm.managerUser.nickName : '' }}</p>
11
+      <p style="text-align: center;">编制人:{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
13 12
       <el-descriptions :column="3" border class="descriptions">
14 13
         <el-descriptions-item label="项目编号">
15 14
           {{ projectForm.projectNumber }}

+ 13
- 10
oa-ui/src/views/flowable/form/oa/carForm.vue Bestand weergeven

@@ -1,8 +1,8 @@
1 1
 <!--
2 2
  * @Author: ysh
3 3
  * @Date: 2024-02-29 11:44:28
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-07-10 11:27:00
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-07-17 14:25:59
6 6
 -->
7 7
 
8 8
 <template>
@@ -56,17 +56,17 @@
56 56
                 </el-select> -->
57 57
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
58 58
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
59
-                  }}</el-descriptions-item>
59
+                    }}</el-descriptions-item>
60 60
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
61
-                  }}</el-descriptions-item>
61
+                    }}</el-descriptions-item>
62 62
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
63
-                    chooseProject.projectLeaderUser.nickName : ''
64
-                  }}</el-descriptions-item>
63
+    chooseProject.projectLeaderUser.nickName : ''
64
+                    }}</el-descriptions-item>
65 65
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
66 66
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
67 67
                   </el-descriptions-item>
68 68
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
69
-                  }}</el-descriptions-item>
69
+                    }}</el-descriptions-item>
70 70
                 </el-descriptions>
71 71
               </el-form-item>
72 72
               <el-form-item label="用车事由:" prop="applyReason">
@@ -233,7 +233,7 @@
233 233
             </el-row>
234 234
             <el-row style="text-align: center;" v-else>
235 235
               <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
236
-                "完成审批" }}</el-button>
236
+    "完成审批" }}</el-button>
237 237
             </el-row>
238 238
           </div>
239 239
         </el-card>
@@ -584,8 +584,11 @@ export default {
584 584
         }
585 585
       } else if (this.taskName == '部门审核') {
586 586
         getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
587
-          let userId = res.data.userId;
588
-          this.$set(this.taskForm.variables, "approval", userId);
587
+          let userId = [];
588
+          res.data.forEach(user => {
589
+            userId.push(user.userId)
590
+          })
591
+          this.$set(this.taskForm.variables, "approvalList", userId);
589 592
           complete(this.taskForm).then(response => {
590 593
             this.$modal.msgSuccess(response.msg);
591 594
             this.$emit('goBack')

Laden…
Annuleren
Opslaan