核算编制新增实际人员、车辆、设备栏；

借款跟预算现场开支挂钩

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-14 16:09:56
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 10:47:29
+ * @LastEditTime: 2025-05-20 17:13:53
 -->
 <template>
   <div class="app-container">
@@ -31,6 +31,11 @@
         </el-form>
         <el-table v-loading="loading" :data="budgetList">
           <el-table-column label="序号" align="center" type="index" width="60" />
+          <el-table-column label="状态" align="center" width="70">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.disabled" type="warning">已核算</el-tag>
+            </template>
+          </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="totalBudget" />
@@ -46,7 +51,8 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="120">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="handleSelect(scope.row)">选择</el-button>
+              <el-button type="primary" size="mini" @click="handleSelect(scope.row)"
+                :disabled="scope.row.disabled">选择</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -94,7 +100,8 @@ export default {
         pageNum: 1,
         pageSize: 20,
         projectNumber: undefined,
-        projectName: undefined
+        projectName: undefined,
+        auditor: 7
       },
       queryType: '1',
       projectList: [],
@@ -120,6 +127,15 @@ export default {
     getBudgetList() {
       listBudget(this.queryParams).then(res => {
         this.budgetList = res.rows;
+        for (let b of this.budgetList) {
+          this.isDisabled(b).then(res => {
+            if (res) {
+              this.$set(b, 'disabled', true);
+            } else {
+              this.$set(b, 'disabled', false);
+            }
+          })
+        }
         this.total = res.total;
         this.loading = false;
       });
@@ -127,7 +143,14 @@ export default {
     handleSelect(row) {
       this.projectId = row.projectId;
       this.selectedRows = row;
-      console.log(row);
+    },
+    async isDisabled(row) {
+      let res = await listCheck({ budgetId: row.budgetId })
+      if (res.total > 0) {
+        return true;
+      } else {
+        return false;
+      }
     },
     handleBack() {
       this.projectId = '';

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 17:49:04
+ * @LastEditTime: 2025-05-20 17:08:40
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -117,19 +117,41 @@
           </tr>
         </table>
       </el-descriptions-item>
-      <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
+      <el-descriptions-item label="实际参与人员" :span="3" v-if="taskName == '核算编制'">
+        <span v-for="participant in actualInfo.participateList" :key="participant">
+          <el-tag type="primary" effect="plain" style="margin-right: 10px;">{{ participant }}</el-tag>
+        </span>
+      </el-descriptions-item>
+      <el-descriptions-item label="内业人员成本" :span="3" v-if="taskName == '核算编制' || innerStaffList.length > 0">
         <inner-staff-cost :staffList.sync="innerStaffList" :settleExpense="budgetForm.settleExpense"
           :settleAdjust="budgetForm.settleAdjust" :taskName="taskName"
           @update:staffList="handleInnerStaffChange"></inner-staff-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
+      <el-descriptions-item label="外业人员成本" :span="3" v-if="taskName == '核算编制' || outerStaffList.length > 0">
         <outer-staff-cost :staffList.sync="outerStaffList" :taskName="taskName"
           @update:staffList="handleOuterStaffChange"></outer-staff-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="车辆成本" :span="3" v-if="carList.length > 0">
+      <el-descriptions-item label="实际使用车辆" :span="3" v-if="taskName == '核算编制'">
+        <span v-for="car in actualInfo.carList" :key="car.id">
+          <el-tag :type="car.isExist ? 'primary' : 'warning'" effect="plain" style="margin-right: 10px;">{{
+            car.licensePlate }} - {{ car.series
+            }}</el-tag>
+        </span>
+      </el-descriptions-item>
+      <el-descriptions-item label="车辆成本" :span="3" v-if="taskName == '核算编制' || carList.length > 0">
         <car-cost :carList.sync="carList" :taskName="taskName" @update:carList="handleCarChange"></car-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="设备成本" :span="3" v-if="deviceList.length > 0">
+      <el-descriptions-item label="实际使用设备" :span="3" v-if="taskName == '核算编制'">
+        <span v-for="device in actualInfo.deviceList" :key="device.id">
+          <el-tag :type="device.isExist ? 'primary' : 'warning'" style="margin-right: 10px;margin-bottom: 10px;"
+            effect="plain">
+            {{ device.name + '【' + (device.brand != null ? device.brand : '') + (device.series != null ? '-' +
+              device.series + '】' : '')
+              + (device.code != null ? '（出厂编号：' + device.code + '）' : '') }}
+          </el-tag>
+        </span>
+      </el-descriptions-item>
+      <el-descriptions-item label="设备成本" :span="3" v-if="taskName == '核算编制' || deviceList.length > 0">
         <device-cost :deviceList.sync="deviceList" :taskName="taskName"
           @update:deviceList="handleDeviceChange"></device-cost>
       </el-descriptions-item>
@@ -145,7 +167,7 @@
       </el-descriptions-item>
       <el-descriptions-item label="统计" :span="3">
         <table border="1" style="width:100%;" class="budget-summary">
-          <tr class="header">
+          <tr class="header" style="background-color:#f8f8f9">
             <td><b>名称</b></td>
             <td><b>预算金额</b></td>
             <td><b>核算金额</b></td>
@@ -192,7 +214,7 @@
             <td style="text-align:right;">{{ isNaN(checkOtherCost) ? 0 : Number(checkOtherCost).toFixed(2) }}</td>
             <td style="text-align:right;">{{ (Number(checkOtherCost) - 0).toFixed(2) }}</td>
           </tr>
-          <tr class="total-budget">
+          <tr class="total-budget" style="background-color: #ffeb3b; font-weight: bold;">
             <td><b>总计</b></td>
             <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
             <td style="text-align:right;"><b>{{ isNaN(totalBudgetAdjust) ? 0 : totalBudgetAdjust }}</b></td>
@@ -293,18 +315,20 @@
 </template>
 
 <script>
-import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
+import { getCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
 import { listBudget, updateBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar, updateBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice, updateBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle, updateBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff";
-import { listOther, addOther, updateOther, delOther } from "@/api/oa/budget/budgetOther";
+import { listOther, addOther, delOther } from "@/api/oa/budget/budgetOther";
 import { listProjectWork } from "@/api/oa/project/projectWork";
-import { listSite, updateSite, delSite, addSite } from "@/api/oa/budget/budgetSite";
+import { listSite, updateSite } from "@/api/oa/budget/budgetSite";
 import { getProject } from "@/api/oa/project/project";
+import { getCar } from "@/api/oa/car/car";
+import { getDevice } from "@/api/oa/device/device";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import { getUsersManageLeader, getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from "@/api/system/post";
+import { getUsersManageLeader, getUserByPost, getUsersViceDeptLeaderByDept } from "@/api/system/post";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
@@ -348,12 +372,12 @@ export default {
           this.row.projectId = res.data.projectId;
           this.initBudgetForm();
           this.initCheckForm();
-          this.getProjectWorkList();
+          // this.getProjectWorkList();
         });
       } else {
         this.initBudgetForm();
         this.initCheckForm();
-        this.getProjectWorkList();
+        // this.getProjectWorkList();
       }
 
     }
@@ -383,6 +407,11 @@ export default {
       checkOtherCost: 0,
       checkJYAmount: 0,
       totalBudgetAdjust: 0,
+      actualInfo: {
+        deviceList: [],
+        carList: [],
+        participateList: []
+      }
     }
   },
   async created() {
@@ -392,7 +421,6 @@ export default {
     }
     this.initBudgetForm();
     this.initCheckForm();
-    this.getProjectWorkList();
   },
   methods: {
     initBudgetForm() {
@@ -450,7 +478,7 @@ export default {
               amountAdjust: car.amountAdjust ? Number(car.amountAdjust).toFixed(2) : 0
             };
           });
-          this.checkCarCost = this.carList.reduce((sum, car) => sum + (Number(car.amountAdjust) || 0).toFixed(2), 0);
+          this.checkCarCost = this.carList.reduce((sum, car) => sum + Number(car.amountAdjust || 0), 0).toFixed(2);
 
           // 获取内业人员数据
           let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
@@ -550,6 +578,8 @@ export default {
           this.checkOtherCost = this.otherList.reduce((sum, other) => sum + Number(other.amountAdjust || 0), 0).toFixed(2);
           this.totalBudgetAdjust = (Number(this.checkStaffCost) + Number(this.checkCarCost) + Number(this.checkDeviceCost)
             + Number(this.checkSiteCost) + Number(this.checkJYAmount) + Number(this.checkOtherCost)).toFixed(2);
+
+          this.getProjectWorkList();
         }
         this.loading = false;
       }).catch(() => {
@@ -576,9 +606,48 @@ export default {
         }
       })
     },
