修改项目结算、借款审批的金额需在预算内

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

@@ -89,9 +89,9 @@ public class CmcBrandProjectProgressController extends BaseController
      * 删除cmc品牌项目进度
      */
     @Log(title = "cmc品牌项目进度", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{progressIds}")
-    public AjaxResult remove(@PathVariable Long[] progressIds)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return success(cmcBrandProjectProgressService.deleteCmcBrandProjectProgressByProgressIds(progressIds));
+        return success(cmcBrandProjectProgressService.deleteCmcBrandProjectProgressByProgressIds(projectIds));
     }
 }

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

@@ -33,11 +33,11 @@ public class CmcSettleWork extends BaseEntity
 
     /** 工作量 */
     @Excel(name = "工作量")
-    private Long workload;
+    private Double workload;
 
     /** 系数 */
     @Excel(name = "系数")
-    private Long coefficient;
+    private Double coefficient;
 
     /** 地类 */
     @Excel(name = "地类")
@@ -51,70 +51,69 @@ public class CmcSettleWork extends BaseEntity
     {
         this.workId = workId;
     }
-
     public Long getWorkId()
     {
         return workId;
     }
+
     public void setSettleId(String settleId) 
     {
         this.settleId = settleId;
     }
-
     public String getSettleId() 
     {
         return settleId;
     }
+
     public void setContent(String content) 
     {
         this.content = content;
     }
-
     public String getContent() 
     {
         return content;
     }
+
     public void setPriceId(Long priceId) 
     {
         this.priceId = priceId;
     }
-
-    public Long getPriceId() 
+    public Long getPriceId()
     {
         return priceId;
     }
-    public void setWorkload(Long workload) 
+
+    public void setWorkload(Double workload)
     {
         this.workload = workload;
     }
-
-    public Long getWorkload() 
+    public Double getWorkload()
     {
         return workload;
     }
-    public void setCoefficient(Long coefficient) 
+
+    public void setCoefficient(Double coefficient)
     {
         this.coefficient = coefficient;
     }
-
-    public Long getCoefficient() 
+    public Double getCoefficient()
     {
         return coefficient;
     }
+
     public void setGroundType(String groundType) 
     {
         this.groundType = groundType;
     }
-
     public String getGroundType() 
     {
         return groundType;
     }
+
     public void setSettle(BigDecimal settle) 
     {
         this.settle = settle;
     }
-
     public BigDecimal getSettle() 
     {
         return settle;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcBrandProjectProgressMapper.java

@@ -54,8 +54,8 @@ public interface CmcBrandProjectProgressMapper
     /**
      * 批量删除cmc品牌项目进度
      * 
-     * @param progressIds 需要删除的数据主键集合
+     * @param projectIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds);
+    public int deleteCmcBrandProjectProgressByProgressIds(String[] projectIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcBrandProjectProgressService.java

@@ -46,10 +46,10 @@ public interface ICmcBrandProjectProgressService
     /**
      * 批量删除cmc品牌项目进度
      * 
-     * @param progressIds 需要删除的cmc品牌项目进度主键集合
+     * @param projectIds 需要删除的cmc品牌项目进度主键集合
      * @return 结果
      */
-    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds);
+    public int deleteCmcBrandProjectProgressByProgressIds(String[] projectIds);
 
     /**
      * 删除cmc品牌项目进度信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBrandProjectProgressServiceImpl.java

@@ -70,13 +70,13 @@ public class CmcBrandProjectProgressServiceImpl implements ICmcBrandProjectProgr
     /**
      * 批量删除cmc品牌项目进度
      * 
-     * @param progressIds 需要删除的cmc品牌项目进度主键
+     * @param projectIds 需要删除的cmc品牌项目进度主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds)
+    public int deleteCmcBrandProjectProgressByProgressIds(String[] projectIds)
     {
-        return cmcBrandProjectProgressMapper.deleteCmcBrandProjectProgressByProgressIds(progressIds);
+        return cmcBrandProjectProgressMapper.deleteCmcBrandProjectProgressByProgressIds(projectIds);
     }
 
     /**

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

@@ -64,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcBrandProjectProgressByProgressIds" parameterType="String">
-        delete from cmc_brand_project_progress where progress_id in 
-        <foreach item="progressId" collection="array" open="(" separator="," close=")">
-            #{progressId}
+        delete from cmc_brand_project_progress where project_id in
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
         </foreach>
     </delete>
 </mapper>

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 17:43:54
+ * @LastEditTime: 2024-07-04 10:38:39
  */
 import request from '@/utils/request'
 
