修改预算中的审核意见

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

@@ -28,8 +28,10 @@
         <result property="manager"    column="manager"    />
         <result property="auditor"    column="auditor"    />
         <result property="approver"    column="approver"    />
+        <result property="managerComment"    column="manager_comment"    />
         <result property="zjlComment"    column="zjl_comment"    />
         <result property="dszComment"    column="dsz_comment"    />
+        <result property="managerTime"    column="manager_time"    />
         <result property="zjlTime"    column="zjl_time"    />
         <result property="dszTime"    column="dsz_time"    />
         <result property="createTime"    column="create_time"    />
@@ -69,7 +71,7 @@
     <sql id="selectCmcBudgetVo">
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
                b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler,
-               u.nick_name as compiler_nick_name, b.manager, u2.nick_name as manager_nick_name, b.auditor, u3.nick_name as zjl_nick_name, b.approver, u4.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
+               u.nick_name as compiler_nick_name, b.manager, u1.nick_name as manager_nick_name, b.auditor, u2.nick_name as zjl_nick_name, b.approver, u3.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
                b.manager_comment, b.zjl_comment, b.dsz_comment from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.manager

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

@@ -17,9 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jsUserId"    column="js_user_id"    />
         <result property="jsTime"    column="js_time"    />
         <result property="jsComment"    column="js_comment"    />
-        <result property="xmUserId"    column="xm_user_id"    />
-        <result property="xmTime"    column="xm_time"    />
-        <result property="xmComment"    column="xm_comment"    />
         <result property="jyUserId"    column="jy_user_id"    />
         <result property="jyTime"    column="jy_time"    />
         <result property="jyComment"    column="jy_comment"    />
@@ -38,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="reporterUser"    javaType="SysUser"         resultMap="ReporterUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
-        <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
         <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
@@ -60,11 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="js_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="XmUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="xm_nick_name"    />
-    </resultMap>
-
     <resultMap type="SysUser" id="JyUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="jy_nick_name"    />

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 16:08:33
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 14:20:03
+ * @LastEditTime: 2024-07-10 18:25:25
 -->
 <template>
   <div>

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

@@ -2,14 +2,14 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 14:27:10
+ * @LastEditTime: 2024-07-10 19:15:14
 -->
 <template>
   <div class="main">
     <div>
       <h2 class="text-center">项目直接生产成本预算表</h2>
       <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 审核人：{{
-        budgetForm.auditorUser ? budgetForm.auditorUser.nickName : '' }}</p>
+        budgetForm.managerUser ? budgetForm.managerUser.nickName : '' }}</p>
       <el-descriptions :column="3" border class="descriptions">
         <el-descriptions-item label="项目编号">
           {{ projectForm.projectNumber }}
@@ -262,10 +262,44 @@
             （简写：{{ (profit / 10000).toFixed(4) + '万' }}）
           </div>
         </el-descriptions-item>
+        <el-descriptions-item label="分管审核意见" :span="3">
+          <div>
+            <el-input :disabled="taskName != '分管审核'" type="textarea" placeholder="请输入审核意见"
+              v-model="budgetForm.managerComment" :autosize="{ minRows: 4 }"></el-input>
+            <div class="sign mt10">
+              <div class="mr20">签名：<span class="auditor">{{ getUserName(budgetForm.manager) }}</span>
+              </div>
+              <div class="ml20"><span>审核时间：{{ budgetForm.managerTime }}</span></div>
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="总经理审核意见" :span="3">
+          <div>
+            <el-input :disabled="taskName != '总经理审核'" type="textarea" placeholder="请输入审核意见"
+              v-model="budgetForm.zjlComment" :autosize="{ minRows: 4 }"></el-input>
+            <div class="sign mt10">
+              <div class="mr20">签名：<span class="auditor">{{ getUserName(budgetForm.auditor) }}</span>
+              </div>
+              <div class="ml20"><span>审核时间：{{ budgetForm.zjlTime }}</span></div>
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="董事长批准意见" :span="3">
+          <div>
+            <el-input :disabled="taskName != '预算批准'" type="textarea" placeholder="请输入审核意见"
+              v-model="budgetForm.dszComment" :autosize="{ minRows: 4 }"></el-input>
+            <div class="sign mt10">
+              <div class="mr20">签名：<span class="auditor">{{ getUserName(budgetForm.approver) }}</span>
+              </div>
+              <div class="ml20"><span>审核时间：{{ budgetForm.dszTime }}</span></div>
+            </div>
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
     </div>
+
     <el-row v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'" class="text-center mt20 mb20">
-      <el-button type="success" @click="confirmSucess(taskName)">审批通过</el-button>
+      <el-button type="success" @click="confirmSucess(taskName)">提 交</el-button>
     </el-row>
   </div>
 </template>
