新增合同统计

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

@@ -159,30 +159,21 @@ public class CmcContractController extends BaseController
         JSONObject jsonObject = new JSONObject();
         List<CmcContract> cmcContractList = cmcContractService.selectCmcContractStatistic();
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(cmcContractList));
-        if (field.equals("")) {
+        if (field == null || field.equals("")) {
             jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("amount")) {
-            jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("amount").subtract(((JSONObject)a).getBigDecimal("amount")).intValue());
-            jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("amount")) {
+        }else if (field.equals("amount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("amount").subtract(((JSONObject)a).getBigDecimal("amount")).intValue());
             jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("subAmount")) {
+        }else if (field.equals("subAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("subAmount").subtract(((JSONObject)a).getBigDecimal("subAmount")).intValue());
             jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("budgetAmount")) {
+        }else if (field.equals("budgetAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("budgetAmount").subtract(((JSONObject)a).getBigDecimal("budgetAmount")).intValue());
             jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("borrowAmount")) {
+        }else if (field.equals("borrowAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("borrowAmount").subtract(((JSONObject)a).getBigDecimal("borrowAmount")).intValue());
             jsonObject.put("sort", jsonArray);
-        }
-        if (field.equals("settleAmount")) {
+        }else if (field.equals("settleAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("settleAmount").subtract(((JSONObject)a).getBigDecimal("settleAmount")).intValue());
             jsonObject.put("sort", jsonArray);
         }

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

@@ -219,6 +219,15 @@ public class CmcContract extends BaseEntity
     {
         return projectSource;
     }
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
     public void setPartyAId(String partyAId)
     {
         this.partyAId = partyAId;
@@ -228,6 +237,15 @@ public class CmcContract extends BaseEntity
     {
         return partyAId;
     }
+    public void setPartyAName(String partyAName)
+    {
+        this.partyAName = partyAName;
+    }
+
+    public String getPartyAName()
+    {
+        return partyAName;
+    }
     public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;

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

@@ -105,6 +105,8 @@
             <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
         </where>
         group by c.contract_id
         order by c.draft_time desc

oa-ui/src/api/oa/contract/contract.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-19 14:46:44
+ */
 import request from '@/utils/request'
 
 // 查询cmc合同评审列表
@@ -45,9 +51,17 @@ export function delContract(contractId) {
 
 
 // 合同统计
-export function getContractStatistic(query) {
+export function getContractStatistic(contractId) {
   return request({
-    url: '/oa/contract/statistic',
+    url: '/oa/contract/statistic/' + contractId,
+    method: 'get',
+  })
+}
+
+// 合同排序
+export function getContractStatisticSortByField(query) {
+  return request({
+    url: '/oa/contract/sort',
     method: 'get',
     params: query
   })

oa-ui/src/assets/icons/svg/FilterSort.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M2.57 3h18.86l-6.93 9.817V21h-5v-8.183zm3.86 2l5.07 7.183V19h1v-6.817L17.57 5zm11.952 12.351L20 18.974l1.618-1.623l1.416 1.412L20 21.806l-3.034-3.042zm-.002-.714L20 15.015l1.619 1.622l1.415-1.414L20 12.185l-3.034 3.038z"/></svg>

oa-ui/src/views/contractStatistic/components/borrowStatistic.vue

@@ -0,0 +1,150 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-12-16 17:29:35
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-19 14:29:55
+-->
+<template>
+  <div>
+    <div class="text-center header">
+      <span>借款列表</span>
+    </div>
+    <div class="content">
+      <el-table v-loading="loading" :data="borrowList" height="350px">
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+        <el-table-column label="借款人" align="center" prop="applier">
+          <template slot-scope="scope">
+            {{ getUserName(scope.row.applier) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="核准金额" align="center" prop="managerAmount" />
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="rowClickFn(scope.row)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="mt10 mr20 text-right footer">
+        <span class="mr20">共{{ total }}个借款申请</span>
+        <span>借款总额：{{ sumAmount.toFixed(2) }}</span>
+      </div>
+    </div>
+    <el-dialog title="借款明细" :visible.sync="infoOpen" width="50%" append-to-body>
+      <borrow-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></borrow-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import borrowData from '../../flowable/form/inProgress/borrowData.vue';
+import BorrowForm from '../../flowable/form/finance/borrowForm.vue';
+export default {
+  components: { borrowData, BorrowForm },
+  props: {
+    projectId: {
+      type: Array,
+      default: []
+    },
+    contractId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      borrowList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 999,
+        projectId: null,
+      },
+      total: 0,
+      loading: true,
+      sumAmount: 0,
+      infoOpen: false,
+      taskForm: {
+        formId: '',
+        procDefName: '借款审批'
+      }
+    }
+  },
+  watch: {
+    projectId: {
+      handler(newVal) {
+        this.getList(newVal);
+      },
+      deep: true
+    },
+    contractId() {
+      if (this.projectId.length == 0) {
+        this.init();
+      }
+    },
+    sumAmount(val){
+      this.$emit('getSumAmount',val)
+    }
+  },
+  created() {
+    if (this.projectId.length == 0) {
+      this.init();
+    }
+  },
+  methods: {
+    async getList(projectId) {
+      this.loading = true
+      if (projectId.length != 0) {
+        this.borrowList = []
+        this.sumAmount = 0
+        this.total = 0
+        for (let id of projectId) {
+          let res = await listBorrow({ pageSize: 999, projectId: id })
+          if (res.total > 0) {
+            res.rows.map(item => this.borrowList.push(item));
+            this.total = this.total + res.total;
+          }
+        }
+        this.sumAmount = this.borrowList.reduce((sum, item) => sum + item.managerAmount, 0)
+      } else {
+        this.init();
+      }
+      this.loading = false
+    },
+    init() {
+      this.borrowList = []
+      this.total = 0
+      this.sumAmount = 0
+      this.loading = false
+    },
+    rowClickFn(row) {
+      console.log(row);
+
+      this.taskForm.formId = row.borrowId
+      this.infoOpen = true;
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+  position: relative;
+
+  .info {
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.footer {
+  font-size: 14px;
+  font-family: 'puhuiti';
+}
+
+.content {}
+</style>

oa-ui/src/views/contractStatistic/components/budgetStatistic.vue

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <div class="text-center header">
+      预算列表
+    </div>
+    <el-table v-loading="loading" :data="budgetList" height="350px">
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="编制人" align="center" prop="compiler">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.compiler) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="预算总额" align="center" prop="totalBudget" />
+    </el-table>
+    <div class="mt10 mr20 text-right footer">
+      <span class="mr20">共{{ total }}个预算申请</span>
+      <span>预算总额：{{ sumAmount.toFixed(2) }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
+export default {
+  props: {
+    projectId: {
+      type: Array,
+      default: []
+    },
+    contractId: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    projectId: {
+      handler(newVal) {
+        this.getList(newVal)
+      },
+      deep: true
+    },
+    contractId() {
+      if (this.projectId.length == 0) {
+        this.budgetList = []
+        this.total = 0
+        this.sumAmount = 0
+        this.loading = false
+      }
+    },
+    sumAmount(val){
+      this.$emit('getSumAmount',val)
+    }
+  },
+  created() {
+    if (this.projectId.length == 0) {
+      this.budgetList = []
+      this.total = 0
+      this.sumAmount = 0
+      this.loading = false
+    }
+  },
+  data() {
+    return {
+      budgetList: [],
+      total: 0,
+      loading: true,
+      sumAmount: 0,
+    }
+  },
+  methods: {
+    async getList(projectId) {
+      this.loading = true
+      if (projectId.length != 0) {
+        this.budgetList = []
+        this.sumAmount = 0
+        this.total = 0
+        for (let id of projectId) {
+          let res = await listBudget({ pageSize: 99, projectId: id })
+          if (res.total > 0) {
+            res.rows.map(item => this.budgetList.push(item));
+            this.total = this.total + res.total;
+          } else {
+            this.budgetList = []
+            this.total = 0
+            this.sumAmount = 0
+          }
+        }
+        this.sumAmount = this.budgetList.reduce((sum, item) => sum + item.totalBudget, 0)
+      } else {
+        this.budgetList = []
+        this.total = 0
+        this.sumAmount = 0
+      }
+      this.loading = false
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+  position: relative;
+  .info{
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.footer {
+  font-size: 14px;
+  font-family: 'puhuiti';
+}
+</style>

oa-ui/src/views/contractStatistic/components/projectStatistic.vue

@@ -0,0 +1,104 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-12-17 10:32:27
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-19 16:25:46
+-->
+<template>
+  <div>
+    <div class="text-center header">
+      项目列表
+    </div>
+    <el-table v-loading="loading" :data="projectList" height="220px">
+      <el-table-column type="index" width="50"></el-table-column>
+      <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+      <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" show-overflow-tooltip />
+      <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" />
+      <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
+        width="120px" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="rowClickFn(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body @close="closeDrawerFn">
+      <projectInfo :needReturn="false"></projectInfo>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject, listProjectFuzzy, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import projectInfo from '@/views/oa/project/info'
+export default {
+  components:{projectInfo},
+  props: {
+    projectId: {
+      type: Array,
+    },
+    contractId: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    projectId: {
+      handler(newVal) {
+        this.loading = true
+        this.projectList = []
+        for (let i of newVal) {
+          this.getList(i)
+        }
+        this.total = this.projectList.length;
+        this.loading = false
+      },
+      deep: true
+    },
+    contractId() {
+      if (this.projectId.length == 0) {
+        this.projectList = []
+        this.loading = false
+      }
+    }
+  },
+  created() {
+    if (this.projectId.length == 0) {
+      this.loading = false
+      this.projectList = []
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      projectList: [],
+      total: 0,
+      drawerOpen: false,
+    }
+  },
+  methods: {
+    async getList(projectId) {
+      let res = await getProject(projectId)
+      if (res.data)
+        this.projectList.push(res.data)
+    },
+    rowClickFn(row) {
+      this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
+      this.drawerOpen = true;
+    },
+    closeDrawerFn(){
+      console.log(1);
+      
+      this.$router.replace({ path: '/statistics/contractStatistic' }); 
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+}
+</style>

oa-ui/src/views/contractStatistic/components/settleStatistic.vue

@@ -0,0 +1,148 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-12-16 17:33:33
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-19 14:29:29
+-->
+<template>
+  <div>
+    <div class="text-center header">
+      结算列表
+    </div>
+    <el-table v-loading="loading" :data="settleList" height="350px">
+      <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="reporter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.reporter) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="结算金额" align="center" prop="amount" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="rowClickFn(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="mt10 mr20 text-right footer">
+      <span class="mr20">共{{ total }}个结算申请</span>
+      <span>结算总额：{{ sumAmount.toFixed(2) }}</span>
+    </div>
+    <el-dialog title="结算明细" :visible.sync="infoOpen" width="70%" append-to-body>
+      <settle-form :taskForm="taskForm" :taskName="''" :flowDisabled="false" :disabled="true"></settle-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listSettleSummary, getSettleSummary, delSettleSummary, addSettleSummary, updateSettleSummary } from "@/api/oa/settle/settleSummary";
+import settleForm from '../../flowable/form/settleForm.vue';
+export default {
+  components: { settleForm },
+  props: {
+    projectId: {
+      type: Array,
+      default: []
+    },
+    contractId: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    projectId: {
+      handler(newVal) {
+        this.getList(newVal)
+        if (this.projectId.length == 0) {
+          this.settleList = []
+          this.total = 0
+          this.sumAmount = 0
+          this.loading = false
+        }
+      },
+      deep: true
+    },
+    contractId() {
+      if (this.projectId.length == 0) {
+        this.settleList = []
+        this.total = 0
+        this.sumAmount = 0
+        this.loading = false
+      }
+    },
+    sumAmount(val) {
+      this.$emit('getSumAmount', val)
+    }
+  },
+  created() {
+    if (this.projectId.length == 0) {
+      this.settleList = []
+      this.total = 0
+      this.sumAmount = 0
+      this.loading = false
+    }
+  },
+  data() {
+    return {
+      settleList: [],
+      total: 0,
+      loading: true,
+      sumAmount: 0,
+      infoOpen: false,
+      taskForm: {
+        formId: ''
+      }
+    }
+  },
+  methods: {
+    async getList(projectId) {
+      this.loading = true
+      if (projectId.length != 0) {
+        this.settleList = []
+        this.sumAmount = 0
+        this.total = 0
+        for (let id of projectId) {
+          let res = await listSettle({ pageSize: 999, projectId: id });
+          if (res.total > 0) {
+            res.rows.map(item => this.settleList.push(item));
+            this.total = this.total + res.total;
+          }
+        }
+        for (let settle of this.settleList) {
+          let resData = await listSettleSummary({ pageSize: 999, settleId: settle.settleId, content: '实际结算总金额' });
+          if (resData.total > 0) {
+            this.$set(settle, 'amount', resData.rows[0].amount)
+          }
+        }
+        this.sumAmount = this.settleList.reduce((sum, item) => sum + item.amount, 0)
+      }
+      this.loading = false
+    },
+    rowClickFn(row) {
+      this.taskForm.formId = row.settleId;
+      this.infoOpen = true;
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+  position: relative;
+
+  .info {
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.footer {
+  font-size: 14px;
+  font-family: 'puhuiti';
+}
+</style>

oa-ui/src/views/contractStatistic/components/subStatistic.vue

@@ -0,0 +1,83 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-12-16 10:42:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-18 15:38:24
+-->
+<template>
+  <div>
+    <div class="text-center header">分包合同列表</div>
+    <el-table :data="subContractList" v-loading="loading" :height="220">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="分包合同名称" prop="subContractName"></el-table-column>
+      <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
+      <el-table-column label="分包合同金额" align="center" prop="subAmount" />
+    </el-table>
+    <div class="mt10 mr20 text-right footer">
+      <span class="mr20">共{{ total }}个分包合同</span>
+      <span>分包合同额合计：{{ subAmount }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import { listContractSubcontract, delContractSubcontract, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
+export default {
+  props: {
+    contract: {
+      type: Object,
+      default: {}
+    }
+  },
+  data() {
+    return {
+      subContractList: [],
+      loading: true,
+      total: 0,
+      subAmount:0
+    }
+  },
+  watch: {
+    contract: {
+      handler() {
+        this.getList()
+      },
+      deep: true
+    },
+    subAmount(val){
+      this.$emit('getSumAmount',val)
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    getList() {
+      this.subContractList = []
+      this.loading = true;
+      listContractSubcontract({ pageNum: 1, pageSize: 999, contractId: this.contract.contractId }).then(async res => {
+        let subContractIds = res.rows.map(item => item.subContractId)
+        for (let id of subContractIds) {
+          let resData = await getSubContract(id);
+          this.subContractList.push(resData.data);
+        }
+        this.subAmount = this.subContractList.reduce((sum,item)=>sum + item.subAmount,0)
+        this.total = this.subContractList.length;
+        this.loading = false;
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+}
+.footer{
+  font-size: 14px;
+  font-family: 'puhuiti';
+}
+</style>

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

@@ -0,0 +1,378 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-12-16 10:25:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-19 16:16:51
+-->
+<template>
+  <div class="app-container">
+    <el-row :gutter="10">
+      <!-- 承接合同 -->
+      <el-col :span="6" class="border">
+        <div class="text-center header">承接合同列表
+          <div class="sort-btn">
+            <el-dropdown trigger="click" @command="handleCommand">
+              <span style="color:#000;font-size:20px;">
+                <svg-icon icon-class="FilterSort"></svg-icon>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="">按拟稿日期</el-dropdown-item>
+                <el-dropdown-item command="amount">按主合同额</el-dropdown-item>
+                <el-dropdown-item command="subAmount">按分包合同额</el-dropdown-item>
+                <el-dropdown-item command="borrowAmount">按借款额</el-dropdown-item>
+                <el-dropdown-item command="settleAmount">按结算额</el-dropdown-item>
+                <el-dropdown-item command="budgetAmount">按预算额</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+          </div>
+        </div>
+        <div class="query-box">
+          <el-input placeholder="请输入内容" v-model="queryInput" clearable class="input-with-select"
+            @keyup.enter.native="queryContract()">
+            <el-select v-model="queryParams.type" slot="prepend" placeholder="请选择" @change="initType()">
+              <el-option label="合同名称" value="contractName"></el-option>
+              <el-option label="甲方单位" value="partyAName"></el-option>
+              <el-option label="合同编码" value="contractCode"></el-option>
+              <el-option label="项目名称" value="projectName"></el-option>
+            </el-select>
+            <el-button slot="append" icon="el-icon-search" @click="queryContract()"></el-button>
+          </el-input>
+        </div>
+        <el-scrollbar view-style="overflow-x:hidden;" :style="{ height: contractHeight + 'px' }">
+          <div v-loading="loading">
+            <div class="flex align-center box-item">
+              <div class="name">
+                <span><b><i class="el-icon-star-on"></i>合同名称</b> ({{ total }})</span>
+              </div>
+              <div>
+                <div class="text-center"><b>{{ sortByField() }}</b></div>
+              </div>
+              <div class="text-right pl-5"><i class="el-icon-star-on"></i></div>
+            </div>
+            <div class="flex align-center box-item" :class="{ isActive: item.contractId == contract.contractId }"
+              v-for="item in contractList" :key="item.contractId" @click="handleClickContract(item)">
+              <div class="name">
+                <span>{{ item.contractName }}</span>
+              </div>
+              <div>
+                <el-tag>{{ setAmountByFieId(item).toFixed(2) }}</el-tag>
+              </div>
+              <div class="text-right pl-5"><i class="el-icon-d-arrow-right"></i></div>
+            </div>
+          </div>
+        </el-scrollbar>
+        <div class="text-right pagination">
+          <el-pagination small layout="sizes,prev, pager, next" :total="total" :current-page.sync="queryParams.pageNum"
+            :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize" @size-change="handleSizeChange"
+            @current-change="changePage()"></el-pagination>
+        </div>
+      </el-col>
+      <el-col :span="18">
+        <el-breadcrumb class="pl-5" separator-class="el-icon-arrow-right">
+          <el-breadcrumb-item>当前选择合同</el-breadcrumb-item>
+          <el-breadcrumb-item>{{ contract.contractName }}</el-breadcrumb-item>
+        </el-breadcrumb>
+        <div class="pl-5 contract-info">
+          <span class="info-title">甲方单位：</span><span class="mr20">{{ contract.partyA ? contract.partyA.partyAName : ''
+            }}</span>
+          <span class="info-title">合同编码：</span><span class="mr20">{{ contract.contractCode }}</span>
+          <span class="info-title">合同额：</span><span class="mr20">{{ contract.amount }}</span>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="12" class="border">
+            <project-statistic :projectId="projectIds" :contractId="contract.contractId"></project-statistic>
+          </el-col>
+          <el-col :span="12">
+            <!-- 分包合同 -->
+            <sub-statistic :contract="contract"></sub-statistic>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <el-row :gutter="10">
+          <el-col :span="7" class="border">
+            <borrow-statistic :projectId="projectIds" :contractId="contract.contractId"></borrow-statistic>
+          </el-col>
+          <el-col :span="7" class="border">
+            <settle-statistic :projectId="projectIds" :contractId="contract.contractId"></settle-statistic>
+          </el-col>
+          <el-col :span="7" class="border">
+            <budget-statistic :projectId="projectIds" :contractId="contract.contractId"></budget-statistic>
+          </el-col>
+          <el-col :span="3">
+            <div class="text-center header">统计</div>
+            <div class="pr-5 pl-5">
+              <div class="title">主合同额</div>
+              <div class="amount text-right">{{ contract.amount ? contract.amount.toFixed(2) : '0.00' }}</div>
+              <div class="title">分包合同额</div>
+              <div class="amount text-right">{{ subContractAmount.toFixed(2) }}</div>
+              <div class="title">合同额差值</div>
+              <div class="amount text-right border-bottom">{{ (contract.amount - subContractAmount).toFixed(2) }}</div>
+              <!-- <el-divider></el-divider> -->
+              <div class="title">借款总额</div>
+              <div class="amount text-right">{{ borrowSumAmount.toFixed(2) }}</div>
+              <div class="title">结算总额</div>
+              <div class="amount text-right border-bottom">{{ settleSumAmount.toFixed(2) }}</div>
+              <div class="title">合同额与结算差值</div>
+              <div class="amount text-right">{{ ((contract.amount - subContractAmount) - settleSumAmount).toFixed(2) }}
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import { listContract, getContractStatisticSortByField, getContractStatistic } from "@/api/oa/contract/contract";
+import { listProjectContract } from "@/api/oa/contract/projectContract";
+import SubStatistic from './components/subStatistic.vue';
+import BorrowStatistic from "./components/borrowStatistic.vue";
+import BudgetStatistic from './components/budgetStatistic.vue';
+import SettleStatistic from './components/settleStatistic.vue';
+import ProjectStatistic from './components/projectStatistic.vue';
+export default {
+  components: { SubStatistic, BorrowStatistic, BudgetStatistic, SettleStatistic, ProjectStatistic },
+  data() {
+    return {
+      contractList: [],
+      queryInput: '',
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        contractName: '',
+        partyAName: '',
+        contractCode: '',
+        projectName: '',
+        type: 'contractName'
+      },
+      total: 0,
+      loading: true,
+      contractHeight: 675,
+      contract: {},
+      projectIds: [],
+      subContractAmount: 0,
+      borrowSumAmount: 0,
+      settleSumAmount: 0,
+      budgetSumAmount: 0,
+      status: 'normal',
+      field: '',
+    }
+  },
+  created() {
+    this.getContractList();
+  },
+  mounted() {
+    this.initHeight();// 添加事件监听器，以便在窗口大小改变时更新高度
+  },
+  methods: {
+    initHeight() {
+      this.contractHeight = window.innerHeight - 250;
+    },
+    getContractList() {
+      this.loading = true;
+      this.status = 'normal'
+      listContract(this.queryParams).then(res => {
+        this.contractList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+        if (res.total != 0) {
+          this.contract = this.contractList[0];
+          this.getContractProject(this.contract.contractId);
+        }
+      })
+    },
+    handleCommand(command) {
+      this.sortFn(command)
+    },
+    sortFn(field) {
+      this.loading = true
+      this.status = 'sort'
+      this.field = field
+      getContractStatisticSortByField({ field }).then(res => {
+        let list = res.data.sort;
+        let a = list.slice((this.queryParams.pageNum - 1) * this.queryParams.pageSize, this.queryParams.pageNum * this.queryParams.pageSize);
+        this.contractList = a;
+        this.loading = false;
+      })
+    },
+    sortByField() {
+      switch (this.field) {
+        case '':
+          return '合同金额'
+        case 'amount':
+          return '合同金额'
+        case 'subAmount':
+          return '分包合同金额'
+        case 'budgetAmount':
+          return '预算金额'
+        case 'borrowAmount':
+          return '借款金额'
+        case 'settleAmount':
+          return '结算金额'
+        default:
+          break;
+      }
+    },
+    setAmountByFieId(item) {
+      switch (this.field) {
+        case '':
+          return item.amount
+        case 'amount':
+          return item.amount
+        case 'subAmount':
+          return item.subAmount ? item.subAmount : 0
+        case 'budgetAmount':
+          return item.budgetAmount
+        case 'borrowAmount':
+          return item.borrowAmount
+        case 'settleAmount':
+          return item.settleAmount
+        default:
+          break;
+      }
+    },
+    changePage() {
+      if (this.status == 'normal') {
+        this.getContractList();
+      } else {
+        this.sortFn(this.field);
+      }
+    },
+    getStatistic(contractId) {
+      getContractStatistic(contractId).then(res => {
+        console.log(res);
+        this.subContractAmount = res.data.subAmount
+        this.budgetSumAmount = res.data.budgetAmount
+        this.borrowSumAmount = res.data.borrowAmount
+        this.settleSumAmount = res.data.settleAmount
+      })
+    },
+    async getContractProject(contractId) {
+      let res = await listProjectContract({ contractId })
+      if (res.total > 0) {
+        this.projectIds = res.rows.map(item => item.projectId)
+      } else {
+        this.projectIds = []
+
+      }
+    },
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.getContractList();
+    },
+    queryContract() {
+      const type = this.queryParams.type
+      this.field = ''
+      this.queryParams[type] = this.queryInput;
+      this.getContractList();
+    },
+    initType() {
+      this.queryParams.contractName = '';
+      this.queryParams.partyAName = '';
+      this.queryParams.contractCode = '';
+      this.queryParams.projectName = '';
+    },
+    async handleClickContract(val) {
+      this.contract = val;
+      await this.getContractProject(val.contractId);
+      this.getStatistic(val.contractId);
+      this.subContractAmount = 0
+      this.borrowSumAmount = 0
+      this.settleSumAmount = 0
+      this.budgetSumAmount = 0
+    },
+    // getSubContractAmount(amount) {
+    //   this.subContractAmount = amount
+    // },
+    // getBorrowSumAmount(amount) {
+    //   this.borrowSumAmount = amount
+    // },
+    // getSettleSumAmount(amount) {
+    //   this.settleSumAmount = amount
+    // },
+    // getBudgetSumAmount(amount) {
+    //   this.budgetSumAmount = amount
+    // },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-family: 'puhuiti';
+  font-size: 18px;
+  line-height: 30px;
+  position: relative;
+
+  .sort-btn {
+    cursor: pointer;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+
+.border {
+  border-right: 1px solid #ebeef5;
+}
+
+.border-bottom {
+  padding: 5px 0;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.box-item {
+  cursor: pointer;
+  font-size: 14px;
+  margin: 10px 0;
+  border-top: 1px solid #ebeef5;
+  padding: 5px;
+}
+
+.name {
+  flex: 2;
+}
+
+.box-item:hover {
+  color: var(--current-color);
+}
+
+.isActive {
+  color: var(--current-color);
+}
+
+.pagination {
+  border-top: 1px solid #ebeef5;
+  padding: 20px 0 0;
+}
+
+.contract-info {
+  font-size: 14px;
+  color: #606266;
+
+  .info-title {
+    font-weight: bold;
+    font-family: 'puhuiti';
+  }
+}
+
+::v-deep.el-select .el-input {
+  width: 110px;
+}
+
+.title {
+  font-family: '微软雅黑';
+  color: #606266;
+  line-height: 30px;
+}
+
+.amount {
+  font-family: 'puhuiti';
+}
+</style>
+<style>
+.el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+</style>

oa-ui/src/views/flowable/form/components/print/settlePrint.vue

@@ -95,6 +95,12 @@
           <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.zhUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.zhTime }}</td>
         </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">综合事务部(车辆排班情况)</td>
+          <td :colspan="4" class="conment-width">{{ form.jsbComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jsbUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jsbTime }}</td>
+        </tr>
         <tr>
           <td :colspan="2" class="fontbold">技术质量与安全部(质量及工作量)</td>
           <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-10 13:45:36
+ * @LastEditTime: 2024-12-19 15:25:32
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -165,16 +165,16 @@
           <el-form-item label-width="60px">
             <table border="1">
               <tr>
-                <td style="width: 50px">序号</td>
-                <td style="width: 180px">工作内容</td>
-                <td style="width: 100px">等级或比例尺</td>
-                <td style="width: 100px">单位</td>
-                <td style="width: 100px">地类</td>
-                <td style="width: 100px">单价</td>
+                <td style="width:50px;">序号</td>
+                <td style="min-width:140px">工作内容</td>
+                <td style="min-width:80px">等级或比例尺</td>
+                <td style="min-width:80px">单位</td>
+                <td style="min-width:80px">地类</td>
+                <td style="min-width:80px">单价</td>
                 <td>工作量</td>
-                <td style="width: 117px">其他系数</td>
-                <td style="width: 100px">项目经费</td>
-                <td>备注</td>
+                <td style="min-width:80px">其他系数</td>
+                <td style="min-width:80px">项目经费</td>
+                <td style="min-width:200px;">备注</td>
                 <td>操作</td>
               </tr>
               <tr v-for="(work, index) in settleWorkList" :key="index">
@@ -367,6 +367,23 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-form-item label="综合事务部(车辆排班情况)">
+              <el-input v-model="form.jsbComment" type="textarea" :disabled="taskName != '综合事务部驾驶班处理'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
+              </el-input>
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px">
+                  <span class="auditor"> {{ form.jsbUserName ? form.jsbUserName : getUserName(form.jsbUserId) }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px">
+                  <span> {{ form.jsbTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item label="技术质量与安全部(质量及工作量)">
               <el-input v-model="form.jsComment" type="textarea" :disabled="taskName != '技术质量与安全部审核'" clearable
                 :autosize="{ minRows: 4, maxRows: 10 }">
@@ -460,7 +477,9 @@
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
-          <el-button type="danger" v-if="taskName == '经营发展部校核' || taskName == '分管审核' || taskName == '总经理审批' || taskName == '董事长批准'" @click="returnOpen = true">退 回</el-button>
+          <el-button type="danger"
+            v-if="taskName == '经营发展部校核' || taskName == '分管审核' || taskName == '总经理审批' || taskName == '董事长批准'"
+            @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提交下一个流程</el-button>
           <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
         </div>
@@ -777,7 +796,13 @@ export default {
         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 == "技术质量与安全部审核") {
+      }
+      else if (this.taskName == "综合事务部驾驶班处理") {
+        this.form.jsbUserName = this.$store.state.user.name;
+        this.form.jsbUserId = this.$store.state.user.id;
+        this.form.jsbTime = 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}");
@@ -831,8 +856,13 @@ export default {
               });
             })
           } else if (this.taskName == "综合事务部处理") {
+            getUserByRole({ roleId: 5 }).then((res) => {
+              this.getNextFlowNodeFn(res.data[1]);
+            });
+          } else if (this.taskName == "综合事务部驾驶班处理") {
             this.getNextFlowNodeFn(null, 109, false);
-          } else if (this.taskName == "技术质量与安全部审核") {
+          }
+          else if (this.taskName == "技术质量与安全部审核") {
             this.getNextFlowNodeFn(null, 105, true);
           } else if (this.taskName == "经营发展部校核") {
             this.getNextFlowNodeFn(null, this.deptId, true);
@@ -953,7 +983,6 @@ export default {
       });
     },
     deletWorkItem(index, arr) {
-      // let arr = this.settleWorkList;
       if (arr.length == 1) {
         return;
       }
@@ -965,7 +994,7 @@ export default {
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
-      if (sum < 600 && sum != 0) {
+      if (sum < 600 && sum != 0 && work.priceId != 147) {
         this.$message.warning('不足600，按600算')
         work.remark = '不足600，按600算'
         sum = 600