Просмотр исходного кода

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

qyx 3 месяцев назад
Родитель
Сommit
5432c24877

+ 2
- 1
oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue Просмотреть файл

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

+ 2
- 1
oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue Просмотреть файл

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

+ 2
- 2
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Просмотреть файл

398
     }
398
     }
399
   },
399
   },
400
   watch: {
400
   watch: {
401
-    'taskForm.formId'() {
401
+    'taskForm.procInsId'() {
402
       this.initBudgetForm();
402
       this.initBudgetForm();
403
     }
403
     }
404
   },
404
   },
435
   methods: {
435
   methods: {
436
     initBudgetForm() {
436
     initBudgetForm() {
437
       this.loading = true;
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
         this.budgetForm = res.rows[0];
439
         this.budgetForm = res.rows[0];
440
         this.setSignName();
440
         this.setSignName();
441
         if (this.budgetForm) {
441
         if (this.budgetForm) {

+ 6
- 1
oa-ui/src/views/oa/budget/index.vue Просмотреть файл

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

+ 4
- 2
oa-ui/src/views/oa/check/index.vue Просмотреть файл

116
       rules: {
116
       rules: {
117
       },
117
       },
118
       taskForm: {
118
       taskForm: {
119
-        formId: ''
119
+        formId: '',
120
+        budgetId:''
120
       },
121
       },
121
       queryType: '1',
122
       queryType: '1',
122
       projectList: [],
123
       projectList: [],
192
       this.open = true;
193
       this.open = true;
193
       this.title = "查看cmc项目核算";
194
       this.title = "查看cmc项目核算";
194
       this.form = row;
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
     resetQuery() {
200
     resetQuery() {

Загрузка…
Отмена
Сохранить