@@ -330,6 +364,7 @@ export default {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
         this.budgetForm = res.rows[0];
+        this.setSignName();
         if (this.budgetForm) {
           listBudgetDevice({ budgetId: this.budgetForm.budgetId }).then(res => {
             this.chooseDevice = res.rows;
@@ -377,6 +412,20 @@ export default {
         }
       });
     },
+    setSignName() {
+      const signUser = this.$store.getters.userId
+      const times = this.parseTime(new Date(), '{y}-{m}-{d}')
+      if (this.taskName == '分管审核') {
+        this.budgetForm.manager = signUser
+        this.budgetForm.managerTime = times
+      } else if (this.taskName == '总经理审核') {
+        this.budgetForm.auditor = signUser
+        this.budgetForm.zjlTime = times
+      } else if (this.taskName == '预算批准') {
+        this.budgetForm.approver = signUser
+        this.budgetForm.dszTime = times
+      }
+    },
     // 查询项目列表
     getProjectList() {
       getProject(this.taskForm.formId).then(response => {
@@ -404,6 +453,7 @@ export default {
 
         })
       } else if (taskName == '总经理审核') {
+        this.updateBudgetForm();
         getNextFlowNode(params).then(res => {
           getUserByPost({ postName: "董事长" }).then(res => {
             const userId = res.data[0].userId;
@@ -415,6 +465,7 @@ export default {
           })
         })
       } else {
+        this.updateBudgetForm();
         getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
@@ -556,6 +607,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 .main {
   width: 100%;
   margin: 0 auto;
@@ -584,12 +636,21 @@ table {
   font-weight: bold;
 }
 
+.sign {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-right: 80px;
+  line-height: 30px;
+  /* 如果需要垂直居中 */
+}
+
 ::v-deep .el-descriptions-item__label.is-bordered-label {
   color: #5a5757;
   background: rgba($color: #a9adb3, $alpha: 0.1);
-  width: 110px;
+  width: 120px;
   text-align: center;
-  min-width: 110px;
+  min-width: 120px;
 }
 
 ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {

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

@@ -125,13 +125,14 @@
               <el-form-item label="申请金额" prop="applyAmount">
                 <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'"
                   @blur="VerificationAmount" />
-                <span style="color:#E74C3C">超过预算额</span>
+                <span style="color:#E74C3C" v-if="exceed">超过预算金额：{{ getMoreAmount('0') }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
                   :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
+                <span style="color:#E74C3C" v-if="form.managerAmount">超过预算金额：{{ getMoreAmount('1') }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -268,7 +269,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="支付日期：" prop="lendTime" v-if="showFormItem('财务处理')">
-                <el-date-picker style="width:1.75rem;" v-model="form.lendTime" value-format="yyyy-MM-dd" type="date"
+                <el-date-picker style="width:140px;" v-model="form.lendTime" value-format="yyyy-MM-dd" type="date"
                   placeholder="选择日期" :disabled="taskName != '财务处理'">
                 </el-date-picker>
               </el-form-item>
@@ -502,12 +503,20 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          if (this.isProject) {
+            if ((this.totalBudget - this.form.applyAmount) < 0) {
+              this.exceed = true;
+            } else {
+              this.exceed = false;
+            }
+          }
           this.hanldeChangeType();
           this.handleSelectProject(res.data.projectId)
           this.getBudgetSettle()
         }
         this.loading = false;
       })
+
     },
     async getBudgetSettle() {
       let budgetData = await listBudget({ projectId: this.form.projectId })
@@ -587,15 +596,11 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.form.borrowUsage == '0' && !this.form.projectId) {
+            this.$message.error('请选择项目！')
+            return
+          }
           if (this.formTotal != 0) {
-            if (this.isProject) {
-              if ((this.totalBudget - this.form.applyAmount) < 0) {
-                this.exceed = true;
-                this.$set(this.taskForm.variables, "exceed", true);
-              } else {
-                this.$set(this.taskForm.variables, "exceed", false);
-              }
-            }
             // 更新借款明细项
             delBorrowDetail(this.taskForm.formId).then(res => {
               this.detailList.forEach(detail => {
@@ -628,6 +633,7 @@ export default {
                 })
               }
               else if (this.taskName == '总经理审核') {
+                this.$set(this.taskForm.variables, "exceed", this.exceed);
                 if (!this.exceed) { //没有超预算
                   this.submitFD(); //提交到财务部审核
                 }
@@ -824,6 +830,16 @@ export default {
         }
       }
     },
+    // 计算超过预算的金额
+    getMoreAmount(type) {
+      let result;
+      if (type == '0') {
+        result = this.form.applyAmount - (this.totalBudget - this.hasBorrow);
+      } else {
+        result = this.form.managerAmount - (this.totalBudget - this.hasBorrow);
+      }
+      return result.toFixed(2)
+    }
   }
 };
 </script>

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-09 21:30:44
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-10 17:51:06
 -->
 <template>
   <div class="app-container">
@@ -50,7 +50,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="组织交底日期：" prop="organizeTime">
             <el-date-picker style="width: 100%;" v-model="form.organizeTime" value-format="yyyy-MM-dd" type="date"
@@ -74,7 +74,7 @@
             </FileUpload>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <!-- 人员选择对话框 -->
     <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>