+    async initActualInfo(project) {
+      let deviceIds = project.devices.split(',');
+      let carIds = project.cars.split(',');
+      let participateIds = project.participates.split(',');
+      let actualDeviceList = [];
+      let actualCarList = [];
+      let actualParticipateList = [];
+      actualDeviceList = await Promise.all(deviceIds.map(async deviceId => {
+        const res = await getDevice(deviceId);
+        return res.data;
+      }));
+
+      actualCarList = await Promise.all(carIds.map(async carId => {
+        const res = await getCar(carId);
+        return res.data;
+      }));
+
+      actualParticipateList = participateIds.map(participateId => this.getUserName(Number(participateId)));
+      actualDeviceList = actualDeviceList.map(actualDevice => {
+        const isExist = this.deviceList.some(device => device.deviceId === actualDevice.deviceId);
+        return {
+          ...actualDevice,
+          isExist: isExist
+        };
+      });
+      actualCarList = actualCarList.map(actualCar => {
+        const isExist = this.carList.some(car => car.carId === actualCar.carId);
+        return {
+          ...actualCar,
+          isExist: isExist
+        };
+      });
+      this.actualInfo = {
+        deviceList: actualDeviceList,
+        carList: actualCarList,
+        participateList: actualParticipateList
+      }
+    },
     getProjectWorkList() {
       getProject(this.row.projectId).then(res => {
         this.project = res.data;
+        this.initActualInfo(this.project);
       })
       listProjectWork({ pageSize: 999, projectId: this.row.projectId }).then(res => {
         this.workContentList = res.rows;

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-08 14:18:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 16:25:04
+ * @LastEditTime: 2025-05-20 16:47:13
 -->
 <template>
   <div class="car-cost">
@@ -11,6 +11,7 @@
         <td></td>
         <td>序号</td>
         <td>车牌号</td>
+        <td>品牌</td>
         <td>折旧成本（天）</td>
         <td>预算天数</td>
         <td>金额</td>
@@ -25,6 +26,7 @@
         </td>
         <td>{{ index + 1 }}</td>
         <td>{{ car.car ? car.car.licensePlate : '' }}</td>
+        <td>{{ car.car ? car.car.brand : '' }}</td>
         <td style="text-align:right;">{{ car.car ? car.car.dayCost : '' }}</td>
         <td style="text-align:right;">{{ car.days }}</td>
         <td style="text-align:right;">{{ car.amount }}</td>
@@ -40,7 +42,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="amount">车辆成本合计</td>
+        <td colspan="4" class="amount">车辆成本合计</td>
         <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
           (Number(car.depreciation) || 0), 0).toFixed(2)}}</td>
         <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +

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

