Pārlūkot izejas kodu

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

lamphua 1 gadu atpakaļ
vecāks
revīzija
8464c75d72

+ 6
- 6
oa-back/sql/sql.sql
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 6
- 0
oa-ui/src/views/flowable/form/technicalForm.vue Parādīt failu

88
             </el-col>
88
             </el-col>
89
           </el-row>
89
           </el-row>
90
           <el-divider></el-divider>
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
           <el-form-item label="技术部审核意见" prop="technicalComment">
94
           <el-form-item label="技术部审核意见" prop="technicalComment">
92
             <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
95
             <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
93
               :disabled="taskName != '技术审核'" />
96
               :disabled="taskName != '技术审核'" />
104
               </el-form-item>
107
               </el-form-item>
105
             </el-col>
108
             </el-col>
106
           </el-row>
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
           <el-form-item label="总工程师审核意见" prop="manageComment">
113
           <el-form-item label="总工程师审核意见" prop="manageComment">
108
             <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
114
             <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
109
               :disabled="taskName != '总工审核'" />
115
               :disabled="taskName != '总工审核'" />

+ 2
- 2
oa-ui/src/views/flowable/task/myProcess/index.vue Parādīt failu

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
  * @LastEditors: wrh
4
  * @LastEditors: wrh
5
- * @LastEditTime: 2024-05-08 15:34:14
5
+ * @LastEditTime: 2024-05-09 10:53:40
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
465
     },
465
     },
466
     // 子流程不可以删除
466
     // 子流程不可以删除
467
     beDeleted(row) {
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
         return true
469
         return true
470
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
470
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
471
         return true
471
         return true

+ 2
- 2
oa-ui/src/views/flowable/task/myProcess/progressTree.vue Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt