其他项目结算后台

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

@@ -72,6 +72,10 @@ public class CmcSettleController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcSettle cmcSettle)
     {
+        if (cmcSettle.getProjectId() != null && cmcSettle.getXmName() == null)
+            cmcSettle.setXmName(" ");
+        if (cmcSettle.getProjectId() == null && cmcSettle.getXmName() != null)
+            cmcSettle.setProjectId("0");
         return toAjax(cmcSettleService.insertCmcSettle(cmcSettle));
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.java

@@ -28,6 +28,10 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "项目名称")
     private String projectName;
 
+    /** 其他项目名称 */
+    @Excel(name = "其他项目名称")
+    private String xmName;
+
     /** 工作量上报说明 */
     @Excel(name = "工作量上报说明")
     private String workloadReport;
@@ -167,12 +171,21 @@ public class CmcSettle extends BaseEntity
     {
         return settleId;
     }
-    public void setProjectId(String projectId) 
+    public void setXmName(String xmName)
+    {
+        this.xmName = xmName;
+    }
+
+    public String getXmName()
+    {
+        return xmName;
+    }
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public String getProjectId()
     {
         return projectId;
     }

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcSettle" id="CmcSettleResult">
         <result property="settleId"    column="settle_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="xmName"    column="xm_name"    />
         <result property="workloadReport"    column="workload_report"    />
         <result property="reporter"    column="reporter"    />
         <result property="reportTime"    column="report_time"    />
@@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select s.settle_id, s.project_id, p.project_number, p.project_name, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
+        select s.settle_id, s.project_id, p.project_number, p.project_name, s.xm_name, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
                s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, 
                s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
                s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
@@ -102,7 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcSettleVo"/>
         <where>
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
-            <if test="projectId != null  and projectId != ''"> and s.project_id = #{projectId}</if>
+            <if test="projectId != null"> and s.project_id = #{projectId}</if>
+            <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>
             <if test="reportTime != null "> and s.report_time = #{reportTime}</if>
@@ -136,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="settleId != null">settle_id,</if>
             <if test="projectId != null">project_id,</if>
+            <if test="xmName != null">xm_name,</if>
             <if test="workloadReport != null">workload_report,</if>
             <if test="reporter != null">reporter,</if>
             <if test="reportTime != null">report_time,</if>
@@ -165,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="settleId != null">#{settleId},</if>
             <if test="projectId != null">#{projectId},</if>
+            <if test="xmName != null">#{xmName},</if>
             <if test="workloadReport != null">#{workloadReport},</if>
             <if test="reporter != null">#{reporter},</if>
             <if test="reportTime != null">#{reportTime},</if>
@@ -197,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_settle
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="xmName != null">xm_name = #{xmName},</if>
             <if test="workloadReport != null">workload_report = #{workloadReport},</if>
             <if test="reporter != null">reporter = #{reporter},</if>
             <if test="reportTime != null">report_time = #{reportTime},</if>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-06 17:20:01
+ * @LastEditTime: 2024-08-07 13:30:38
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -15,6 +15,9 @@
           <div class="line"></div>
         </div>
         <el-form ref="settleForm" :model="form" :rules="rules" label-width="160px" :disabled="disabled">
+          <el-form-item label="其他项目名称" prop="xmName">
+            <el-input v-model="form.xmName" placeholder="请输入其他项目名称" :disabled="taskName != '结算发起'" />
+          </el-form-item>
           <el-form-item label="工作量上报说明" prop="workloadReport">
             <el-input v-model="form.workloadReport" type="textarea" :rows="4" :disabled="taskName != '结算发起'"
               placeholder="请输入工作量上报说明" />
@@ -155,6 +158,41 @@
             <div class="line"></div>
           </div>
           <el-form-item label-width="60px">
+            <h3>表1：扣除明细</h3>
+            <table border="1">
+              <tr>
+                <td style="width: 50px">序号</td>
+                <td style="width: 280px">扣除内容</td>
+                <td style="width: 200px">扣除金额（元）</td>
+                <td style="width: 280px">备注</td>
+                <td style="width: 100px">操作</td>
+              </tr>
+              <tr v-for="(  work, index  ) in   settleSumList  " :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="isModify">
+                  </el-input>
+                </td>
+                <td>
+                  <el-input-number :min="0" :precision="2" style="width: 200px" v-model="work.amount" clearable
+                    :disabled="isModify" :controls="false" @blur="calculateActualSumSettle()"></el-input-number>
+                  <!-- {{ work.amount }} -->
+                </td>
+                <td>
+                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="isModify">
+                  </el-input>
+                </td>
+                <td>
+                  <el-button type="text" size="mini" style="color: #f56c6c"
+                    @click="deletWorkItem(index, settleSumList)">删除行</el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addSumWorkList"></el-button>
             <h3>部门结算金额</h3>
             <table border="1">
               <tr>