@@ -60,8 +60,8 @@
 </template>
 
 <script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listSite, getSite, delSite, addSite, updateSite } from "@/api/oa/budget/budgetSite.js";
+import { addData, getDicts } from "@/api/system/dict/data";
+import { listSite, delSite } from "@/api/oa/budget/budgetSite.js";
 export default {
   dicts: ['cmc_borrow_expense', 'cmc_unit'],
   props: {
@@ -180,16 +180,17 @@ export default {
             this.open = false;
             this.newExpenseForm.name = '';
             // 刷新字典数据
-            this.getDicts("cmc_borrow_expense").then(response => {
-              console.log(response.data);
-              // 更新字典数据
-              this.dict.type.cmc_borrow_expense = response.data;
-              // 重新加载字典数据后，更新当前选中项
-              if (this.expensesList.length > 0) {
-                const lastItem = this.expensesList[this.expensesList.length - 1];
-                lastItem.name = this.newExpenseForm.dictValue;
+            getDicts("cmc_borrow_expense").then(res => {
+              let arr = [];
+              for (let i = 0; i < res.data.length; i++) {
+                arr.push({
+                  label: res.data[i].dictLabel,
+                  value: res.data[i].dictValue,
+                  raw: res.data[i]
+                })
               }
-            });
+              this.dict.type.cmc_borrow_expense = arr;
+            })
           });
         }
       })

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -80,9 +80,14 @@
                 {{ index + 1 }}
               </td>
               <td>
