余思翰 1 год назад
Родитель
Сommit
d8678951ed
2 измененных файлов: 34 добавлений и 14 удалений
  1. 33
    13
      oa-ui/src/views/flowable/form/carForm.vue
  2. 1
    1
      oa-ui/src/views/flowable/task/myProcess/index.vue

+ 33
- 13
oa-ui/src/views/flowable/form/carForm.vue Просмотреть файл

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-03-08 15:12:42
5
+ * @LastEditTime: 2024-03-08 16:14:41
6
 -->
6
 -->
7
 <!--
7
 <!--
8
  * @Author: wrh
8
  * @Author: wrh
88
         </el-row>
88
         </el-row>
89
         <el-divider></el-divider>
89
         <el-divider></el-divider>
90
         <!-- 部门审核意见 -->
90
         <!-- 部门审核意见 -->
91
-        <el-form-item label="部门审核意见:" prop="deptComment" label-width="120px" v-if="taskName == '部门审核'">
91
+        <el-form-item label="部门审核意见:" prop="deptComment" label-width="120px" v-if="taskName == '部门审核' || taskName == '分管审核' || taskName == '安排用车'">
92
           <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment">
92
           <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment">
93
           </el-input>
93
           </el-input>
94
         </el-form-item>
94
         </el-form-item>
95
         <!-- 分管审核意见 -->
95
         <!-- 分管审核意见 -->
96
-        <el-form-item label="分管审核意见:" prop="managerComment" label-width="120px" v-if="taskName == '分管审核'">
96
+        <el-form-item label="分管审核意见:" prop="managerComment" label-width="120px" v-if="taskName == '分管审核' || taskName == '安排用车'">
97
           <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
97
           <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
98
           </el-input>
98
           </el-input>
99
         </el-form-item>
99
         </el-form-item>
132
 import {
132
 import {
133
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
133
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
134
 } from "@/api/flowable/todo";
134
 } from "@/api/flowable/todo";
135
-import { getUsersDeptLeader } from '@/api/system/post.js'
135
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
136
 export default {
136
 export default {
137
   props: {
137
   props: {
138
     taskName: {
138
     taskName: {
214
     },
214
     },
215
     submit() {
215
     submit() {
216
       this.$refs['carForm'].validate((valid) => {
216
       this.$refs['carForm'].validate((valid) => {
217
-        debugger
218
         if (valid) {
217
         if (valid) {
219
           this.form.formId = this.taskForm.formId;
218
           this.form.formId = this.taskForm.formId;
220
           let formData = new FormData();
219
           let formData = new FormData();
236
       })
235
       })
237
     },
236
     },
238
     completeApply() {
237
     completeApply() {
238
+      this.form.formId = this.taskForm.formId;
239
+      this.form.carApplyId = this.taskForm.formId;
239
       let formData = new FormData();
240
       let formData = new FormData();
240
       let jsonForm = JSON.stringify(this.form);
241
       let jsonForm = JSON.stringify(this.form);
241
       formData.append("form", jsonForm);
242
       formData.append("form", jsonForm);
250
     },
251
     },
251
     // 获取下一个审批人
252
     // 获取下一个审批人
252
     getNextFlowNodeApproval() {
253
     getNextFlowNodeApproval() {
253
-      getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
254
-        let userId = res.data.userId;
255
-        this.$set(this.taskForm.variables, "approval", userId);
256
-        complete(this.taskForm).then(response => {
257
-          this.$modal.msgSuccess(response.msg);
258
-          this.$emit('goBack')
259
-        });
260
-      })
254
+      debugger
255
+      if (this.taskName == '用车申请') {
256
+        getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
257
+          let userId = res.data.userId;
258
+          this.$set(this.taskForm.variables, "approval", userId);
259
+          complete(this.taskForm).then(response => {
260
+            this.$modal.msgSuccess(response.msg);
261
+            this.$emit('goBack')
262
+          });
263
+        })
264
+      } else if (this.taskName == '部门审核') {
265
+        getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
266
+          let userId = res.data.userId;
267
+          this.$set(this.taskForm.variables, "approval", userId);
268
+          complete(this.taskForm).then(response => {
269
+            this.$modal.msgSuccess(response.msg);
270
+            this.$emit('goBack')
271
+          });
272
+        })
273
+      }else if(this.taskName == '分管审核') {
274
+        this.$set(this.taskForm.variables, "approval", 16);
275
+          complete(this.taskForm).then(response => {
276
+            this.$modal.msgSuccess(response.msg);
277
+            this.$emit('goBack')
278
+          });
279
+      }
280
+
261
     },
281
     },
262
     // 查询项目列表
282
     // 查询项目列表
263
     getProjectList() {
283
     getProjectList() {

+ 1
- 1
oa-ui/src/views/flowable/task/myProcess/index.vue Просмотреть файл

293
           const formData = {};
293
           const formData = {};
294
           formData.disabled = true;
294
           formData.disabled = true;
295
           formData.formBtns = false;
295
           formData.formBtns = false;
296
-
296
+          debugger
297
           formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
297
           formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
298
           if (row.id) {
298
           if (row.id) {
299
             variables.variables = formData;
299
             variables.variables = formData;

Загрузка…
Отмена
Сохранить