Преглед изворни кода

新增申请表单组件,修改项目流转中借款申请的显示和跳转

余思翰 пре 1 година
родитељ
комит
660f683328
34 измењених фајлова са 357 додато и 68 уклоњено
  1. 15
    1
      oa-ui/src/router/index.js
  2. 154
    8
      oa-ui/src/views/flowable/form/borrow/borrowData.vue
  3. 0
    1
      oa-ui/src/views/flowable/form/budget/budgetInfo.vue
  4. 62
    12
      oa-ui/src/views/flowable/form/projectProcess/addproject.vue
  5. 7
    7
      oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue
  6. 0
    3
      oa-ui/src/views/flowable/form/projectProcess/budgetTab.vue
  7. 0
    2
      oa-ui/src/views/flowable/form/projectProcess/inProgress.vue
  8. 0
    2
      oa-ui/src/views/flowable/form/projectProcess/index.vue
  9. 0
    1
      oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue
  10. 0
    1
      oa-ui/src/views/flowable/form/scTable.vue
  11. 0
    1
      oa-ui/src/views/flowable/form/zhTable.vue
  12. 0
    1
      oa-ui/src/views/flowable/task/finished/index.vue
  13. 0
    1
      oa-ui/src/views/flowable/task/form/index.vue
  14. 0
    2
      oa-ui/src/views/flowable/task/myProcess/index.vue
  15. 0
    2
      oa-ui/src/views/flowable/task/myProcess/progressTree.vue
  16. 0
    1
      oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue
  17. 23
    0
      oa-ui/src/views/flowable/task/todo/applyForm/borrowIndex.vue
  18. 90
    0
      oa-ui/src/views/flowable/task/todo/applyForm/components/header.vue
  19. 6
    0
      oa-ui/src/views/flowable/task/todo/detail/index.vue
  20. 0
    1
      oa-ui/src/views/oa/budget/addBudget.vue
  21. 0
    1
      oa-ui/src/views/oa/budget/components/budgetForm.vue
  22. 0
    1
      oa-ui/src/views/oa/budget/components/budgetTable.vue
  23. 0
    1
      oa-ui/src/views/oa/budget/components/chooseDevice.vue
  24. 0
    1
      oa-ui/src/views/oa/budget/components/chooseMoney.vue
  25. 0
    2
      oa-ui/src/views/oa/budget/index.vue
  26. 0
    2
      oa-ui/src/views/oa/car/expense.vue
  27. 0
    1
      oa-ui/src/views/oa/car/index.vue
  28. 0
    2
      oa-ui/src/views/oa/device/approval.vue
  29. 0
    1
      oa-ui/src/views/oa/device/index.vue
  30. 0
    2
      oa-ui/src/views/oa/project/index.vue
  31. 0
    2
      oa-ui/src/views/oa/staff/index.vue
  32. 0
    1
      oa-ui/src/views/oa/staff/info.vue
  33. 0
    3
      oa-ui/src/views/oa/staff/projectInfo.vue
  34. 0
    1
      oa-ui/src/views/oa/tender/index.vue

+ 15
- 1
oa-ui/src/router/index.js Прегледај датотеку

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-03-25 17:35:52
5
+ * @LastEditTime: 2024-04-26 17:07:38
6
  */
6
  */