-                <!-- <el-input v-model="detail.borrowItem" type="textarea" :disabled="taskName != '借款申请'"></el-input> -->
-                <el-autocomplete v-model="detail.borrowItem" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
-                  :disabled="taskName != '借款申请'"></el-autocomplete>
+                <!-- <el-autocomplete v-model="detail.borrowItem" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
+                  :disabled="taskName != '借款申请'"></el-autocomplete> -->
+                <el-select v-model="detail.borrowItem" placeholder="请选择开支项" clearable @change="handleExpenseChange"
+                  style="width: 100%;" :disabled="taskName != '借款申请'">
+                  <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value"
+                    :label="dict.label" :value="dict.value" />
+                  <el-option label="+新增更多开支项..." value="new_expense" />
+                </el-select>
               </td>
               <td>
                 <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
@@ -98,10 +103,6 @@
               <td>
                 <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
               </td>
-              <!-- <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
-                  <el-input v-model="detail.xmAmount" :disabled="taskName != '项目部审核'"
-                    @change="calculateXmAmount(detail)"></el-input>
-                </td> -->
               <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                 <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
                   @blur="calculateManagerAmount(detail)"></el-input>
@@ -117,8 +118,8 @@
 
           <el-form-item label="最大借款金额" v-if="isSelect">
             <el-tag>
-              <span class="low-money">{{ totalBudget.toFixed(2) }}</span>
-              <span class="up-money">（大写：{{ formatNumberWithWan(totalBudget) }}）</span>
+              <span class="low-money">{{ siteExpenses.toFixed(2) }}</span>
+              <span class="up-money">（大写：{{ formatNumberWithWan(siteExpenses) }}）</span>
             </el-tag>
           </el-form-item>
           <el-form-item label="已申请借款" v-if="isSelect">
@@ -129,8 +130,8 @@
           </el-form-item>
           <el-form-item label="可用借款" v-if="isSelect">
             <el-tag type="success">
-              <span class="low-money">{{ (totalBudget - hasBorrow).toFixed(2) }}</span>
-              <span class="up-money">（大写：{{ formatNumberWithWan((totalBudget - hasBorrow)) }}）</span>
+              <span class="low-money">{{ (siteExpenses - hasBorrow).toFixed(2) }}</span>
+              <span class="up-money">（大写：{{ formatNumberWithWan((siteExpenses - hasBorrow)) }}）</span>
             </el-tag>
           </el-form-item>
 
@@ -320,6 +321,17 @@
       <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
         @cancel="returnOpen = false"></return-btn>
     </el-dialog>
+    <el-dialog title="新增开支项" :visible.sync="openNewExpense" width="400px" append-to-body>
+      <el-form ref="newExpenseForm" :model="newExpenseForm" :rules="newExpenseRules" label-width="120px">
+        <el-form-item label="开支项名称" prop="name">
+          <el-input v-model="newExpenseForm.name" placeholder="请输入开支项名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitNewExpense">确 定</el-button>
+        <el-button @click="openNewExpense = false">取 消</el-button>
+      </div>
+    </el-dialog>
     <el-button type="success" @click="printOpen = true">打印</el-button>
   </div>
 </template>
