Bladeren bron

修改分管审核为第一承担部门的分管,修改项目流转的自适应

余思翰 7 maanden geleden
bovenliggende
commit
a60d03208b

+ 1
- 0
oa-ui/src/views/flowable/form/finance/borrowForm.vue Bestand weergeven

@@ -641,6 +641,7 @@ export default {
641 641
                 })
642 642
               }
643 643
               else if (this.taskName == '总经理审核') {
644
+                this.exceed = false; //待删
644 645
                 this.$set(this.taskForm.variables, "exceed", this.exceed);
645 646
                 if (!this.exceed) { //没有超预算
646 647
                   this.submitFD(); //提交到财务部审核

+ 1
- 1
oa-ui/src/views/flowable/form/projectProcess/assessWork.vue Bestand weergeven

@@ -19,7 +19,7 @@
19 19
           </el-link>
20 20
         </div>
21 21
       </el-form-item>
22
-      <el-form-item label="核定工作量:">
22
+      <el-form-item label-width="0px">
23 23
         <table class="table" border="1">
24 24
           <tr>
25 25
             <td style="width: 180px">工作内容</td>

+ 18
- 11
oa-ui/src/views/flowable/form/projectProcess/businessReview.vue Bestand weergeven

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-04-08 13:56:14
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-08-28 10:13:07
5
+ * @LastEditTime: 2024-09-10 15:33:46
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -100,17 +100,24 @@ export default {
100 100
       getProject(this.taskForm.formId).then(res => {
101 101
         if (res.data && res.data.undertakingDept) {
102 102
           let deptId = res.data.undertakingDept.split(',');
103
-          this.$store.commit('SET_UNDERDEPTID', deptId);
103
+          this.$store.commit('SET_UNDERDEPTID', deptId[0]);
104 104
           this.managerList = []
105
-          for (let d of deptId) {
106
-            getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
107
-              if (resopnse.data) {
108
-                resopnse.data.forEach(element => {
109
-                  this.managerList.push(element.userId)
110
-                });
111
-              }
112
-            })
113
-          }
105
+          getUsersManageLeaderByDept({ deptId: Number(deptId[0]) }).then(resopnse => {
106
+            if (resopnse.data) {
107
+              resopnse.data.forEach(element => {
108
+                this.managerList.push(element.userId)
109
+              });
110
+            }
111
+          })
112
+          // for (let d of deptId) {
113
+          //   getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
114
+          //     if (resopnse.data) {
115
+          //       resopnse.data.forEach(element => {
116
+          //         this.managerList.push(element.userId)
117
+          //       });
118
+          //     }
119
+          //   })
120
+          // }
114 121
         }
115 122
       })
116 123
     },

+ 3
- 3
oa-ui/src/views/flowable/form/projectProcess/index.vue Bestand weergeven

@@ -2,13 +2,13 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-02-27 14:49:15
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-08-09 15:26:54
5
+ * @LastEditTime: 2024-09-10 16:23:32
6 6
 -->
7 7
 
8 8
 <template>
9 9
   <div class="project-wrapper">
10 10
     <el-row :gutter="20">
11
-      <el-col :span="18" :xs="24">
11
+      <el-col :xs="24":md="18">
12 12
         <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
13 13
           <el-tab-pane label="项目登记" name="项目登记">
14 14
             <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack">
@@ -51,7 +51,7 @@
51 51
           </el-tab-pane>
52 52
         </el-tabs>
53 53
       </el-col>
54
-      <el-col :span="6" :xs="24">
54
+      <el-col :xs="24" :md="6">
55 55
         <el-card>
56 56
           <h2 style="text-align: center;">流程进度</h2>
57 57
           <div>

Laden…
Annuleren
Opslaan