7
 /*
7
 /*
8
  * @Author: ysh
8
  * @Author: ysh
231
         name: 'addBudget',
231
         name: 'addBudget',
232
         meta: { title: '新增预算', icon: '' }
232
         meta: { title: '新增预算', icon: '' }
233
 
233
 
234
+      }
235
+    ]
236
+  },
237
+  {
238
+    path: '/applyForm/borrow',
239
+    component: Layout,
240
+    hidden: true,
241
+    children: [
242
+      {
243
+        path: '',
244
+        component: () => import('@/views/flowable/task/todo/applyForm/borrowIndex'),
245
+        name: 'borrow',
246
+        meta: { title: '借款申请', icon: '' }
247
+
234
       }
248
       }
235
     ]
249
     ]
236
   }
250
   }

+ 154
- 8
oa-ui/src/views/flowable/form/borrow/borrowData.vue Прегледај датотеку

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-25 17:17:53
3
  * @Date: 2024-04-25 17:17:53
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-04-25 17:50:04
5
+ * @LastEditTime: 2024-04-26 17:20:15
6
 -->
6
 -->
7
 <template>
7
 <template>
8
-  <div>
9
-
8
+  <div class="mt20">
9
+    <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addBorrowFlow">新增借款</el-button>
10
+    <el-table :data="borrowList" style="width: 100%">
11
+      <el-table-column type="index" label="序号" width="50" />
12
+      <el-table-column label="申请状态" width="100">
13
+        <template slot-scope="scope">
14
+          <el-tag :type="scope.row.lendTime == null ? 'warning' : 'success'">
15
+            {{ scope.row.lendTime == null ? '审批中' : '已完成' }}
16
+          </el-tag>
17
+        </template>
18
+      </el-table-column>
19
+      <el-table-column prop="borrowUsage" label="申请类型" width="100">
20
+        <template slot-scope="scope">
21
+          <el-tag :type="scope.row.borrowUsage === '0' ? 'primary' : 'info'">{{ scope.row.borrowUsage === '0' ?
22
+      '项目借款' : '非项目借款' }}</el-tag>
23
+        </template>
24
+      </el-table-column>
25
+      <el-table-column prop="applyAmount" label="申请金额" />
26
+      <el-table-column prop="managerAmount" label="核准金额" />
27
+      <el-table-column prop="applierUser.nickName" label="申请人" />
28
+      <el-table-column prop="dept.deptName" label="申请部门" width="110" />
29
+      <el-table-column prop="applyDate" label="申请时间" width="110" />
30
+      <el-table-column prop="deptComment" label="部门审核意见" show-overflow-tooltip width="100">
31
+        <template slot-scope="scope">
32
+          {{ scope.deptComment == null ? '待审' : scope.deptComment }}
33
+        </template>
34
+      </el-table-column>
35
+      <el-table-column prop="managerComment" label="分管审核意见" show-overflow-tooltip width="100">
36
+        <template slot-scope="scope">
37
+          {{ scope.managerComment == null ? '待审' : scope.managerComment }}
38
+        </template>
39
+      </el-table-column>
40
+      <el-table-column prop="zjlComment" label="总经理审核意见" show-overflow-tooltip width="120">
41
+        <template slot-scope="scope">
42
+          {{ scope.zjlComment == null ? '待审' : scope.zjlComment }}
43
+        </template>
44
+      </el-table-column>
45
+      <el-table-column prop="deptComment" label="财务经办人" show-overflow-tooltip width="100">
46
+      </el-table-column>
47
+      <el-table-column prop="lendTime" label="支付时间">
48
+      </el-table-column>
49
+      <el-table-column label="操作" fixed="right">
50
+        <template slot-scope="scope">
51
+          <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>
52
+        </template>
53
+      </el-table-column>
54
+    </el-table>
55
+    <el-dialog title="借款明细" :visible.sync="open" append-to-body>
56
+      <el-table :data="detailList" style="width: 100%">
57
+        <el-table-column type="index" label="序号" width="50" />
58
+        <el-table-column prop="borrowItem" label="借款项目" />
59
+        <el-table-column prop="unit" label="单位" />
60
+        <el-table-column prop="price" label="单价" />
61
+        <el-table-column prop="quantity" label="数量" />
62
+        <el-table-column prop="applyAmount" label="金额" />
63
+        <el-table-column prop="xmAmount" label="项目部校核金额" />
64
+        <el-table-column prop="managerAmount" label="分管校核金额" />
65
+      </el-table>
66
+      <el-form inline class="mt20">
67
+        <el-form-item label="申请金额:">
68
+          {{ clickRow.applyAmount }}
69
+        </el-form-item>
70
+        <el-form-item label="校准金额:" style="margin-left:20px;">
71
+          {{ clickRow.managerAmount == null ? 0 : clickRow.managerAmount }}
72
+        </el-form-item>
73
+      </el-form>
74
+    </el-dialog>
10
   </div>
75
   </div>
11
 </template>
76
 </template>
12
 
77
 
13
 <script>
78
 <script>
14
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
79
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
15
 import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
80
 import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
81
+import { listDefinition } from "@/api/flowable/definition";
82
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
83
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
84
+import { todoList } from "@/api/flowable/todo";
85
+import { Snowflake } from '@/utils/snowFlake.js'
16
 export default {
86
 export default {
17
   props: {
87
   props: {
18
     taskForm: {
88
     taskForm: {
20
       required: true
90
       required: true
21
     }
91
     }
22
   },
92
   },
23
-  mounted(){
93
+  data() {
94
+    return {
95
+      borrowList: [],
96
+      detailList: [],
97
+      definitionList: [], //流程列表
98
+      clickRow: {},
99
+      open: false,
100
+    }
101
+  },
102
+  mounted() {
24
     this.getBorrowData()
103
     this.getBorrowData()
104
+    this.listDefinition();
25
   },
105
   },
26
   methods: {
106
   methods: {
27
     getBorrowData() {
107
     getBorrowData() {
28
-      listBorrow({projectId:this.taskForm.formId}).then(res => {
29
-        
30
-        console.log(res);
108
+      listBorrow({ projectId: this.taskForm.formId }).then(res => {
109
+        if (res.code == 200) {
110
+          this.borrowList = res.rows
111
+          console.log(res);
112
+        }
31
       })
113
       })
32
-    }
114
+    },
115
+    getBorrowDetailData(borrowId) {
116
+      getBorrowDetail(borrowId).then(res => {
117
+        if (res.data.length != 0) {
118
+          this.detailList = res.data
119
+          console.log(res);
120
+        }
121
+      });
122
+    },
123
+    handleLook(row) {
124
+      this.open = true
125
+      this.clickRow = row
126
+      this.getBorrowDetailData(row.borrowId);
127
+    },
128
+    addBorrowFlow() {
129
+      let row = this.definitionList[0];
130
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
131
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
132
+        let data = res.data
133
+        const variables = {};
134
+        const formData = {};
135
+        formData.formId = formId
136
+        if (row.id) {
137
+          variables.variables = formData;
138
+          // 启动流程并将表单数据加入流程变量
139
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
140
+            this.$modal.msgSuccess(res.msg);
141
+            let procInstanceId = res.data;
142
+            todoList({
143
+              pageNum: 1,
144
+              pageSize: 99999999,
145
+              processInsId: procInstanceId
146
+            }).then(toDoRes => {
147
+              let records = toDoRes.data.records;
148
+              if (records.length == 1) {
149
+                records = records[0]
150
+              }
151
+              this.$router.push({
152
+                path: '/applyForm/borrow',
153
+                query: {
154
+                  procInsId: records.procInsId,
155
+                  executionId: records.executionId,
156
+                  deployId: records.deployId,
157
+                  taskId: records.taskId,
158
+                  taskName: records.taskName,
159
+                  startUser: records.startUserName + '-' + records.startDeptName,
160
+                  formId: formData.formId,
161
+                  procDefName: records.procDefName
162
+                }
163
+              })
164
+            })
165
+          })
166
+        }
167
+      })
168
+    },
169
+    listDefinition() {
170
+      listDefinition({
171
+        pageNum: 1,
172
+        pageSize: 9999,
173
+        name: '借款审批'
174
+      }).then(response => {
175
+        this.definitionList = response.data.records;
176
+        console.log(this.definitionList);
177
+      });
178
+    },
33
   }
179
   }
34
 }
180
 }
35
 </script>
181
 </script>

+ 0
- 1
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Прегледај датотеку

171
   methods: {
171
   methods: {
172
     initBudgetForm() {
172
     initBudgetForm() {
173
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
173
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
174
-        console.log(res);
175
         this.budgetForm = res.rows[0];
174
         this.budgetForm = res.rows[0];
176
         getBudgetDevice(this.budgetForm.budgetId).then(res => {
175
         getBudgetDevice(this.budgetForm.budgetId).then(res => {
177
           this.chooseDevice = res.data;
176
           this.chooseDevice = res.data;

+ 62
- 12
oa-ui/src/views/flowable/form/projectProcess/addproject.vue Прегледај датотеку

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-27 14:49:15
3
  * @Date: 2024-02-27 14:49:15
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-04-25 14:15:08
5
+ * @LastEditTime: 2024-04-26 16:55:34
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
10
     <!-- 项目登记 -->
10
     <!-- 项目登记 -->
11
     <h2 style="text-align: center">项目登记</h2>
11
     <h2 style="text-align: center">项目登记</h2>
12
     <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
12
     <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
13
-      <el-form-item label="项目编号:" prop="projectNumber">
14
-        <el-input v-model="addForm.projectNumber"></el-input>
15
-      </el-form-item>
16
-      <el-form-item label="项目名称:" prop="projectName">
17
-        <el-input v-model="addForm.projectName"></el-input>
18
-      </el-form-item>
13
+      <el-row :gutter="20">
14
+        <el-col :span="12">
15
+          <el-form-item label="项目编号:" prop="projectNumber">
16
+            <el-input v-model="addForm.projectNumber"></el-input>
17
+          </el-form-item>
18
+        </el-col>
19
+        <el-col :span="12">
20
+          <el-form-item label="合同编码:">
21
+            <el-input v-model="contractCode"></el-input>
22
+          </el-form-item>
23
+        </el-col>
24
+      </el-row>
25
+      <el-row :gutter="20">
26
+        <el-col :span="12"><el-form-item label="项目名称:" prop="projectName">
27
+            <el-input v-model="addForm.projectName"></el-input>
28
+          </el-form-item>
29
+        </el-col>
30
+        <el-col :span="12">
31
+          <el-form-item label="合同编号:">
32
+            <el-input v-model="contractNumber"></el-input>
33
+          </el-form-item>
34
+        </el-col>
35
+      </el-row>
36
+
19
       <el-form-item label="项目类型:" prop="projectType">
37
       <el-form-item label="项目类型:" prop="projectType">
20
         <el-input v-model="addForm.projectType"></el-input>
38
         <el-input v-model="addForm.projectType"></el-input>
21
       </el-form-item>
39
       </el-form-item>
72
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
90
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
73
             </td>
91
             </td>
74
             <td>
92
             <td>
75
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
93
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle
94
+                @click="deletWorkItem(index)"></el-button>
76
             </td>
95
             </td>
77
           </tr>
96
           </tr>
78
         </table>
97
         </table>
85
       <el-row>
104
       <el-row>
86
         <el-col :span="6" :xs="24" :offset="12">
105
         <el-col :span="6" :xs="24" :offset="12">
87
           <el-form-item label="项目登记人:" prop="registrantUser">
106
           <el-form-item label="项目登记人:" prop="registrantUser">
88
-            <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName : registrantUser }} </span>
107
+            <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName :
108
+      registrantUser }} </span>
89
           </el-form-item>
109
           </el-form-item>
90
         </el-col>
110
         </el-col>
91
         <el-col :span="6">
111
         <el-col :span="6">
110
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
130
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
111
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
131
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
112
 import { getProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
132
 import { getProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
133
+import { listProjectContract, addProjectContract, get } from "@/api/oa/contract/projectContract";
134
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
113
 export default {
135
 export default {
114
   props: {
136
   props: {
115
     disabled: {
137
     disabled: {
144
         registerTime: undefined,
166
         registerTime: undefined,
145
         projectRegistrant: "",
167
         projectRegistrant: "",
146
       },
168
       },
169
+      contractCode: "",
170
+      contractNumber: "",
147
       rules: {
171
       rules: {
148
         projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
172
         projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
149
         projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
173
         projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
159
         },
183
         },
160
       ],
184
       ],
161
       restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司勘测设计分公司" }],
185
       restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司勘测设计分公司" }],
162
-      registrantUser:''
186
+      registrantUser: ''
163
     };
187
     };
164
   },
188
   },
165
   created() {
189
   created() {
171
       this.addForm.projectRegistrant = this.userId;
195
       this.addForm.projectRegistrant = this.userId;
172
       this.registrantUser = this.name;
196
       this.registrantUser = this.name;
173
     }
197
     }
198
+
199
+    this.getContractDataList();
174
     // this.getList();
200
     // this.getList();
175
   },
201
   },
176
-  mounted() { },
202
+  mounted() {
203
+  },
177
   methods: {
204
   methods: {
178
     // 查询项目列表
205
     // 查询项目列表
179
     getList() {
206
     getList() {
202
         this.workList = res.data;
229
         this.workList = res.data;
203
       })
230
       })
204
     },
231
     },
232
+    getContractDataList() {
233
+      listProjectContract({ projectId: this.taskForm.formId }).then(res => {
234
+        if (res.rows) {
235
+          for (let row of res.rows) {
236
+            getContract(row.contractId).then(res => {
237
+              if (res.data) {
238
+                if (this.contractCode != '') {
239
+                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
240
+                } else {
241
+                  this.contractCode = res.data.contractCode;
242
+                }
243
+                if (this.contractNumber != '') {
244
+                  this.contractNumber = this.contractNumber + '、' + res.data.contractNumber;
245
+                } else {
246
+                  this.contractNumber = res.data.contractNumber;
247
+                }
248
+                console.log(res);
249
+              }
250
+            })
251
+          }
252
+        }
253
+      })
254
+    },
205
     confirmAddForm() {
255
     confirmAddForm() {
206
       this.addForm.projectId = this.taskForm.formId;
256
       this.addForm.projectId = this.taskForm.formId;
207
-      console.log(this.addForm);
208
       for (let work of this.workList) {
257
       for (let work of this.workList) {
209
         work.projectId = this.taskForm.formId;
258
         work.projectId = this.taskForm.formId;
210
         addProjectWork(work);
259
         addProjectWork(work);
267
 
316
 
268
 <style lang="scss" scoped>
317
 <style lang="scss" scoped>
269
 @import "@/assets/styles/element-reset.scss";
318
 @import "@/assets/styles/element-reset.scss";
319
+
270
 .project-wrapper {
320
 .project-wrapper {
271
   padding: 25px;
321
   padding: 25px;
272
 }
322
 }

+ 7
- 7
oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue Прегледај датотеку

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-03-19 09:24:06
3
  * @Date: 2024-03-19 09:24:06
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-04-24 10:09:13
5
+ * @LastEditTime: 2024-04-26 16:58:04
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
9
     <h2 style="text-align: center;">项目安排</h2>
9
     <h2 style="text-align: center;">项目安排</h2>
10
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
10
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
11
-      <el-row>
11
+      <el-row :gutter="20">
12
         <el-col :span="12" :xs="24">
12
         <el-col :span="12" :xs="24">
13
           <el-form-item label="承担部门:" prop="undertakingDept">
13
           <el-form-item label="承担部门:" prop="undertakingDept">
14
             <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
14
             <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
19
           </el-form-item>
19
           </el-form-item>
20
         </el-col>
20
         </el-col>
21
         <el-col :span="12" :xs="24">
21
         <el-col :span="12" :xs="24">
22
-          <el-form-item label="部门负责人" prop="deptLeader">
22
+          <el-form-item label="部门负责人" prop="deptLeader">
23
             <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
23
             <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
24
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
24
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
25
               </el-option>
25
               </el-option>
27
           </el-form-item>
27
           </el-form-item>
28
         </el-col>
28
         </el-col>
29
       </el-row>
29
       </el-row>
30
-      <el-row>
30
+      <el-row :gutter="20">
31
         <el-col :span="12" :xs="24">
31
         <el-col :span="12" :xs="24">
32
-          <el-form-item label="项目负责人" prop="projectLeader">
32
+          <el-form-item label="项目负责人" prop="projectLeader">
33
             <el-tag effect="plain" type="warning" style="margin-right: 10px;"
33
             <el-tag effect="plain" type="warning" style="margin-right: 10px;"
34
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
34
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
35
                 form.projectLeaderName }}</el-tag>
35
                 form.projectLeaderName }}</el-tag>
37
           </el-form-item>
37
           </el-form-item>
38
         </el-col>
38
         </el-col>
39
         <el-col :span="12" :xs="24">
39
         <el-col :span="12" :xs="24">
40
-          <el-form-item label="现场负责人" prop="siteLeader">
41
-            <el-select v-model="form.siteLeader" filterable clearable style="width:400px">
40
+          <el-form-item label="现场负责人" prop="siteLeader">
41
+            <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
42
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
42
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
43
                 v-if="item.nickName != 'admin'">
43
                 v-if="item.nickName != 'admin'">
44
               </el-option>
44
               </el-option>

+ 0
- 3
oa-ui/src/views/flowable/form/projectProcess/budgetTab.vue Прегледај датотеку

55
     initBudget() {
55
     initBudget() {
56
       let projectId = this.taskForm.formId;
56
       let projectId = this.taskForm.formId;
57
       listBudget({ projectId }).then(res => {
57
       listBudget({ projectId }).then(res => {
58
-        console.log(res);
59
         if (res.total != 0) {
58
         if (res.total != 0) {
60
           this.haveBudget = true;
59
           this.haveBudget = true;
61
           this.budgetId = res.rows[0].budgetId;
60
           this.budgetId = res.rows[0].budgetId;
64
               this.workList = res.data;
63
               this.workList = res.data;
65
             }
64
             }
66
             getBudgetSettle(this.budgetId).then(res => {
65
             getBudgetSettle(this.budgetId).then(res => {
67
-
68
-              console.log(res);
69
             });
66
             });
70
           });
67
           });
71
         }
68
         }

+ 0
- 2
oa-ui/src/views/flowable/form/projectProcess/inProgress.vue Прегледај датотеку

265
     },
265
     },
266
     // 暂存数据
266
     // 暂存数据
267
     preserve() {
267
     preserve() {
268
-      console.log(this.oldProgressList);
269
       if (this.oldProgressList.length != 0) {
268
       if (this.oldProgressList.length != 0) {
270
         delProjectProgress([this.taskForm.formId]).then(res => {
269
         delProjectProgress([this.taskForm.formId]).then(res => {
271
-          console.log(res);
272
           for (let progress of this.progressList) {
270
           for (let progress of this.progressList) {
273
             progress.projectId = this.taskForm.formId;
271
             progress.projectId = this.taskForm.formId;
274
             addProjectProgress(progress);
272
             addProjectProgress(progress);

+ 0
- 2
oa-ui/src/views/flowable/form/projectProcess/index.vue Прегледај датотеку

128
     if(this.taskName !='' && this.taskName != undefined &&this.taskName != null){
128
     if(this.taskName !='' && this.taskName != undefined &&this.taskName != null){
129
       this.activeName = this.taskName;
129
       this.activeName = this.taskName;
130
     }
130
     }
131
-    console.log(this.taskName);
132
     this.getList();
131
     this.getList();
133
     this.getDeptList();
132
     this.getDeptList();
134
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
133
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
192
     handleChangeDept(deptId) {
191
     handleChangeDept(deptId) {
193
       this.peopleForm.userId = '';
192
       this.peopleForm.userId = '';
194
       listUser({ pageSize: 999999, deptId }).then(res => {
193
       listUser({ pageSize: 999999, deptId }).then(res => {
195
-        console.log(res);
196
         this.peopleForm.userList = res.rows
194
         this.peopleForm.userList = res.rows
197
       })
195
       })
198
     },
196
     },

+ 0
- 1
oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue Прегледај датотеку

155
     /** 查询cmc技术交底列表 */