@@ -330,6 +342,8 @@ import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByD
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listBorrowDetail, addBorrowDetail, updateBorrowDetail, delBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
+import { addData, getDicts } from "@/api/system/dict/data";
+import { listSite, delSite } from "@/api/oa/budget/budgetSite.js";
 import { getUserByPost } from "@/api/system/post";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -343,6 +357,7 @@ import ReturnComment from '@/views/flowable/form/components/flowBtn/returnCommen
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 
 export default {
+  dicts: ['cmc_borrow_expense', 'cmc_unit'],
   components: {
     flow,
     projectChoose,
@@ -425,12 +440,21 @@ export default {
       exceed: false, //是否超预算
       deptId: undefined,
       dgtLabel: '工会审核意见',
-      totalBudget: 0,
+      siteExpenses: 0,
       hasBorrow: 0,
       printOpen: false,
       showAlter: true,
       returnOpen: false,
-      borrowItemList: []
+      borrowItemList: [],
+      openNewExpense: false,
+      newExpenseForm: {
+        name: ''
+      },
+      newExpenseRules: {
+        name: [
+          { required: true, message: '请输入开支项名称', trigger: 'blur' }
+        ]
+      }
     };
   },
   created() {
@@ -566,19 +590,12 @@ export default {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
         let budget = budgetData.rows[0];
-        this.totalBudget = Number(budget.settleExpense) + Number(budget.otherExpense) +  Number(budget.rentExpense)
+        let siteRes = await listSite({ budgetId: budget.budgetId });
+        let maxExpense = siteRes.rows.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
+        this.siteExpenses = maxExpense
       }
       if (budgetData.total == 0) {
-        this.totalBudget = 0
-      }
-      if (this.form.borrowUsage == '0') {
-        if ((this.totalBudget - this.form.applyAmount) < 0) {
-          this.exceed = true;
-        } else {
-          this.exceed = false;
-        }
-      } else {
-        this.exceed = false;
+        this.siteExpenses = 0
       }
       let borrow = await listBorrow({ projectId: this.form.projectId })
       if (borrow.total != 0) {
@@ -595,6 +612,15 @@ export default {
         });
         this.hasBorrow = hasBorrow
       }
+      if (this.form.borrowUsage == '0') {
+        if ((this.siteExpenses - this.hasBorrow - this.form.applyAmount) < 0) {
+          this.exceed = true;
+        } else {
+          this.exceed = false;
+        }
+      } else {
+        this.exceed = false;
+      }
     },
     // 查询项目列表
     getProjectList() {
@@ -933,7 +959,7 @@ export default {
     // 验证金额
     VerificationAmount() {
       if (this.isSelect) {
-        if (this.form.applyAmount > (this.totalBudget - this.hasBorrow)) {
+        if (this.form.applyAmount > (this.siteExpenses - this.hasBorrow)) {
           return this.$confirm('借款总额已经超过项目预算，将走《超预算或预算外支付（报销）》流程', '提示', {
             confirmButtonText: '确定',
             type: 'warning'
@@ -955,9 +981,9 @@ export default {
     getMoreAmount(type) {
       let result;
       if (type == '0') {
-        result = this.form.applyAmount - (this.totalBudget - this.hasBorrow);
+        result = this.form.applyAmount - (this.siteExpenses - this.hasBorrow);
       } else {
-        result = this.form.managerAmount - (this.totalBudget - this.hasBorrow);
+        result = this.form.managerAmount - (this.siteExpenses - this.hasBorrow);
       }
       return result.toFixed(2)
     },
@@ -988,6 +1014,40 @@ export default {
       return (borrowItem) => {
         return (borrowItem.value.indexOf(queryString) === 0);
       };
+    },
+    handleExpenseChange(value) {
+      if (value === 'new_expense') {
+        this.openNewExpense = true;
+      }
+    },
+    submitNewExpense() {
+      this.$refs["newExpenseForm"].validate(valid => {
+        if (valid) {
+          let length = this.dict.type.cmc_borrow_expense.length;
+          this.newExpenseForm.dictType = 'cmc_borrow_expense';
+          this.newExpenseForm.dictLabel = this.newExpenseForm.name;
+          this.newExpenseForm.dictValue = this.newExpenseForm.name;
+          this.newExpenseForm.listClass = 'default'
+          this.newExpenseForm.dictSort = length;
+          addData(this.newExpenseForm).then(res => {
+            this.$modal.msgSuccess("新增成功");
+            this.openNewExpense = false;
+            this.newExpenseForm.name = '';
+            // 刷新字典数据
+            getDicts("cmc_borrow_expense").then(res => {
+              let arr = [];
+              for (let i = 0; i < res.data.length; i++) {
+                arr.push({
+                  label: res.data[i].dictLabel,
+                  value: res.data[i].dictValue,
+                  raw: res.data[i]
+                })
+              }
+              this.dict.type.cmc_borrow_expense = arr;
+            })
+          })
+        }
+      })
     }
   }
 };

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-14 16:57:31
+ * @LastEditTime: 2025-05-20 09:31:22
 -->
 
 <template>
@@ -234,12 +234,12 @@ export default {
           privilege: ['oa:salary:list']
         }, {
           id: 9,
-          name: '项目结算',
+          name: '项目预算',
           icon: 'settle',
           bgColor: '#ff6f61',
           boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
-          path: '/product/settle/project',
-          privilege: ['oa:settle:list']
+          path: '/product/budget/scheme',
+          privilege: ['oa:budget:list']
         }, {
           id: 10,
           name: '借款管理',

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

@@ -88,10 +88,10 @@
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
-      <budget-adjust :taskForm="taskForm" :taskName="''" :row="clickRow" v-if="isAdjust"></budget-adjust>
-      <div v-else>
-        <budget-info v-if="isOld" :taskForm="taskForm" :taskName="''"></budget-info>
-        <new-budget-info v-if="!isOld" :taskForm="taskForm" :taskName="''"></new-budget-info>
+      <budget-adjust :taskForm="taskForm" :taskName="''" :row="clickRow" v-show="isAdjust"></budget-adjust>
+      <div v-show="!isAdjust">
+        <budget-info :taskForm="taskForm" :taskName="''" v-show="isOld"></budget-info>
+        <new-budget-info :taskForm="taskForm" :taskName="''" v-show="!isOld"></new-budget-info>
       </div>
     </el-dialog>
   </div>

oa-ui/src/views/oa/study/components/studyRight.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:36:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-26 09:12:56
+ * @LastEditTime: 2025-05-20 11:35:06
 -->
 <template>
   <div>
@@ -11,16 +11,16 @@
         <resource-tree :isModify="false" @clickNode="queryField"></resource-tree>
       </el-col>
       <el-col :span="16">
-        <el-form :model="videoParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
+        <el-form :model="queryParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
           <el-form-item label="资料名称" prop="title">
-            <el-input v-model="videoParams.title" placeholder="请输入资料名称" clearable
+            <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable
               @keyup.enter.native="handleVideoQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleVideoQuery">搜索</el-button>
           </el-form-item>
         </el-form>
-        <el-table :data="videoList" style="width: 100%">
+        <el-table :data="resourceList" style="width: 100%">
           <el-table-column align="center" label="序号" type="index" />
           <el-table-column align="center" label="名称" prop="title" />
           <el-table-column align="center" label="类型" prop="type" />
@@ -33,70 +33,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
-          :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
-          @pagination="getVideoList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" :autoScroll="false" @pagination="getResourceList" />
       </el-col>
     </el-row>
-    <!-- <div class="video">
-      <el-tabs v-model="videoTab" type="card">
-        <el-form :model="videoParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
-          <el-form-item label="视频名称" prop="title">
-            <el-input v-model="videoParams.title" placeholder="请输入资料名称" clearable
-              @keyup.enter.native="handleVideoQuery" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleVideoQuery">搜索</el-button>
-          </el-form-item>
-        </el-form>
-        <el-tab-pane label="视频" name="video">
-          <el-table :data="videoList" style="width: 100%">
-            <el-table-column align="center" label="序号" type="index" />
-            <el-table-column align="center" label="名称" prop="title" />
-            <el-table-column align="center" label="学时" prop="hours" />
-            <el-table-column align="center" label="操作">
-              <template slot-scope="{row}">
-                <el-button type="text" @click="addToStudy(row)">
-                  添加课程
-                </el-button>
-              </template>
-      </el-table-column>
-      </el-table>
-      <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
-        :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
-        @pagination="getVideoList" />
-      </el-tab-pane>
-      </el-tabs>
-    </div>
-    <div class="pdf">
-      <el-tabs v-model="pdfTab" type="card">
-        <el-form :model="pdfParams" size="small" :inline="true" label-width="68px">
-          <el-form-item label="文档名称" prop="title">
-            <el-input v-model="pdfParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handlePdfQuery" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handlePdfQuery">搜索</el-button>
-          </el-form-item>
-        </el-form>
-        <el-tab-pane label="文档" name="pdf">
-          <el-table :data="pdfList" style="width: 100%">
-            <el-table-column align="center" label="序号" type="index" />
-            <el-table-column align="center" label="名称" prop="title" />
-            <el-table-column align="center" label="学时" prop="hours" />
-            <el-table-column align="center" label="操作">
-              <template slot-scope="{row}">
-                    <el-button type="text" @click="addToStudy(row)">
-                      添加课程
-                    </el-button>
-                  </template>
-            </el-table-column>
-          </el-table>
-          <pagination v-show="pdfTotal > 0" :total="pdfTotal" :page.sync="pdfParams.pageNum"
-            :layout="'total, prev, pager, next,jumper'" :limit.sync="pdfParams.pageSize" :autoScroll="false"
-            @pagination="getPdfList" />
-        </el-tab-pane>
-      </el-tabs>
-    </div> -->
   </div>
 </template>
 
@@ -109,55 +49,45 @@ export default {
   components: { resourceTree },
   data() {
     return {
-      videoList: [],
+      resourceList: [],
       pdfList: [],
       videoTab: 'video',
       pdfTab: 'pdf',
-      videoParams: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
       pdfParams: {},
-      videoTotal: 0,
+      total: 0,
       pdfTotal: 0,
     }
   },
   created() {
-    this.getVideoList();
-    this.getPdfList();
+    this.getResourceList();
   },
   methods: {
-    getVideoList() {
-      // this.videoParams.type = '视频'
-      listResource(this.videoParams).then(response => {
-        this.videoList = response.rows;
-        this.videoTotal = response.total;
+    getResourceList() {
+      listResource(this.queryParams).then(response => {
+        this.resourceList = response.rows;
+        this.total = response.total;
       });
     },
     getList() {
-      listResource(this.videoParams).then(response => {
-        this.videoList = response.rows;
-        this.videoTotal = response.total;
+      listResource(this.queryParams).then(response => {
+        this.resourceList = response.rows;
+        this.total = response.total;
       });
     },
     getAllListByFiedldId() {
       this.loading = true;
-      getListBelow(this.videoParams).then(response => {
-        this.videoList = response.rows;
-        this.videoTotal = response.total;
+      getListBelow(this.queryParams).then(response => {
+        this.resourceList = response.rows;
+        this.total = response.total;
       })
     },
-    getPdfList() {
-      this.pdfParams.type = '文档'
-      listResource(this.pdfParams).then(response => {
-        this.pdfList = response.rows;
-        this.pdfTotal = response.total;
-      });
-    },
     handleVideoQuery() {
-      this.videoParams.pageNum = 1;
-      this.getVideoList();
-    },
-    handlePdfQuery() {
-      this.pdfParams.pageNum = 1;
-      this.getPdfList();
+      this.queryParams.pageNum = 1;
+      this.getResourceList();
     },
     addToStudy(row) {
       this.$modal.confirm('是否添加资料名称为"' + row.title + '"到我的学习记录？').then(async res => {
@@ -181,10 +111,10 @@ export default {
     },
     queryField(data) {
       if (data.fieldId) {
-        this.videoParams.fieldId = data.fieldId
+        this.queryParams.fieldId = data.fieldId
         this.getAllListByFiedldId();
       } else {
-        this.videoParams.fieldId = null
+        this.queryParams.fieldId = null
         this.getList();
       }
     }