Explorar el Código

修改通过侧边栏查询预算和核算

qyx hace 2 meses
padre
commit
5432c24877

+ 2
- 1
oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue Ver fichero

@@ -409,9 +409,10 @@ export default {
409 409
     }
410 410
   },
411 411
   watch: {
412
-    'taskForm.formId'() {
412
+    'taskForm.budgetId'() {
413 413
       getCheck(this.taskForm.formId).then(res => {
414 414
         this.row.projectId = res.data.projectId;
415
+        this.row.budgetId = res.data.budgetId;
415 416
         this.initBudgetForm();
416 417
         this.initCheckForm();
417 418
         this.getContractInfo();

+ 2
- 1
oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue Ver fichero

@@ -528,7 +528,7 @@ export default {
528 528
     }
529 529
   },
530 530
   watch: {
531
-    'taskForm.formId'() {
531
+    'taskForm.procInsId'() {
532 532
       this.initBudgetForm();
533 533
       this.getProjectWorkList();
534 534
       this.getContractInfo();
@@ -565,6 +565,7 @@ export default {
565 565
     initBudgetForm() {
566 566
       this.loading = true;
567 567
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId, procInstId:this.taskForm.procInsId }).then(async res => {
568
+        
568 569
         this.budgetForm = res.rows[0];
569 570
         if (this.budgetForm) {
570 571
           this.budgetForm.outExpense = Number(this.budgetForm.outExpense).toFixed(2);

+ 2
- 2
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Ver fichero

@@ -398,7 +398,7 @@ export default {
398 398
     }
399 399
   },
400 400
   watch: {
401
-    'taskForm.formId'() {
401
+    'taskForm.procInsId'() {
402 402
       this.initBudgetForm();
403 403
     }
404 404
   },
@@ -435,7 +435,7 @@ export default {
435 435
   methods: {
436 436
     initBudgetForm() {
437 437
       this.loading = true;
438
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
438
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId, procInstId:this.taskForm.procInsId }).then(res => {
439 439
         this.budgetForm = res.rows[0];
440 440
         this.setSignName();
441 441
         if (this.budgetForm) {

+ 6
- 1
oa-ui/src/views/oa/budget/index.vue Ver fichero

@@ -157,7 +157,9 @@ export default {
157 157
       rules: {
158 158
       },
159 159
       taskForm: {
160
-        formId: ''
160
+        formId: '',
161
+        procInsId:'',
162
+        budgetId:'',
161 163
       },
162 164
       projectList: [],
163 165
       queryType: '1',
@@ -281,10 +283,12 @@ export default {
281 283
     async handleView(row) {
282 284
       this.clickRow = row;
283 285
       this.taskForm.formId = row.projectId;
286
+      this.taskForm.procInsId = row.procInstId;
284 287
       this.infoOpen = true;
285 288
     },
286 289
     handleNewView(row) {
287 290
       this.taskForm.formId = row.projectId;
291
+      this.taskForm.procInsId = row.procInstId;
288 292
       this.clickRow = row;
289 293
       this.newInfoOpen = true;
290 294
     },
@@ -294,6 +298,7 @@ export default {
294 298
         this.taskForm.formId = res.rows[0].checkId;
295 299
       }
296 300
       this.clickRow = row;
301
+      this.taskForm.budgetId = row.budgetId;
297 302
       this.adjustOpen = true;
298 303
     },
299 304
     /** 修改按钮操作 */

+ 4
- 2
oa-ui/src/views/oa/check/index.vue Ver fichero

@@ -116,7 +116,8 @@ export default {
116 116
       rules: {
117 117
       },
118 118
       taskForm: {
119
-        formId: ''
119
+        formId: '',
120
+        budgetId:''
120 121
       },
121 122
       queryType: '1',
122 123
       projectList: [],
@@ -192,7 +193,8 @@ export default {
192 193
       this.open = true;
193 194
       this.title = "查看cmc项目核算";
194 195
       this.form = row;
195
-      this.$set(this.taskForm, 'formId', row.checkId)
196
+      this.$set(this.taskForm, 'formId', row.checkId);
197
+      this.$set(this.taskForm, 'budgetId', row.budgetId);
196 198
     },
197 199
     /** 重置按钮操作 */
198 200
     resetQuery() {

Loading…
Cancelar
Guardar