导出核算数据，同一项目多个预算和核算的新增和查询

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetOtherController.java

@@ -33,7 +33,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2025-05-09
  */
 @RestController
-@RequestMapping("/oa/other")
+@RequestMapping("/oa/budgetOther")
 public class CmcBudgetOtherController extends BaseController
 {
     @Autowired

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSiteController.java

@@ -27,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2025-05-09
  */
 @RestController
-@RequestMapping("/oa/site")
+@RequestMapping("/oa/budgetSite")
 public class CmcBudgetSiteController extends BaseController
 {
     @Autowired

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml

@@ -99,6 +99,7 @@
     <select id="selectCmcBudgetList" parameterType="CmcBudget" resultMap="CmcBudgetResult">
         <include refid="selectCmcBudgetVo"/>
         <where>
+            <if test="budgetId != null  and budgetId != ''"> and b.budget_id = #{budgetId}</if>
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
             <if test="staffCost != null "> and b.staff_cost = #{staffCost}</if>
             <if test="carCost != null "> and b.car_cost = #{carCost}</if>

oa-ui/src/api/oa/budget/budgetOther.js

@@ -9,7 +9,7 @@ import request from '@/utils/request'
 // 查询cmc预算外开支列表
 export function listOther(query) {
   return request({
-    url: '/oa/other/list',
+    url: '/oa/budgetOther/list',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function listOther(query) {
 // 查询cmc预算外开支详细
 export function getOther(expenseId) {
   return request({
-    url: '/oa/other/' + expenseId,
+    url: '/oa/budgetOther/' + expenseId,
     method: 'get'
   })
 }
@@ -26,7 +26,7 @@ export function getOther(expenseId) {
 // 新增cmc预算外开支
 export function addOther(data) {
   return request({
-    url: '/oa/other',
+    url: '/oa/budgetOther',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function addOther(data) {
 // 修改cmc预算外开支
 export function updateOther(data) {
   return request({
-    url: '/oa/other',
+    url: '/oa/budgetOther',
     method: 'put',
     data: data
   })
@@ -44,7 +44,7 @@ export function updateOther(data) {
 // 删除cmc预算外开支
 export function delOther(expenseId) {
   return request({
-    url: '/oa/other/' + expenseId,
+    url: '/oa/budgetOther/' + expenseId,
     method: 'delete'
   })
 }

oa-ui/src/api/oa/budget/budgetSite.js

@@ -9,7 +9,7 @@ import request from '@/utils/request'
 // 查询cmc现场开支列表
 export function listSite(query) {
   return request({
-    url: '/oa/site/list',
+    url: '/oa/budgetSite/list',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function listSite(query) {
 // 查询cmc现场开支详细
 export function getSite(expenseId) {
   return request({
-    url: '/oa/site/' + expenseId,
+    url: '/oa/budgetSite/' + expenseId,
     method: 'get'
   })
 }
@@ -26,7 +26,7 @@ export function getSite(expenseId) {
 // 新增cmc现场开支
 export function addSite(data) {
   return request({
-    url: '/oa/site',
+    url: '/oa/budgetSite',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function addSite(data) {
 // 修改cmc现场开支
 export function updateSite(data) {
   return request({
-    url: '/oa/site',
+    url: '/oa/budgetSite',
     method: 'put',
     data: data
   })
@@ -44,7 +44,7 @@ export function updateSite(data) {
 // 删除cmc现场开支
 export function delSite(expenseId) {
   return request({
-    url: '/oa/site/' + expenseId,
+    url: '/oa/budgetSite/' + expenseId,
     method: 'delete'
   })
 }

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

@@ -141,6 +141,21 @@
       <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
         @cancel="returnOpen = false"></return-btn>
     </el-dialog>
+    <!-- 选择修改有多个预算的项目中的预算 -->
+    <el-dialog title="选择要修改的预算" :visible.sync="updateData" :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false"  width="30%" append-to-body>
+        <el-select v-model="selectedBudget" placeholder="请选择" style="width:100%">
+          <el-option
+            v-for="item in budgets"
+            :key="item.budgetId"
+            :label="item.project.projectName +'_'+ item.createTime"
+            :value="item.budgetId">
+          </el-option>
+        </el-select>
+        <div style="text-align: center">
+          <el-button type="success" style=" margin-top: 10px;"  @click="getBudgeNeesUpdate()">确定</el-button>
+        </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -165,6 +180,7 @@ import OtherTable from "./otherTable.vue";
 import SiteExpenses from "./siteExpenses.vue";
 import BudgetAdjust from "./adjust/budgetAdjust.vue";
 import NewBudgetInfo from './adjust/newBudgetInfo.vue';
+import { toStringHDMS } from 'ol/coordinate';
 
 export default {
   components: {
@@ -189,6 +205,7 @@ export default {
         fixCost: 0,
         directExpense: 0,
         totalBudget: 0,
+        procInstId: "",
       },
       flag: false,
       project: {},
@@ -197,6 +214,9 @@ export default {
       viewOpen: false,
       innerSettleLimit: 0, // 内业预算绩效合计限制
       outerUsers: [], // 存储外业人员
+      updateData:false,
+      selectedBudget:"",
+      budgets:{},
     };
   },
   props: {
@@ -227,19 +247,45 @@ export default {
     this.initBudgetForm();
   },
   methods: {
-    initBudgetForm() {
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(
-        res => {
-          if (res.rows[0] && res.rows[0].budgetId) {
+    async initBudgetForm() {
+      const params = { pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }
+      let res = await listBudget(params)
+      if (res.rows[0] && res.rows[0].budgetId){
+        // 如项目下已有预算，询问是新建预算还是修改原有预算
+        try{
+          await this.$confirm('该项目下已有预算，请选择修改已有预算还是创建新预算','系统提示',{
+                              distinguishCancelAndClose: true,confirmButtonText: '创建新预算',
+                              cancelButtonText: '修改已有预算',showClose: false, 
+                              closeOnClickModal: false, closeOnPressEscape: false});
+          this.flag = false;
+          this.budgetForm.projectId = this.taskForm.formId;
+          this.budgetForm.budgetId = new Snowflake(1n, 1n, 0n).nextId().toString();
+          this.budgetForm.procInstId = this.taskForm.procInsId;
+        }catch(action){
+          if (action === 'cancel') {
             this.flag = true;
-            this.budgetForm = res.rows[0];
-            this.budgetId = res.rows[0].budgetId;
-          } else {
-            this.flag = false;
-            this.budgetForm.projectId = this.taskForm.formId;
-          }
+            this.budgets = res.rows;
+            this.updateData = true;
+            // this.budgetForm = res.rows[0];
+            // this.budgetId = res.rows[0].budgetId;
         }
-      );
+      }}else {
+          this.flag = false;
+          this.budgetForm.projectId = this.taskForm.formId;
+          this.budgetForm.procInstId = this.taskForm.procInsId;
+      }
+      // listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(
+      //   res => {
+      //     if (res.rows[0] && res.rows[0].budgetId) {
+      //       this.flag = true;
+      //       this.budgetForm = res.rows[0];
+      //       this.budgetId = res.rows[0].budgetId;
+      //     } else {
+      //       this.flag = false;
+      //       this.budgetForm.projectId = this.taskForm.formId;
+      //     }
+      //   }
+      // );
     },
     getProjectInfo() {
       getProject(this.taskForm.formId).then(response => {
@@ -436,7 +482,12 @@ export default {
       if (val == "") {
         this.budgetForm.document = ""
       }
-    }
+    },
+    getBudgeNeesUpdate(){
+      this.budgetForm = this.budgets.find(item => item.budgetId === this.selectedBudget);
+      this.budgetId = this.selectedBudget;
+      this.updateData =false;
+   }
   },
 };
 </script>

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

@@ -50,6 +50,7 @@
           </el-table-column>
           <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
           <el-table-column label="项目名称" align="center" prop="project.projectName" />
+          <el-table-column label="提交时间" align="center" prop="createTime" />
           <el-table-column label="预算总额" align="center" prop="totalBudget" />
           <el-table-column label="编制人" align="center" prop="compiler">
             <template slot-scope="scope">

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

@@ -460,6 +460,7 @@ export default {
     if (!this.row.projectId) {
       let res = await getCheck(this.taskForm.formId);
       this.row.projectId = res.data.projectId;
+      this.row.budgetId = res.data.budgetId;
     }
     this.initBudgetForm();
     this.initCheckForm();
@@ -469,7 +470,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.row.projectId }).then(async res => {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.row.projectId, budgetId:this.row.budgetId }).then(async res => {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;

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

@@ -564,7 +564,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(async res => {
+      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/oa/check/index.vue

@@ -47,6 +47,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:check:query']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-download" @click="downloadInfo(scope.row)"
+          v-hasPermi="['oa:check:query']">下载</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -249,11 +251,61 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
+    downloadInfo(row){
+      this.download('oa/budget/export', {
+        'budgetId': row.budgetId
+      }, `budget_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetCar/export', {
+        'budgetId': row.budgetId
+      }, `budget_Car_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetDevice/export', {
+        'budgetId': row.budgetId
+      }, `budget_Device_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetSettle/export', {
+        'budgetId': row.budgetId
+      }, `budget_Settle_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetStaff/export', {
+        'budgetId': row.budgetId
+      }, `budget_Staff${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetOther/export', {
+        'budgetId': row.budgetId
+      }, `budget_Other${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetSite/export', {
+        'budgetId': row.budgetId
+      }, `budget_Site${new Date().getTime()}.xlsx`);
+      this.download('oa/projectWork/export', {
+        'projectId': row.projectId
+      }, `project_Work${new Date().getTime()}.xlsx`)
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/check/export', {
         ...this.queryParams
-      }, `check_${new Date().getTime()}.xlsx`)
+      }, `check_${new Date().getTime()}.xlsx`);
+      this.download('oa/budget/export', {
+        ...this.queryParams
+      }, `budget_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetCar/export', {
+        ...this.queryParams
+      }, `budget_Car_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetDevice/export', {
+        ...this.queryParams
+      }, `budget_Device_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetSettle/export', {
+        ...this.queryParams
+      }, `budget_Settle_${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetStaff/export', {
+        ...this.queryParams
+      }, `budget_Staff${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetOther/export', {
+        ...this.queryParams
+      }, `budget_Other${new Date().getTime()}.xlsx`);
+      this.download('oa/budgetSite/export', {
+        ...this.queryParams
+      }, `budget_Site${new Date().getTime()}.xlsx`);
+      this.download('oa/projectWork/export', {
+        ...this.queryParams
+      }, `project_Work${new Date().getTime()}.xlsx`)
     }
   }
 };