Bladeren bron

修改技术方案撤回后不能提交的问题

余思翰 7 maanden geleden
bovenliggende
commit
65b7c46e49

+ 5
- 5
oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue Bestand weergeven

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-07-04 17:37:29
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-08-02 09:46:48
5
+ * @LastEditTime: 2024-09-11 11:37:30
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container" v-loading="loading">
@@ -17,8 +17,8 @@
17 17
         <el-form-item label="项目名称:" prop="projectName">
18 18
           {{ form.projectName }}
19 19
         </el-form-item>
20
-        <el-form-item label="接受交底人" prop="disclosureAccepter">
21
-          <el-select v-model="form.disclosureAccepter" filterable clearable style="width:220px">
20
+        <el-form-item label="接受交底人" prop="accepter">
21
+          <el-select v-model="form.accepter" filterable clearable style="width:220px">
22 22
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
23 23
             </el-option>
24 24
           </el-select>
@@ -44,7 +44,7 @@
44 44
         <el-row>
45 45
           <el-col :span="6" :xs="24" :offset="12">
46 46
             <el-form-item label="签名" prop="disclosurer">
47
-              <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : '' }}
47
+              <span class="auditor"> {{ form.disclosureUser ? form.disclosureUser.nickName : '' }}
48 48
               </span>
49 49
             </el-form-item>
50 50
           </el-col>
@@ -60,7 +60,7 @@
60 60
         <el-row>
61 61
           <el-col :span="6" :xs="24" :offset="12">
62 62
             <el-form-item label="签名">
63
-              <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : '' }} </span>
63
+              <span class="auditor"> {{ form.acceptUser ? form.acceptUser.nickName : '' }} </span>
64 64
             </el-form-item>
65 65
           </el-col>
66 66
           <el-col :span="6">

+ 9
- 1
oa-ui/src/views/flowable/form/technicalPlan.vue Bestand weergeven

@@ -474,7 +474,15 @@ export default {
474 474
             });
475 475
             const params = { taskId: this.taskForm.taskId };
476 476
             getNextFlowNode(params).then(res => {
477
-              if (this.taskName == '方案上传') {
477
+              if (this.taskName == '技术安排') {
478
+                this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
479
+                this.$set(this.taskForm.variables, "techInitiator", this.form.technicalDirector);
480
+                this.$set(this.taskForm.variables, "approval", this.form.technicalDesigner);
481
+                complete(this.taskForm).then(response => {
482
+                  this.$modal.msgSuccess(response.msg);
483
+                  this.$emit('goBack')
484
+                });
485
+              } else if (this.taskName == '方案上传') {
478 486
                 this.checkSendUser = true;
479 487
                 this.completeOpen = true;
480 488
                 this.completeTitle = "流程审批";

Laden…
Annuleren
Opslaan