Browse Source

成果归档、项目结算单独流程

lamphua 1 year ago
parent
commit
8464c75d72

+ 6
- 6
oa-back/sql/sql.sql
File diff suppressed because it is too large
View File


+ 6
- 0
oa-ui/src/views/flowable/form/technicalForm.vue View File

@@ -88,6 +88,9 @@
88 88
             </el-col>
89 89
           </el-row>
90 90
           <el-divider></el-divider>
91
+          <el-form-item label="修改技术方案" prop="modifyDocument">
92
+            <el-input v-model="form.modifyDocument" placeholder="请输入修改技术方案" :disabled="taskName != '技术审核'" />
93
+          </el-form-item>
91 94
           <el-form-item label="技术部审核意见" prop="technicalComment">
92 95
             <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
93 96
               :disabled="taskName != '技术审核'" />
@@ -104,6 +107,9 @@
104 107
               </el-form-item>
105 108
             </el-col>
106 109
           </el-row>
110
+          <el-form-item label="最终技术方案" prop="finalDocument">
111
+            <el-input v-model="form.finalDocument" placeholder="请输入最终技术方案" :disabled="taskName != '总工审核'" />
112
+          </el-form-item>
107 113
           <el-form-item label="总工程师审核意见" prop="manageComment">
108 114
             <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
109 115
               :disabled="taskName != '总工审核'" />

+ 2
- 2
oa-ui/src/views/flowable/task/myProcess/index.vue View File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-01-03 09:23:11
4 4
  * @LastEditors: wrh
5
- * @LastEditTime: 2024-05-08 15:34:14
5
+ * @LastEditTime: 2024-05-09 10:53:40
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -465,7 +465,7 @@ export default {
465 465
     },
466 466
     // 子流程不可以删除
467 467
     beDeleted(row) {
468
-      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.procDefName == '成果归档' || row.procDefName == '项目结算' || row.finishTime != null) {
468
+      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
469 469
         return true
470 470
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
471 471
         return true

+ 2
- 2
oa-ui/src/views/flowable/task/myProcess/progressTree.vue View File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-04-18 15:14:45
4 4
  * @LastEditors: wrh
5
- * @LastEditTime: 2024-05-08 15:39:42
5
+ * @LastEditTime: 2024-05-09 10:46:19
6 6
 -->
7 7
 <template>
8 8
   <div>
@@ -77,7 +77,7 @@ export default {
77 77
           this.treeData[0].children.push(i);
78 78
         }
79 79
         else if (i.category == "project") {
80
-          if (i.name == "项目流转") 
80
+          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底") 
81 81
             this.treeData[1].children.push(i);
82 82
         } else if (i.category == "finance") {
83 83
           this.treeData[2].children.push(i);

Loading…
Cancel
Save