155
     /** 查询cmc技术交底列表 */
156
     initForm() {
156
     initForm() {
157
       getTechnical(this.taskForm.formId).then((res) => {
157
       getTechnical(this.taskForm.formId).then((res) => {
158
-        console.log(res);
159
         if (res.data) {
158
         if (res.data) {
160
           this.haveTechnical = true;
159
           this.haveTechnical = true;
161
           this.form = res.data;
160
           this.form = res.data;

+ 0
- 1
oa-ui/src/views/flowable/form/scTable.vue Прегледај датотеку

1767
         const params = { taskId: this.taskForm.taskId }
1767
         const params = { taskId: this.taskForm.taskId }
1768
         getNextFlowNode(params).then(res => {
1768
         getNextFlowNode(params).then(res => {
1769
           if (this.taskName == '员工填报') {
1769
           if (this.taskName == '员工填报') {
1770
-            console.log(this.tableForm);
1771
             getProject(this.tableForm.projectId).then(res => {
1770
             getProject(this.tableForm.projectId).then(res => {
1772
               if (res.data)
1771
               if (res.data)
1773
                 this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
1772
                 this.$set(this.taskForm.variables, "approval", res.data.projectLeader);

+ 0
- 1
oa-ui/src/views/flowable/form/zhTable.vue Прегледај датотеку

838
           }
838
           }
839
         }
839
         }
840
         this.tableForm = data;
840
         this.tableForm = data;
841
-        console.log(this.tableForm);
842
       })
841
       })
843
     },
842
     },
844
     formatForm() {
843
     formatForm() {

+ 0
- 1
oa-ui/src/views/flowable/task/finished/index.vue Прегледај датотеку

174
     },
174
     },
175
     /** 流程流转记录 */
175
     /** 流程流转记录 */
176
     handleFlowRecord(row) {
176
     handleFlowRecord(row) {
177
-      console.log(row);
178
       getProcessVariables(row.taskId).then(res => {
177
       getProcessVariables(row.taskId).then(res => {
179
         this.$router.push({
178
         this.$router.push({
180
           path: '/flowable/task/finished/detail/index',
179
           path: '/flowable/task/finished/detail/index',

+ 0
- 1
oa-ui/src/views/flowable/task/form/index.vue Прегледај датотеку

234
     },
234
     },
235
     /** 表单配置信息 */
235
     /** 表单配置信息 */
236
     handleDetail(row){
236
     handleDetail(row){
237
-      console.log(row);
238
       if(row.formId == 3172){
237
       if(row.formId == 3172){
239
         this.moreFormOpen = true;
238
         this.moreFormOpen = true;
240
         this.formTitle = "自定义表单";
239
         this.formTitle = "自定义表单";

+ 0
- 2
oa-ui/src/views/flowable/task/myProcess/index.vue Прегледај датотеку

381
     // 表单信息
381
     // 表单信息
382
     handleFlowNote(row) {
382
     handleFlowNote(row) {
383
       getProcessVariables(row.taskId).then(res => {
383
       getProcessVariables(row.taskId).then(res => {
384
-        console.log(res);
385
         if (res.data) {
384
         if (res.data) {
386
           this.passingParam = row
385
           this.passingParam = row
387
           this.passingParam.formId = res.data.formId
386
           this.passingParam.formId = res.data.formId
435
     },
434
     },
436
     // 子流程不可以删除
435
     // 子流程不可以删除
437
     beDeleted(row) {
436
     beDeleted(row) {
438
-      console.log(row);
439
       if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
437
       if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
440
         return true
438
         return true
441
       } else {
439
       } else {

+ 0
- 2
oa-ui/src/views/flowable/task/myProcess/progressTree.vue Прегледај датотеку

42
   },
42
   },
43
   watch: {
43
   watch: {
44
     definitionList(newval, oldval) {
44
     definitionList(newval, oldval) {
45
-      console.log(newval);
46
       this.initTree();
45
       this.initTree();
47
     },
46
     },
48
   },
47
   },
92
       }
91
       }
93
     },
92
     },
94
     handleNodeClick(data) {
93
     handleNodeClick(data) {
95
-      console.log(data);
96
       this.clickNode = data
94
       this.clickNode = data
97
     },
95
     },
98
     confirm(){
96
     confirm(){

+ 0
- 1
oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue Прегледај датотеку

103
       const params = { procInsId: this.rows.procInsId, deployId: this.rows.deployId }
103
       const params = { procInsId: this.rows.procInsId, deployId: this.rows.deployId }
104
       flowRecord(params).then(res => {
104
       flowRecord(params).then(res => {
105
         that.flowRecordList = res.data.flowList;
105
         that.flowRecordList = res.data.flowList;
106
-        console.log(that.flowRecordList);
107
         this.loading = false
106
         this.loading = false
108
       }).catch(res => {
107
       }).catch(res => {
109
 
108
 

+ 23
- 0
oa-ui/src/views/flowable/task/todo/applyForm/borrowIndex.vue Прегледај датотеку

1
+<!--
2
+ * @Author: ysh
3
+ * @Date: 2024-04-26 17:01:15
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-04-26 17:12:03
6
+-->
7
+<template>
8
+  <div class="app-container">
9
+    <nav-header></nav-header>
10
+  </div>
11
+</template>
12
+
13
+<script>
14
+import navHeader from './components/header.vue'
15
+export default {
16
+  components: {
17
+    navHeader
18
+  },
19
+  
20
+}
21
+</script>
22
+
23
+<style lang="scss" scoped></style>

+ 90
- 0
oa-ui/src/views/flowable/task/todo/applyForm/components/header.vue Прегледај датотеку

1
+<template>
2
+  <div slot="header" class="clearfix">
3
+    <span class="el-icon-document">任务标题:{{ this.$route.meta.title }}</span>
4
+    <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
5
+    <el-tag>任务节点:{{ taskName }}</el-tag>
6
+  </div>
7
+</template>
8
+
9
+<script>
10
+import { flowRecord } from "@/api/flowable/finished";
11
+import { getProcessVariables, flowXmlAndNode, definitionStart } from "@/api/flowable/definition";
12
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
13
+export default {
14
+  props: {
15
+
16
+  },
17
+  data() {
18
+    return {
19
+      taskForm: {
20
+        returnTaskShow: false, // 是否展示回退表单
21
+        delegateTaskShow: false, // 是否展示回退表单
22
+        defaultTaskShow: true, // 默认处理
23
+        comment: "", // 意见内容
24
+        procInsId: "", // 流程实例编号
25
+        instanceId: "", // 流程实例编号
26
+        deployId: "",  // 流程定义编号
27
+        taskId: "",// 流程任务编号
28
+        procDefId: "",  // 流程编号
29
+        targetKey: "",
30
+        variables: {
31
+          variables: {}
32
+        },
33
+      },
34
+      startUser: null, // 发起人信息,
35
+      taskName: null, // 任务节点
36
+      flowRecordList:[]
37
+    }
38
+  },
39
+  created() {
40
+    if (this.$route.query) {
41
+      this.taskName = this.$route.query.taskName;
42
+      this.startUser = this.$route.query.startUser;
43
+      this.taskForm.deployId = this.$route.query.deployId;
44
+      this.taskForm.taskId = this.$route.query.taskId;
45
+      this.taskForm.procInsId = this.$route.query.procInsId;
46
+      this.taskForm.executionId = this.$route.query.executionId;
47
+      this.taskForm.instanceId = this.$route.query.procInsId;
48
+      this.taskForm.formId = this.$route.query.formId;
49
+      this.taskForm.procDefName = this.$route.query.procDefName;
50
+      // 流程任务获取变量信息
51
+      if (this.taskForm.taskId) {
52
+        this.processVariables(this.taskForm.taskId)
53
+        this.getFlowTaskForm(this.taskForm.taskId)
54
+      }
55
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
56
+    }
57
+  },
58
+  methods: {
59
+    /** 获取流程变量内容 */
60
+    processVariables(taskId) {
61
+      if (taskId) {
62
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
63
+        getProcessVariables(taskId).then(res => {
64
+        });
65
+      }
66
+    },
67
+    /** 流程节点表单 */
68
+    getFlowTaskForm(taskId) {
69
+      if (taskId) {
70
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
71
+        flowTaskForm({ taskId: taskId }).then(res => {
72
+          this.taskForm.variables = res.data.formData;
73
+        });
74
+      }
75
+    },
76
+    /** 流程流转记录 */
77
+    getFlowRecordList(procInsId, deployId) {
78
+      const that = this
79
+      const params = { procInsId: procInsId, deployId: deployId }
80
+      flowRecord(params).then(res => {
81
+        that.flowRecordList = res.data.flowList;
82
+      }).catch(res => {
83
+        this.goBack();
84
+      })
85
+    },
86
+  }
87
+}
88
+</script>
89
+
90
+<style lang="scss" scoped></style>

+ 6
- 0
oa-ui/src/views/flowable/task/todo/detail/index.vue Прегледај датотеку

1
+<!--
2
+ * @Author: ysh
3
+ * @Date: 2024-01-03 09:23:11
4
+ * @LastEditors: 
5
+ * @LastEditTime: 2024-04-26 15:14:20
6
+-->
1
 <template>
7
 <template>
2
   <div class="app-container">
8
   <div class="app-container">
3
     <el-card class="box-card">
9
     <el-card class="box-card">

+ 0
- 1
oa-ui/src/views/oa/budget/addBudget.vue Прегледај датотеку

508
         this.activeStep += 1;
508
         this.activeStep += 1;
509
         this.calculateThatCost();
509
         this.calculateThatCost();
510
       } else if (this.activeStep == 3) {
510
       } else if (this.activeStep == 3) {
511
-        console.log(this.budgetForm);
512
         this.addBudgetForm(this.budgetForm);
511
         this.addBudgetForm(this.budgetForm);
513
         this.activeStep += 1;
512
         this.activeStep += 1;
514
       } else {
513
       } else {

+ 0
- 1
oa-ui/src/views/oa/budget/components/budgetForm.vue Прегледај датотеку

157
   methods: {
157
   methods: {
158
     initBudgetForm() {
158
     initBudgetForm() {
159
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.projectId }).then(res => {
159
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.projectId }).then(res => {
160
-        console.log(res);
161
         this.budgetForm = res.rows[0];
160
         this.budgetForm = res.rows[0];
162
       });
161
       });
163
       list
162
       list

+ 0
- 1
oa-ui/src/views/oa/budget/components/budgetTable.vue Прегледај датотеку

136
     }
136
     }
137
   },
137
   },
138
   created() {
138
   created() {
139
-    console.log(this.budgetForm);
140
     this.userLen = this.budgetForm.chooseUser.length + 1;
139
     this.userLen = this.budgetForm.chooseUser.length + 1;
141
     this.carLen = this.budgetForm.chooseCar.length + 1;
140
     this.carLen = this.budgetForm.chooseCar.length + 1;
142
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;
141
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;

+ 0
- 1
oa-ui/src/views/oa/budget/components/chooseDevice.vue Прегледај датотеку

79
     },
79
     },
80
     getNameList(){
80
     getNameList(){
81
       listDeviceName().then(res=>{
81
       listDeviceName().then(res=>{
82
-        console.log(res);
83
         this.nameList = res.data
82
         this.nameList = res.data
84
       })
83
       })
85
     },
84
     },

+ 0
- 1
oa-ui/src/views/oa/budget/components/chooseMoney.vue Прегледај датотеку

205
   },
205
   },
206
   mounted() {
206
   mounted() {
207
     this.getSettleSum();
207
     this.getSettleSum();
208
-    console.log(this.budgetForm)
209
 
208
 
210
   },
209
   },
211
   methods: {
210
   methods: {

+ 0
- 2
oa-ui/src/views/oa/budget/index.vue Прегледај датотеку

281
       this.loading = true;
281
       this.loading = true;
282
       listBudget(this.queryParams).then(response => {
282
       listBudget(this.queryParams).then(response => {
283
         this.budgetList = response.rows;
283
         this.budgetList = response.rows;
284
-        console.log(this.budgetList);
285
         this.total = response.total;
284
         this.total = response.total;
286
         this.loading = false;
285
         this.loading = false;
287
       });
286
       });
357
     // 详情按钮
356
     // 详情按钮
358
     handleDetails(row) {
357
     handleDetails(row) {
359
       this.detailsOpen = true;
358
       this.detailsOpen = true;
360
-      console.log(row);
361
       this.title = row.project.projectNumber + "预算详情";
359
       this.title = row.project.projectNumber + "预算详情";
362
     },
360
     },
363
     /** 提交按钮 */
361
     /** 提交按钮 */

+ 0
- 2
oa-ui/src/views/oa/car/expense.vue Прегледај датотеку

212
   created() {
212
   created() {
213
     if (this.$route.query) {
213
     if (this.$route.query) {
214
       getCar(this.$route.query.carId).then(res => {
214
       getCar(this.$route.query.carId).then(res => {
215
-        console.log(res);
216
         this.carInfo = res.data;
215
         this.carInfo = res.data;
217
       })
216
       })
218
       this.getList();
217
       this.getList();
227
     getList() {
226
     getList() {
228
       this.queryParams.carId = this.$route.query.carId
227
       this.queryParams.carId = this.$route.query.carId
229
       listCarExpense(this.queryParams).then(res => {
228
       listCarExpense(this.queryParams).then(res => {
230
-        console.log(res);
231
         this.expenseList = res.rows;
229
         this.expenseList = res.rows;
232
         this.total = res.total;
230
         this.total = res.total;
233
       })
231
       })

+ 0
- 1
oa-ui/src/views/oa/car/index.vue Прегледај датотеку

250
     },
250
     },
251
     // 新增明细按钮
251
     // 新增明细按钮
252
     handleAddDetail(row) {
252
     handleAddDetail(row) {
253
-      console.log(row);
254
       this.$router.push({
253
       this.$router.push({
255
         path: '/car/expense',
254
         path: '/car/expense',
256
         query: {
255
         query: {

+ 0
- 2
oa-ui/src/views/oa/device/approval.vue Прегледај датотеку

274
   created() {
274
   created() {
275
     if (this.$route.query) {
275
     if (this.$route.query) {
276
       getDevice(this.$route.query.deviceId).then(res => {
276
       getDevice(this.$route.query.deviceId).then(res => {
277
-        console.log(res);
278
         this.deviceInfo = res.data;
277
         this.deviceInfo = res.data;
279
       })
278
       })
280
       this.getList();
279
       this.getList();
289
     getList() {
288
     getList() {
290
       this.queryParams.devices = this.$route.query.deviceId
289
       this.queryParams.devices = this.$route.query.deviceId
291
       listDeviceApproval(this.queryParams).then(res => {
290
       listDeviceApproval(this.queryParams).then(res => {
292
-        console.log(res);
293
         this.approvalList = res.rows;
291
         this.approvalList = res.rows;
294
         this.total = res.total;
292
         this.total = res.total;
295
       })
293
       })

+ 0
- 1
oa-ui/src/views/oa/device/index.vue Прегледај датотеку

281
     },
281
     },
282
     // 新增明细按钮
282
     // 新增明细按钮
283
     handleAddDetail(row) {
283
     handleAddDetail(row) {
284
-      console.log(row);
285
       this.$router.push({
284
       this.$router.push({
286
         path: '/device/approval',
285
         path: '/device/approval',
287
         query: {
286
         query: {

+ 0
- 2
oa-ui/src/views/oa/project/index.vue Прегледај датотеку

313
       let formData = new FormData();
313
       let formData = new FormData();
314
       let form = JSON.stringify(this.addForm);
314
       let form = JSON.stringify(this.addForm);
315
       formData.append("form", form);
315
       formData.append("form", form);
316
-      console.log(this.title);
317
       if (this.title == '新增项目')
316
       if (this.title == '新增项目')
318
         submitProject(formData).then(response => {
317
         submitProject(formData).then(response => {
319
           this.$modal.msgSuccess("新增成功");
318
           this.$modal.msgSuccess("新增成功");
335
     handleChangeDept(deptId) {
334
     handleChangeDept(deptId) {
336
       this.peopleForm.userId = '';
335
       this.peopleForm.userId = '';
337
       listUser({ pageSize: 999999, deptId }).then(res => {
336
       listUser({ pageSize: 999999, deptId }).then(res => {
338
-        console.log(res);
339
         this.peopleForm.userList = res.rows
337
         this.peopleForm.userList = res.rows
340
       })
338
       })
341
     },
339
     },

+ 0
- 2
oa-ui/src/views/oa/staff/index.vue Прегледај датотеку

520
     },
520
     },
521
     // 查看人员详情按钮
521
     // 查看人员详情按钮
522
     handleView(row) {
522
     handleView(row) {
523
-      console.log(row);
524
       this.formatLevel(row.postLevel, row.salaryLevel, this.dict.type.sys_user_postlevel, this.dict.type.sys_user_salarylevel);
523
       this.formatLevel(row.postLevel, row.salaryLevel, this.dict.type.sys_user_postlevel, this.dict.type.sys_user_salarylevel);
525
       this.formatCrtificates(this.dict.type.sys_user_certificates, row.certificates)
524
       this.formatCrtificates(this.dict.type.sys_user_certificates, row.certificates)
526
       this.$router.push({
525
       this.$router.push({
654
       if (val != null && val != undefined && val != "") {
653
       if (val != null && val != undefined && val != "") {
655
         let valArr = val.split(',');
654
         let valArr = val.split(',');
656
         let outCrtificates = []
655
         let outCrtificates = []
657
-        console.log(valArr);
658
         for (let i of valArr) {
656
         for (let i of valArr) {
659
           outCrtificates.push(arr[i].label)
657
           outCrtificates.push(arr[i].label)
660
         }
658
         }

+ 0
- 1
oa-ui/src/views/oa/staff/info.vue Прегледај датотеку

122
   methods: {
122
   methods: {
123
     getUserInfo(id) {
123
     getUserInfo(id) {
124
       getUser(id).then(res => {
124
       getUser(id).then(res => {
125
-        console.log(res);
126
         this.postOptions = res.posts;
125
         this.postOptions = res.posts;
127
         if (res.data) {
126
         if (res.data) {
128
           this.form = res.data;
127
           this.form = res.data;

+ 0
- 3
oa-ui/src/views/oa/staff/projectInfo.vue Прегледај датотеку

72
   },
72
   },
73
   methods: {
73
   methods: {
74
     handleChange(val) {
74
     handleChange(val) {
75
-      console.log(val);
76
     },
75
     },
77
     getListByProjectLeader() {
76
     getListByProjectLeader() {
78
-      console.log(this.$route.query.userId);
79
       let projectLeader = this.$route.query.userId;
77
       let projectLeader = this.$route.query.userId;
80
       getListByProjectLeader({ projectLeader: projectLeader }).then(res => {
78
       getListByProjectLeader({ projectLeader: projectLeader }).then(res => {
81
         this.tableData = res.data
79
         this.tableData = res.data
82
-        console.log(this.tableData);
83
       });
80
       });
84
     }
81
     }
85
   }
82
   }

+ 0
- 1
oa-ui/src/views/oa/tender/index.vue Прегледај датотеку

450
   },
450
   },
451
   created() {
451
   created() {
452
     this.getList();
452
     this.getList();
453
-    console.log(this.$store.state.app.device);
454
     if (this.$store.state.app.device == 'mobile') {
453
     if (this.$store.state.app.device == 'mobile') {
455
       this.dialogProperty.column = 1
454
       this.dialogProperty.column = 1
456
       this.dialogProperty.dialogWidth = '90%'
455
       this.dialogProperty.dialogWidth = '90%'

Loading…
Откажи
Сачувај