@@ -18,14 +18,6 @@ const apiEndpoints = [
       '/oa/projectContract/:id',
     ]
   },
-  {
-    procDefName: '项目结算',
-    apiUrl: [
-      '/oa/settle/:id',
-      '/oa/settleSummary/:id',
-      '/oa/settleWork/:id',
-    ]
-  },
   {
     procDefName: '分包合同评审',
     apiUrl: [
@@ -49,6 +41,21 @@ const apiEndpoints = [
       '/oa/project/:id',
       '/oa/projectWork/:id',
     ]
+  },
+  {
+    procDefName: '项目结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
+  },
+  {
+    procDefName: '借款审批',
+    apiUrl: [
+      '/oa/borrow/:id',
+      '/oa/borrowDetail/:id',
+    ]
   }
 ]
 

oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -8,17 +8,21 @@
           <el-form-item label="品牌项目" prop="projectId">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '支付申请'" clearable style="width: 100%;">
-              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
+              <el-option v-for="item in projectList" :key="item.value"
+                :label="item.projectNumber + '-' + item.projectName" :value="item.projectId">
               </el-option>
             </el-select>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
-              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA ?
+                chooseProject.partyA.partyAName : ''
+                }}</el-descriptions-item>
+              <el-descriptions-item label="合作单位" label-class-name="my-label">{{ chooseProject.partner ?
+                chooseProject.partner.partnerName : ''
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="申请支付说明" prop="applyReason">
@@ -26,9 +30,8 @@
               :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
-            <FileUpload v-if="formTotal == 0" :disabled="taskName != '支付申请'"
-              :limit="1" :filePathName="'品牌项目支付/审核文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="getBrandPath"></FileUpload>
+            <FileUpload v-if="formTotal == 0" :disabled="taskName != '支付申请'" :limit="1" :filePathName="'品牌项目支付/审核文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBrandPath"></FileUpload>
             <div v-if="formTotal == 1">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.approvalDocument}`)">
                 {{ getFileName(form.approvalDocument) }}
@@ -65,7 +68,8 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input type="textarea" v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
+                  <el-input type="textarea" v-model="payment.cwComment" placeholder="请输入到账情况"
+                    :disabled="taskName != '财务反馈'" />
                 </td>
                 <td>
                   <el-date-picker clearable v-model="payment.paymentTime" type="date" value-format="yyyy-MM-dd"
@@ -73,7 +77,7 @@
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-button type="text" style="color:#F56C6C;"  size="mini" @click="deletPaymentItem(index)"
+                  <el-button type="text" style="color:#F56C6C;" size="mini" @click="deletPaymentItem(index)"
                     :disabled="taskName != '财务反馈'">删除行</el-button>
                 </td>
               </tr>
@@ -402,6 +406,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 table {
   /*边框*/
   /* border: 1px solid black; */

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

@@ -188,7 +188,7 @@ export default {
     }
   },
   mounted() {
-    
+    this.initTable()
   },
   methods: {
     initTable() {

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

@@ -68,7 +68,7 @@
                 <td>单价</td>
                 <td>数量</td>
                 <td>申请金额</td>
-                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">项目管理部校核金额</td>
+                <!-- <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">项目管理部校核金额</td> -->
                 <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">分管领导审核金额</td>
                 <td>操作</td>
               </tr>
@@ -83,20 +83,20 @@
                   <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.price" @change="calculateAmount(detail)"
-                    :disabled="taskName != '借款申请'"></el-input>
+                  <el-input-number :controls="false" style="width:100%" v-model="detail.price" @change="calculateAmount(detail)"
+                    :disabled="taskName != '借款申请'"></el-input-number>
                 </td>
                 <td>
-                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)"
-                    :disabled="taskName != '借款申请'"></el-input>
+                  <el-input-number :controls="false" style="width:100%" v-model="detail.quantity" @change="calculateAmount(detail)"
+                    :disabled="taskName != '借款申请'"></el-input-number>
                 </td>
                 <td>
                   <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
                 </td>
-                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
+                <!-- <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                   <el-input v-model="detail.xmAmount" :disabled="taskName != '项目部审核'"
                     @change="calculateXmAmount(detail)"></el-input>
-                </td>
+                </td> -->
                 <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                   <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
                     @change="calculateManagerAmount(detail)"></el-input>
@@ -110,6 +110,15 @@
             <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain
               :disabled="taskName != '借款申请'"></el-button>
           </el-form-item>
+          <el-form-item label="预算金额" v-if="isSelect">
+            <el-tag>{{ totalBudget.toFixed(2) }}</el-tag>
+          </el-form-item>
+          <el-form-item label="已申请借款" v-if="isSelect">
+            <el-tag type="warning">{{ hasBorrow.toFixed(2) }}</el-tag>
+          </el-form-item>
+          <el-form-item label="可用借款" v-if="isSelect">
+            <el-tag type="success">{{ (totalBudget - hasBorrow).toFixed(2) }}</el-tag>
+          </el-form-item>
           <el-row :gutter="20">
             <el-col :span="8" :xs="24">
               <el-form-item label="申请金额" prop="applyAmount">
@@ -160,7 +169,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="项目部校核意见" prop="xmComment" v-if="form.borrowUsage == '0'">
+            <!-- <el-form-item label="项目部校核意见" prop="xmComment" v-if="form.borrowUsage == '0'">
               <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见"
                 :disabled="taskName != '项目部审核'" :autosize="{ minRows: 4 }" />
             </el-form-item>
@@ -175,7 +184,7 @@
                   <span> {{ form.xmTime ? form.xmTime : xmTime }} </span>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-form-item label="分管领导审核意见" prop="managerComment">
               <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
                 :disabled="taskName != '分管审核'" :autosize="{ minRows: 4 }" />
@@ -293,6 +302,8 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import { listBudget } from "@/api/oa/budget/budget";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import FileItem from '../business/fileItem.vue';
 
 export default {
@@ -371,7 +382,9 @@ export default {
       flowData: {},
       isProject: true,
       deptId: undefined,
-      dgtLabel: '工会审核意见'
+      dgtLabel: '工会审核意见',
+      totalBudget: 0,
+      hasBorrow: 0,
     };
   },
   created() {
@@ -479,10 +492,33 @@ export default {
           this.form = res.data;
           this.hanldeChangeType();
           this.handleSelectProject(res.data.projectId)
+          this.getBudgetSettle()
         }
         this.loading = false;
       })
     },
+    async getBudgetSettle() {
+      let budgetData = await listBudget({ projectId: this.form.projectId })
+      if (budgetData.total == 1) {
+        let budget = budgetData.rows[0];
+        this.totalBudget = budget.totalBudget
+      }
+      let borrow = await listBorrow({ projectId: this.form.projectId })
+      if (borrow.total != 0) {
+        let borrowList = borrow.rows;
+        let hasBorrow = 0;
+        borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId)
+        borrowList.forEach(element => {
+          if (element.managerAmount) {
+            hasBorrow = hasBorrow + element.managerAmount
+          }
+          if (!element.managerAmount && element.applyAmount) {
+            hasBorrow = hasBorrow + element.applyAmount
+          }
+        });
+        this.hasBorrow = hasBorrow
+      }
+    },
     // 查询项目列表
     getProjectList() {
       listProject({
@@ -537,6 +573,12 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.isSelect) {
+        if (this.form.applyAmount > (this.totalBudget - this.hasBorrow)) {
+          this.$message.error('申请金额不允许超过可用借款！请重新填写')
+          return
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
@@ -694,6 +736,7 @@ export default {
         this.form.projectId = val[0].projectId
       }
       this.openProject = false
+      this.getBudgetSettle();
     },
     calculateAmount(detail) {
       let total = Number(detail.price) * Number(detail.quantity);

oa-ui/src/views/flowable/form/inProgress/borrowData.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 14:45:08
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-20 14:36:57
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-04 11:00:25
 -->
 <template>
   <div class="mt20">
@@ -69,7 +69,7 @@
         <el-table-column prop="price" label="单价" />
         <el-table-column prop="quantity" label="数量" />
         <el-table-column prop="applyAmount" label="金额" />
-        <el-table-column prop="xmAmount" label="项目部校核金额" />
+        <!-- <el-table-column prop="xmAmount" label="项目部校核金额" /> -->
         <el-table-column prop="managerAmount" label="分管校核金额" />
       </el-table>
       <el-form inline class="mt20">

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-04 13:00:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-04 17:41:05
 -->
 <template>
   <div class="app-container">
@@ -96,10 +96,10 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <!-- <div slot="footer" class="dialog-footer" style="text-align: center;">
+    <div slot="footer" class="dialog-footer" style="text-align: center;">
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
-      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
-    </div> -->
+      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
+    </div>
   </div>
 </template>
 
@@ -234,7 +234,7 @@ export default {
       updateProject(this.form)
     },
     confirmPlanForm() {
-      this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底、技术交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
+      this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-04 13:02:34
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-03 09:08:28
 -->
 
 <template>
@@ -11,22 +11,24 @@
       <el-col :span="18" :xs="24">
         <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
           <el-tab-pane label="项目登记" name="项目登记">
-            <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
+            <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack">
+            </addproject>
+          </el-tab-pane>
+          <el-tab-pane label="项目安排" name="项目安排">
+            <arrangeProject :taskForm="taskForm" :taskName="'项目安排'" :disabled="taskName != '项目安排'" @goBack="goBack">
+            </arrangeProject>
           </el-tab-pane>
-          <!-- <el-tab-pane label="项目安排" name="项目安排">
-            <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
-          </el-tab-pane> -->
           <el-tab-pane label="项目预算" name="项目预算">
-            <budget-tab :taskForm="taskForm"  @goBack="goBack"></budget-tab>
+            <budget-tab :taskForm="taskForm" @goBack="goBack"></budget-tab>
           </el-tab-pane>
           <el-tab-pane label="安全交底" name="安全交底">
-            <safe-tab :taskForm="taskForm"  @goBack="goBack"></safe-tab>
+            <safe-tab :taskForm="taskForm" @goBack="goBack"></safe-tab>
           </el-tab-pane>
           <el-tab-pane label="技术交底" name="技术交底">
-            <technical-tab :taskForm="taskForm"  @goBack="goBack"></technical-tab>
+            <technical-tab :taskForm="taskForm" @goBack="goBack"></technical-tab>
           </el-tab-pane>
           <el-tab-pane label="技术方案" name="技术方案">
-            <plan-tab :taskForm="taskForm" :taskName="taskName"  @goBack="goBack"></plan-tab>
+            <plan-tab :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></plan-tab>
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
             <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'"
@@ -74,7 +76,7 @@ import InProgress from './inProgress.vue'
 import BudgetTab from './budgetTab.vue'
 import planTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
-import TechnicalTab from './technicalTab.vue'
+import technicalTab from './technicalTab.vue'
 export default {
   props: {
     taskName: {
@@ -84,7 +86,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, TechnicalTab },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, technicalTab },
   data() {
     return {
       activeName: '项目登记',
@@ -127,7 +129,7 @@ export default {
     }
   },
   created() {
-    if(this.taskName !='' && this.taskName != undefined &&this.taskName != null){
+    if (this.taskName != '' && this.taskName != undefined && this.taskName != null) {
       this.activeName = this.taskName;
     }
     this.getList();
@@ -252,6 +254,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 .project-wrapper {
   padding: 25px;
 }

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-06-21 13:46:50
+ * @LastEditTime: 2024-07-03 14:39:03
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -125,6 +125,40 @@
               </el-link>
             </div>
           </el-form-item>
+          <div class="headers">
+            预算内项目结算明细
+            <div class="line"></div>
+          </div>
+          <el-form-item label-width="60px">
+            <el-table :data="budgetList">
+              <el-table-column prop="budgetSettleId" label="序号" />
+              <el-table-column prop="content" label="工作内容" />
+              <el-table-column label="具体内容" width="150px">
+                <template slot-scope="scope">
+                  {{ scope.row.cmcPrice.workType + '/' + scope.row.cmcPrice.workItem }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="cmcPrice.scaleGrade" label="等级或比例尺" />
+              <el-table-column prop="cmcPrice.unit" label="单位" />
+              <el-table-column prop="groundType" label="地类">
+                <template slot-scope="scope">
+                  {{ scope.row.groundType == '0' ? '一般地类' : '复杂地类' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="cmcPrice" label="单价">
+                <template slot-scope="scope">
+                  {{ scope.row.groundType == '0' ? scope.row.cmcPrice.commonPrice : scope.row.cmcPrice.complexPrice }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="coefficient" label="系数" />
+              <el-table-column prop="workload" label="工作量" />
+              <el-table-column prop="settle" label="金额" />
+              <el-table-column prop="remark" label="备注" />
+            </el-table>
+            <p style="text-align: right;font-size:18px;padding-right:13%">
+              <b>预算内项目结算总金额：{{ budgetSettle }}</b>
+            </p>
+          </el-form-item>
           <div class="headers">
             项目完成工作量及经费计算
             <div class="line"></div>
@@ -461,42 +495,19 @@ 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 { 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";
 import { getUserByRole } from "@/api/system/role";
 import { getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import {
-  getUsersDeptLeader,
-  getUsersDeptLeaderByDept,
-  getUsersManageLeaderByDept,
-} from "@/api/system/post.js";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
+import { listBudget } from "@/api/oa/budget/budget";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import SettlePrint from "./components/settlePrint.vue";
 import { getDept } from "@/api/system/dept";
 import { getContract } from "@/api/oa/contract/contract";
@@ -551,6 +562,8 @@ export default {
       isSelect: false,
       chooseProject: {},
       fileList: [],
+      budgetList: [],
+      budgetSettle: 0,
       settleWorkList: [
         {
           content: "",
@@ -592,7 +605,8 @@ export default {
       actualSumSettle: "",
       clickWork: {},
       deptId: undefined,
-      deptList: []
+      deptList: [],
+      isCorrect: true,
     };
   },
   created() {
@@ -617,6 +631,7 @@ export default {
       });
     } else {
       this.handleSelectProject(this.form.projectId);
+      this.getBudgetSettle();
     }
   },
   methods: {
@@ -650,6 +665,19 @@ export default {
         }, 500);
       });
     },
+    async getBudgetSettle() {
+      let budgetData = await listBudget({ projectId: this.form.projectId })
+      if (budgetData.total == 1) {
+        let budgetId = budgetData.rows[0].budgetId;
+        let datas = await listBudgetSettle({ budgetId })
+        if (datas.code == 200) {
+          this.budgetList = datas.rows;
+          this.budgetList.forEach(item => {
+            this.budgetSettle = this.budgetSettle + item.settle
+          })
+        }
+      }
+    },
     // 获取当前处理人
     getCurrentUser() {
       if (this.taskName == "综合事务部处理") {
@@ -725,15 +753,20 @@ export default {
     preserve() {
       this.$refs["settleForm"].validate((vaild) => {
         if (vaild) {
-          if (this.flag) {
-            this.updateSettleFn();
-            this.updateSettleSummaryFn();
-            this.updateSettleWorkFn();
-            this.$message.success("保存成功");
+          if (this.isCorrect) {
+            if (this.flag) {
+              this.updateSettleFn();
+              this.updateSettleSummaryFn();
+              this.updateSettleWorkFn();
+              this.$message.success("保存成功");
+            } else {
+              this.addSettleFn();
+              this.$message.success("保存成功");
+            }
           } else {
-            this.addSettleFn();
-            this.$message.success("保存成功");
+            this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
           }
+
         } else {
           this.$message.error('请完善表单必填项')
         }
@@ -743,26 +776,30 @@ export default {
       this.$refs["settleForm"].validate((vaild) => {
         if (vaild) {
           this.preserve();
-          if (this.taskName == "结算发起") {
-            getUserByRole({ roleId: 4 }).then((res) => {
-              this.getNextFlowNodeFn(res.data[0]);
-            });
-          } else if (this.taskName == "综合事务部处理") {
-            this.getNextFlowNodeFn(null, 110, false);
-          } else if (this.taskName == "技术质量部审核") {
-            this.getNextFlowNodeFn(null, 107, false);
-          } else if (this.taskName == "项目管理部结算") {
-            this.getNextFlowNodeFn();
-          } else if (this.taskName == "结算发起人确认") {
-            this.getNextFlowNodeFn(null, 105, false);
-          } else 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();
+          if (this.isCorrect) {
+            if (this.taskName == "结算发起") {
+              getUserByRole({ roleId: 4 }).then((res) => {
+                this.getNextFlowNodeFn(res.data[0]);
+              });
+            } else if (this.taskName == "综合事务部处理") {
+              this.getNextFlowNodeFn(null, 110, false);
+            } else if (this.taskName == "技术质量部审核") {
+              this.getNextFlowNodeFn(null, 107, false);
+            } else if (this.taskName == "项目管理部结算") {
+              this.getNextFlowNodeFn();
+            } else if (this.taskName == "结算发起人确认") {
+              this.getNextFlowNodeFn(null, 105, false);
+            } else 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();
+            }
+          }else{
+            this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
           }
         } else {
           this.$message.error('请完善表单必填项')
@@ -913,6 +950,11 @@ export default {
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
+      if(sum < 600){
+        this.$message.warning('不足600，按600算')
+        work.remark = '不足600，按600算'
+        sum = 600
+      }
       work.settle = Number(sum).toFixed(2);
       this.calculateSumSettle();
       this.calculateActualSumSettle();
@@ -924,6 +966,13 @@ export default {
         sum = sum + Number(a.settle);
       }
       this.settleSumTr.amount = sum.toFixed(2);
+      if (sum > this.budgetSettle) {
+        this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
+        this.settleSumTr.amount = this.budgetSettle.toFixed(2);
+        this.isCorrect = false;
+      } else {
+        this.isCorrect = true;
+      }
     },
     calculateActualSumSettle() {
       let sum = 0;

oa-ui/src/views/oa/brand/brandProject.vue

@@ -56,6 +56,8 @@
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleLook(scope.row)"
+            v-hasPermi="['oa:brandProject:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:brandProject:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -69,7 +71,7 @@
 
     <!-- 添加或修改cmc品牌项目对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules">
+      <el-form ref="form" :model="form" :rules="rules" :disabled="isView">
         <el-descriptions class="margin-top" :column="2" border>
           <el-descriptions-item>
             <template slot="label">
@@ -210,6 +212,40 @@
           </table>
           <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
         </el-form-item>
+        <el-form-item label="审核文件：">
+          <div v-if="approvalDocument != ''">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + approvalDocument}`)">
+              {{ getFileName(approvalDocument) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + approvalDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
+          <div v-else>
+            暂无文件
+          </div>
+        </el-form-item>
+        <el-form-item label="财务反馈：">
+          <table border="1" style="width:100%;">
+            <tr>
+              <td>序号</td>
+              <td>到账情况</td>
+              <td>到账时间</td>
+            </tr>
+            <tr v-for="(payment, index) in paymentList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                {{ payment.cwComment }}
+              </td>
+              <td>
+                {{ payment.paymentTime }}
+              </td>
+            </tr>
+          </table>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -223,12 +259,15 @@
 import { listBrandProject, getBrandProject, delBrandProject, addBrandProject, updateBrandProject } from "@/api/oa/brand/brandProject";
 import { listBrandProgress, getBrandProgress, addBrandProgress, delBrandProgress } from "@/api/oa/brand/brandProgress"
 import { listPartner, getPartner } from "@/api/oa/partner/partner";
+import { listBrandPayment, addBrandPayment, delBrandPayment } from "@/api/oa/brand/brandPayment";
+import { listBrand, getBrand } from '@/api/oa/brand/brand';
 import { listPartyA } from "@/api/oa/partyA/partyA";
 
 export default {
   name: "BrandProject",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -279,7 +318,10 @@ export default {
       rules: {
         projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
         projectName: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
-      }
+      },
+      isView: false,
+      paymentList: [],
+      approvalDocument: ''
     };
   },
   created() {
@@ -408,14 +450,31 @@ export default {
         situation: "",
       }]
     },
+    handleLook(row) {
+      this.handleUpdate(row)
+      this.isView = true;
+      this.title = "品牌项目";
+    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    async handleUpdate(row) {
       this.reset();
-      const projectId = row.projectId || this.ids
+      this.isView = false;
+      let brandFormData = await listBrand({ projectId })
+      let brandId;
+      if (brandFormData.total == 1) {
+        brandId = brandFormData.rows[0].brandId
+        this.approvalDocument = brandFormData.rows[0].approvalDocument
+        listBrandPayment({ brandId }).then(result => {
+          this.paymentList = result.rows
+        })
+      }else{
+        this.paymentList = []
+        this.approvalDocument = ''
+      }
       getBrandProject(projectId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "品牌项目修改";
+        this.title = "品牌项目";
       });
       listBrandProgress({
         pageNum: 1,