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

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -409,9 +409,10 @@ export default {
     }
   },
   watch: {
-    'taskForm.formId'() {
+    'taskForm.budgetId'() {
       getCheck(this.taskForm.formId).then(res => {
         this.row.projectId = res.data.projectId;
+        this.row.budgetId = res.data.budgetId;
         this.initBudgetForm();
         this.initCheckForm();
         this.getContractInfo();

oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue

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

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -398,7 +398,7 @@ export default {
     }
   },
   watch: {
-    'taskForm.formId'() {
+    'taskForm.procInsId'() {
       this.initBudgetForm();
     }
   },
@@ -435,7 +435,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId, procInstId:this.taskForm.procInsId }).then(res => {
         this.budgetForm = res.rows[0];
         this.setSignName();
         if (this.budgetForm) {

oa-ui/src/views/oa/budget/index.vue

@@ -157,7 +157,9 @@ export default {
       rules: {
       },
       taskForm: {
-        formId: ''
+        formId: '',
+        procInsId:'',
+        budgetId:'',
       },
       projectList: [],
       queryType: '1',
@@ -281,10 +283,12 @@ export default {
     async handleView(row) {
       this.clickRow = row;
       this.taskForm.formId = row.projectId;
+      this.taskForm.procInsId = row.procInstId;
       this.infoOpen = true;
     },
     handleNewView(row) {
       this.taskForm.formId = row.projectId;
+      this.taskForm.procInsId = row.procInstId;
       this.clickRow = row;
       this.newInfoOpen = true;
     },
@@ -294,6 +298,7 @@ export default {
         this.taskForm.formId = res.rows[0].checkId;
       }
       this.clickRow = row;
+      this.taskForm.budgetId = row.budgetId;
       this.adjustOpen = true;
     },
     /** 修改按钮操作 */

oa-ui/src/views/oa/check/index.vue

@@ -116,7 +116,8 @@ export default {
       rules: {
       },
       taskForm: {
-        formId: ''
+        formId: '',
+        budgetId:''
       },
       queryType: '1',
       projectList: [],
@@ -192,7 +193,8 @@ export default {
       this.open = true;
       this.title = "查看cmc项目核算";
       this.form = row;
-      this.$set(this.taskForm, 'formId', row.checkId)
+      this.$set(this.taskForm, 'formId', row.checkId);
+      this.$set(this.taskForm, 'budgetId', row.budgetId);
     },
     /** 重置按钮操作 */
     resetQuery() {