@@ -269,8 +307,8 @@
     </el-row>
 
     <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
-      <settle-print :form="form" :workList="settleWorkList"
-        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
+      <settle-print :form="form" :workList="settleWorkList" :settleList="oldSettleSumList"
+        @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-drawer title="选择单价" :visible.sync="drawer" direction="rtl">
       <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
@@ -283,12 +321,10 @@
 import flow from "@/views/flowable/task/todo/detail/flow";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { parseTime } from "@/utils/ruoyi";
-import { listProject, getProject } from "@/api/oa/project/project";
 import { deepClone } from "@/utils";
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
 import { listSettleSummary, getSettleSummary, addSettleSummary, delSettleSummary, updateSettleSummary } from "@/api/oa/settle/settleSummary";
 import { listSettleWork, getSettleWork, addSettleWork, updateSettleWork, delSettleWork } from "@/api/oa/settle/settleWork";
-import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { getPrice, getPriceRemarkByWorkType } from "@/api/oa/price/price";
 import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
@@ -298,7 +334,6 @@ import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
 import SettlePrint from "./components/settlePrint.vue";
 import { getDept } from "@/api/system/dept";
-import { getContract } from "@/api/oa/contract/contract";
 export default {
   components: {
     flow,
@@ -338,12 +373,7 @@ export default {
       flag: false,
       flowData: {},
       form: {},
-      rules: {
-        projectId: [
-          { required: true, trigger: "change", message: "请选择项目编号" },
-        ],
-      },
-      projectList: [],
+      rules: {},
       isSelect: false,
       fileList: [],
       settleWorkList: [
@@ -392,8 +422,6 @@ export default {
     };
   },
   created() {
-    this.getProjectList(); //获取项目列表
-    this.getContractDataList(); //获取合同编码和编号
     this.initForm();
     if (this.flowDisabled)
       flowXmlAndNode({
@@ -404,17 +432,7 @@ export default {
       });
   },
   mounted() {
-    if (this.$route.query.projectId) {
-      getProject(this.$route.query.projectId).then((res) => {
-        if (res.data) {
-          this.$set(this.form, "projectId", res.data.projectId);
-          this.handleSelectProject(res.data.projectId);
-        }
-      });
-    } else {
-      this.handleSelectProject(this.form.projectId);
-    }
-    this.isModify = this.taskName != '结算发起' && this.taskName != '经营发展部校核' && this.taskName != '分管审核'
+    this.isModify = this.taskName != '结算发起' && this.taskName != '分管审核'
   },
   methods: {
     // 初始化表单
@@ -429,7 +447,6 @@ export default {
           settleWorkResponse,
           settleSummaryResponse
         ] = await Promise.all([
-          getProject(res.rows[0].projectId),
           listSettleWork({ settleId: settleId, pageSize: 30 }),
           listSettleSummary({ settleId })
         ]);
@@ -488,19 +505,7 @@ export default {
 
     // 获取当前处理人
     getCurrentUser() {
-      if (this.taskName == "综合事务部处理") {
-        this.form.zhUserName = this.$store.state.user.name;
-        this.form.zhUserId = this.$store.state.user.id;
-        this.form.zhTime = parseTime(new Date(), "{y}-{m}-{d}");
-      } else if (this.taskName == "技术质量部审核") {
-        this.form.jsUserName = this.$store.state.user.name;
-        this.form.jsUserId = this.$store.state.user.id;
-        this.form.jsTime = parseTime(new Date(), "{y}-{m}-{d}");
-      } else if (this.taskName == "经营发展部校核") {
-        this.form.jyUserName = this.$store.state.user.name;
-        this.form.jyUserId = this.$store.state.user.id;
-        this.form.jyTime = parseTime(new Date(), "{y}-{m}-{d}");
-      } else if (this.taskName == "分管审核") {
+      if (this.taskName == "分管审核") {
         this.form.managerUserName = this.$store.state.user.name;
         this.form.managerUserId = this.$store.state.user.id;
         this.form.managerTime = parseTime(new Date(), "{y}-{m}-{d}");
@@ -513,17 +518,6 @@ export default {
     },
     // 获取审核人
     getReviewerName() {
-      if (this.form.zhUserId) {
-        this.form.zhUserName = this.getUserName(this.form.zhUserId)
-      }
-      if (this.form.jsUserId) {
-        this.form.jsUserName = this.getUserName(this.form.jsUserId)
-      }
-      if (this.form.jyUserId) {
-        getUser(this.form.jyUserId).then((res) => {
-          this.form.jyUserName = res.data.nickName;
-        });
-      }
       if (this.form.managerUserId) {
         getUser(this.form.managerUserId).then((res) => {
           this.form.managerUserName = res.data.nickName;
@@ -557,27 +551,14 @@ export default {
       this.$refs["settleForm"].validate((vaild) => {
         if (vaild) {
           this.preserve();
-          if (this.taskName == "结算发起") {
-            this.$confirm('结算合计总金额大于了预算内项目结算总金额，将走《超预算或预算外支付（报销）》流程', '提示', {
-              confirmButtonText: '确定',
-              type: 'warning'
-            }).then(() => {
-              getUserByRole({ roleId: 4 }).then((res) => {
-                this.getNextFlowNodeFn(res.data[0]);
-              });
-            })
-          } else if (this.taskName == "综合事务部处理") {
-            this.getNextFlowNodeFn(null, 109, false);
-          } else if (this.taskName == "技术质量部审核") {
-            this.getNextFlowNodeFn(null, 105, true);
-          } else if (this.taskName == "经营发展部校核") {
+          if (this.taskName == "结算发起") {            
             this.getNextFlowNodeFn(null, this.deptId, true);
           } else if (this.taskName == "分管审核") {
             getUserByPost({ postName: "总经理" }).then((res) => {
               this.getNextFlowNodeFn(res.data[0].userId);
             });
           } else if (this.taskName == "总经理审批") {
-              this.getNextFlowNodeFn();            
+            this.getNextFlowNodeFn();
           }
 
         } else {
@@ -619,15 +600,6 @@ export default {
         this.$emit('goBack');
       })
     },
-    // 查询项目列表
-    getProjectList() {
-      listProject({
-        pageNum: 1,
-        pageSize: 99999999,
-      }).then((response) => {
-        this.projectList = response.rows;
-      });
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -636,31 +608,6 @@ export default {
       }
       return true;
     },
-    // 获取合同
-    getContractDataList() {
-      listProjectContract({ projectId: this.taskForm.formId }).then((res) => {
-        if (res.rows) {
-          for (let row of res.rows) {
-            getContract(row.contractId).then((res) => {
-              if (res.data) {
-                if (this.form.contractCode != "") {
-                  this.form.contractCode =
-                    this.form.contractCode + "、" + res.data.contractCode;
-                } else {
-                  this.form.contractCode = res.data.contractCode;
-                }
-                if (this.form.contractNumber != "") {
-                  this.form.contractNumber =
-                    this.form.contractNumber + "、" + res.data.contractNumber;
-                } else {
-                  this.form.contractNumber = res.data.contractNumber;
-                }
-              }
-            });
-          }
-        }
-      });
-    },
     addWorkList() {
       this.settleWorkList.push({
         content: "",

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

@@ -117,6 +117,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId: null,
+        xmName: ' ',
         workloadReport: null,
         reporter: null,
         reportTime: null,
@@ -186,6 +187,7 @@ export default {
       this.form = {
         settleId: null,
         projectId: null,
+        xmName: ' ',
         workloadReport: null,
         reporter: null,
         reportTime: null,

oa-ui/src/views/oa/settle/other.vue

@@ -1,13 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
-          <el-option v-for="project in projectList" :key="project.projectId"
-            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
-          </el-option>
-        </el-select>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="其他项目名称" prop="xmName">
+        <el-input v-model="queryParams.xmName" placeholder="请输入其他项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="上报人" prop="reporter">
         <el-select v-model="queryParams.reporter" filterable clearable @change="handleQuery">
@@ -48,8 +43,7 @@
 
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <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="xmName" />
       <el-table-column label="上报人" align="center" prop="reporter">
         <template slot-scope="scope">
           {{ getUserName(scope.row.reporter) }}
@@ -79,7 +73,7 @@
 
     <!-- 添加或修改cmc结算审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
-      <settle-form :taskForm="taskForm" :taskName="''" :flowDisabled="false" :disabled="true"></settle-form>
+      <settle-other :taskForm="taskForm" :taskName="''" :flowDisabled="false" :disabled="true"></settle-other>
     </el-dialog>
   </div>
 </template>
@@ -87,10 +81,10 @@
 <script>
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
 import { listProject } from '@/api/oa/project/project';
-import settleForm from '../../flowable/form/settleForm.vue';
+import settleOther from '../../flowable/form/settleOther.vue';
 
 export default {
-  components: { settleForm },
+  components: { settleOther },
   name: "Settle",
   data() {
     return {
@@ -116,7 +110,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        projectId: null,
+        projectId: '0',
+        xmName: null,
         workloadReport: null,
         reporter: null,
         reportTime: null,
@@ -185,7 +180,8 @@ export default {
     reset() {
       this.form = {
         settleId: null,
-        projectId: null,
+        projectId: '0',
+        xmName: null,
         workloadReport: null,
         reporter: null,
         reportTime: null,