修改项目结算

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-10 19:15:14
+ * @LastEditTime: 2024-07-11 18:17:52
 -->
 <template>
   <div class="main">
@@ -62,8 +62,7 @@
         </el-descriptions-item>
         <el-descriptions-item label="直接成本" :span="3">
           <table border="1" style="width:100%">
-            <tr style="background-color:#f8f8f9">
-              <td :rowspan="workLen + 2">直接成本</td>
+            <tr style="background-color:#f8f8f9" v-if="workList.length != 0">
               <td>工作简述</td>
               <td>工作内容</td>
               <td>数量</td>
@@ -191,7 +190,7 @@
             </tr>
           </table>
         </el-descriptions-item>
-        <el-descriptions-item label="外协费用" :span="3">
+        <el-descriptions-item label="外协费用" :span="2">
           <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
             <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.outExpense"
               @blur="computedDirectExpense()"></el-input-number>
@@ -200,7 +199,10 @@
             {{ budgetForm.outExpense }}
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="车船租赁" :span="3">
+        <el-descriptions-item label="备注" :span="1">
+          {{ budgetForm.outRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item label="车船租赁" :span="2">
           <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
             <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.rentExpense"
               @blur="computedDirectExpense()"></el-input-number>
@@ -209,7 +211,10 @@
             {{ budgetForm.rentExpense }}
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="其他费用" :span="3">
+        <el-descriptions-item label="备注" :span="1">
+          {{ budgetForm.rentRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item label="其他费用" :span="2">
           <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
             <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.otherExpense"
               @blur="computedDirectExpense()"></el-input-number>
@@ -218,7 +223,10 @@
             {{ budgetForm.otherExpense }}
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="税费成本" :span="3">
+        <el-descriptions-item label="备注" :span="1">
+          {{ budgetForm.otherRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item label="税费成本" :span="2">
           <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
             <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.taxExpense"
               @blur="computedDirectExpense()"></el-input-number>
@@ -227,7 +235,10 @@
             {{ budgetForm.taxExpense }}
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="经营管理费用" :span="3">
+        <el-descriptions-item label="备注" :span="1">
+          {{ budgetForm.taxRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item label="经营管理费用" :span="2">
           <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
             <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.businessExpense"
               @blur="computedDirectExpense()"></el-input-number>
@@ -236,6 +247,9 @@
             {{ budgetForm.businessExpense }}
           </div>
         </el-descriptions-item>
+        <el-descriptions-item label="备注" :span="1">
+          {{ budgetForm.businessRemark }}
+        </el-descriptions-item>
         <el-descriptions-item label="预算成本合计" :span="3">
           <div class="text-center" style="font-weight:bold;font-size:18px;color:orange">
             {{ budgetForm.totalBudget }}
@@ -333,6 +347,11 @@ export default {
       type: String,
     }
   },
+  watch: {
+    'taskForm.formId'() {
+      this.initBudgetForm();
+    }
+  },
   data() {
     return {
       projectId: '',
@@ -608,6 +627,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 .main {
   width: 100%;
   margin: 0 auto;

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

@@ -101,18 +101,6 @@
           <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jsUserName }}</span></td>
           <td :colspan="2" style="text-align:left;">日期：{{ form.jsTime }}</td>
         </tr>
-        <tr>
-          <td :colspan="2" class="fontbold">项目管理部(结算)</td>
-          <td :colspan="4" class="conment-width">{{ form.xmComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.xmUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.xmTime }}</td>
-        </tr>
-        <tr>
-          <td :colspan="2" class="fontbold">项目承担部门(确认)</td>
-          <td :colspan="4" class="conment-width">{{ form.deptComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.deptUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.deptTime }}</td>
-        </tr>
         <tr>
           <td :colspan="2" class="fontbold">经营发展部(校核)</td>
           <td :colspan="4" class="conment-width">{{ form.jyComment }}</td>
@@ -131,6 +119,12 @@
           <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.gmUserName }}</span></td>
           <td :colspan="2" style="text-align:left;">日期：{{ form.gmTime }}</td>
         </tr>
+        <tr v-if="form.dszTime">
+          <td :colspan="2" class="fontbold">董事长（批准）</td>
+          <td :colspan="4" class="conment-width">{{ form.dszComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.dszUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.dszTime }}</td>
+        </tr>
       </table>
     </div>
     <div class="text-center mt20">
@@ -192,6 +186,7 @@ export default {
   },
   methods: {
     initTable() {
+      console.log(this.settleList);
       this.deductionsList = []
       this.deptSettleList = []
       for (let s of this.settleList) {

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

@@ -1,13 +1,14 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-10 17:20:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-11 17:44:18
 -->
 <template>
   <div class="app-container" v-loading="loading">
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 19 : 24" :xs="24">
+        <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <h2 class="text-center">项目结算表</h2>
         <div class="headers">
           项目信息
@@ -15,7 +16,8 @@
         </div>
         <el-form ref="settleForm" :model="form" :rules="rules" label-width="160px" :disabled="disabled">
           <el-form-item label="项目编号" prop="projectId">
-            <el-button icon="el-icon-plus" size="mini" type="primary" @click="prOpen = true">选择项目</el-button>
+            <el-button icon="el-icon-plus" size="mini" type="primary" @click="prOpen = true"
+              :disabled="taskName != '结算发起'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px" :column="2">
               <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}
@@ -30,10 +32,10 @@
                 {{ chooseProject.contractNumber }}
               </el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">
-                {{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}
+                {{ getUserName(chooseProject.projectLeader) }}
               </el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">
-                {{ chooseProject.partyA.partyAName }}
+                {{ chooseProject.partyA ? chooseProject.partyA.partyAName : '' }}
               </el-descriptions-item>
               <el-descriptions-item label="联系人" label-class-name="my-label">
                 {{ chooseProject.contactPerson }}
@@ -79,13 +81,7 @@
             <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setSettleDocument">
             </FileUpload>
-            <div v-if="form.settleDocument && taskName != '结算发起'" class="upload-list">
-              <!-- <el-link :href="`${baseUrl}${'/profile/upload' + form.settleDocument}`" :underline="false"
-                target="_blank">
-                <span class="el-icon-document" style="color: #00f">
-                  {{ getFileName(form.settleDocument) }}
-                </span>
-              </el-link> -->
+            <div v-if="form.settleDocument" class="upload-list">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.settleDocument}`)">
                 {{ getFileName(form.settleDocument) }}
               </el-link>
@@ -95,28 +91,31 @@
               </el-link>
             </div>
           </el-form-item>
-          <!-- <el-form-item label="项目管理部审核结算单" prop="">
-            <FileUpload v-if="taskName == '项目管理部结算'" :limit="1" :filePathName="'项目结算/项目管理部审核结算单'"
+          <el-form-item label="经营发展部审核结算单" prop="">
+            <FileUpload v-if="taskName == '经营发展部校核'" :limit="1" :filePathName="'项目结算/经营发展部审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setModifyDocument">
             </FileUpload>
-            <div v-if="taskName != '项目管理部结算' && form.modifyDocument" class="upload-list">
-              <el-link :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`" :underline="false"
-                target="_blank">
-                <span class="el-icon-document" style="color: #00f">
-                  {{ getFileName(form.modifyDocument) }}
-                </span>
+            <div v-if="form.modifyDocument" class="upload-list">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
+                {{ getFileName(form.modifyDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label="分管领导审核结算单" prop="">
             <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
             </FileUpload>
-            <div v-if="taskName != '分管审核' && form.finalDocument" class="upload-list">
-              <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false" target="_blank">
-                <span class="el-icon-document" style="color: #00f">
-                  {{ getFileName(form.finalDocument) }}
-                </span>
+            <div v-if="form.finalDocument" class="upload-list">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
+                {{ getFileName(form.finalDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
           </el-form-item>
@@ -180,14 +179,14 @@
                 <td>
               <tr>
                 <td>
-                  <el-button size="mini" type="primary" icon="el-icon-plus"
+                  <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="isModify"
                     @click="handleChoosePrice(work, index)">选择工作内容</el-button>
                 </td>
               </tr>
               <tr>
                 <td>
-                  <el-input v-model="work.content" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                    :disabled="isModify"></el-input>
                 </td>
               </tr>
               </td>
@@ -205,12 +204,12 @@
               </td>
               <td>
                 <el-input-number :precision="2" style="width: 100px" v-model="work.workload" clearable
-                  @blur="calculateSettle(work)" :controls="false"></el-input-number>
+                  :disabled="isModify" @blur="calculateSettle(work)" :controls="false"></el-input-number>
               </td>
               <td>
                 <div style="display: flex">
                   <el-input-number :precision="2" style="width: 100px" v-model="work.coefficient" clearable
-                    @blur="calculateSettle(work)" :controls="false"></el-input-number>
+                    :disabled="isModify" @blur="calculateSettle(work)" :controls="false"></el-input-number>
                   <el-popover placement="top-start" title="系数备注" width="200" trigger="click">
                     <div v-html="work.noteTip"></div>
                     <i class="el-icon-info" slot="reference" @click="getCoefficientRemark(work, work.workType)"></i>
@@ -222,7 +221,7 @@
                 {{ work.settle }}
               </td>
               <td>
-                <el-input v-model="work.remark" type="textarea" clearable
+                <el-input v-model="work.remark" type="textarea" clearable :disabled="isModify"
                   :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
               </td>
               <td>
@@ -234,12 +233,16 @@
                 <td :colspan="8">结算费用合计</td>
                 <td>{{ settleSumTr.amount }}</td>
                 <td>
-                  <el-input v-model="settleSumTr.remark" type="textarea" clearable
+                  <el-input v-model="settleSumTr.remark" type="textarea" clearable :disabled="isModify"
                     :autosize="{ minRows: 2, maxRows: 10 }"></el-input>
                 </td>
               </tr>
             </table>
             <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
+            <div v-if="exceed">
+              <el-alert :title="'超过预算金额：' + exceedAmount" type="error">
+              </el-alert>
+            </div>
           </el-form-item>
 
           <!-- 结算汇总 -->
@@ -257,21 +260,23 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(work, index) in settleSumList" :key="index">
+              <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 }">
+                  <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
-                    :controls="false" @blur="calculateActualSumSettle()"></el-input-number>
+                    :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 }">
+                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="isModify">
                   </el-input>
                 </td>
                 <td>
@@ -291,7 +296,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(dept, index) in deptSettleList" :key="index">
+              <tr v-for="(  dept, index  ) in   deptSettleList  " :key="index">
                 <td :rowspan="deptSettleList.length" v-if="index == 0">
                   {{ Number(actualSumSettle).toFixed(2) }}
                 </td>
@@ -301,18 +306,20 @@
                 <td>
                   <!-- <el-input v-model="dept.content" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
                   </el-input> -->
-                  <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;">
-                    <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
+                  <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;"
+                    :disabled="isModify">
+                    <el-option v-for="  item   in   deptList  " :key="item.deptId" :label="item.deptName"
                       :value="item.deptName">
                     </el-option>
                   </el-select>
                 </td>
                 <td>
                   <el-input-number :precision="2" style="width: 200px" v-model="dept.amount" clearable :controls="false"
-                    @blur="calculateDeptAmount(index)"></el-input-number>
+                    :disabled="isModify" @blur="calculateDeptAmount(index)"></el-input-number>
                 </td>
                 <td>
-                  <el-input v-model="dept.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
+                  <el-input v-model="dept.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="isModify">
                   </el-input>
                 </td>
                 <td>
@@ -324,7 +331,7 @@
                 <td :colspan="2">结算说明</td>
                 <td :colspan="3">
                   <el-input v-model="form.settleComment" type="textarea" clearable placeholder="请输入说明"
-                    :autosize="{ minRows: 2, maxRows: 10 }">
+                    :autosize="{ minRows: 2, maxRows: 10 }" :disabled="isModify">
                   </el-input>
                 </td>
               </tr>
@@ -372,40 +379,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-form-item label="项目管理部(结算)">
-              <el-input v-model="form.xmComment" 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.xmUserName }} </span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="日期：" label-width="120px">
-                  <span> {{ form.xmTime }} </span>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="项目承担部门(确认)">
-              <el-input v-model="form.deptComment" 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.deptUserName }} </span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="日期：" label-width="120px">
-                  <span> {{ form.deptTime }} </span>
-                </el-form-item>
-              </el-col>
-            </el-row> -->
             <el-form-item label="经营发展部(校核)">
               <el-input v-model="form.jyComment" type="textarea" :disabled="taskName != '经营发展部校核'" clearable
                 :autosize="{ minRows: 4, maxRows: 10 }">
@@ -457,12 +430,31 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <el-form-item label="董事长（批准）" v-if="exceed">
+              <el-input v-model="form.dszComment" type="textarea" :disabled="taskName != '董事长批准'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
+              </el-input>
+            </el-form-item>
+            <el-row v-if="exceed">
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px">
+                  <span class="auditor"> {{ form.dszUserName }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px">
+                  <span> {{ form.dszTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
         </el-form>
+        <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <div style="text-align: center" v-if="!disabled">
-          <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
           <el-button type="warning" @click="preserve">保存</el-button>
-          <el-button type="primary" @click="submitNextFlow">提交下一个流程</el-button>
+          <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提交下一个流程</el-button>
+          <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
         </div>
       </el-col>
       <el-col :span="5" :xs="24" v-if="flowDisabled">
@@ -606,9 +598,16 @@ export default {
       clickWork: {},
       deptId: undefined,
       deptList: [],
-      isCorrect: true,
+      exceed: false, //是否超预算
+      exceedAmount: 0,
+      isModify: false, //是否可以修改结算工作量
     };
   },
+  watch: {
+    'chooseProject.projectId'(val) {
+      this.getBudgetSettle();
+    }
+  },
   created() {
     this.getProjectList(); //获取项目列表
     this.getContractDataList(); //获取合同编码和编号
@@ -631,40 +630,105 @@ export default {
       });
     } else {
       this.handleSelectProject(this.form.projectId);
-      this.getBudgetSettle();
     }
+    this.isModify = this.taskName != '结算发起' && this.taskName != '经营发展部校核' && this.taskName != '分管审核'
   },
   methods: {
     // 初始化表单
-    initForm() {
-      listSettle({ settleId: this.taskForm.formId }).then((res) => {
-        if (res.total == 1) {
-          this.form = res.rows[0];
-          this.flag = true;
-          this.handleSelectProject(res.rows[0].projectId);
-          this.listSettleWorkFn();
-          this.listSettleSummaryFn();
-          getUser(this.form.reporter).then((res) => {
-            if (res.data) {
-              this.form.reporterName = res.data.nickName;
-              this.deptId = res.data.deptId;
+    async initForm() {
+      const res = await listSettle({ settleId: this.taskForm.formId });
+      if (res.total === 1) {
+        this.form = res.rows[0];
+        this.flag = true;
+        const settleId = this.taskForm.formId;
+        const [
+          projectResponse,
+          budgetResponse,
+          settleWorkResponse,
+          settleSummaryResponse
+        ] = await Promise.all([
+          getProject(res.rows[0].projectId),
+          listBudget({ projectId: res.rows[0].projectId }),
+          listSettleWork({ settleId }),
+          listSettleSummary({ settleId })
+        ]);
+
+        if (projectResponse) {
+          this.chooseProject = projectResponse.data;
+          this.isSelect = true;
+        }
+        if (budgetResponse && budgetResponse.total === 1) {
+          const budgetId = budgetResponse.rows[0].budgetId;
+          const budgetSettleResponse = await listBudgetSettle({ budgetId });
+          if (budgetSettleResponse.code === 200) {
+            this.budgetList = budgetSettleResponse.rows;
+            this.budgetSettle = budgetResponse.rows[0].settleExpense;
+          } else {
+            this.budgetList = [];
+            this.budgetSettle = 0;
+          }
+        } else {
+          this.budgetList = [];
+          this.budgetSettle = 0;
+        }
+        // 获取申请工作量列表
+        if (settleWorkResponse) {
+          this.settleWorkList = settleWorkResponse.rows;
+          for (let work of this.settleWorkList) {
+            getPrice(work.priceId).then((settleWorkResponse) => {
+              if (settleWorkResponse.data) {
+                this.setValue(work, "scale", settleWorkResponse.data.scaleGrade);
+                this.setValue(work, "unit", settleWorkResponse.data.unit);
+                if (work.groundType == "0") {
+                  work.price = settleWorkResponse.data.commonPrice;
+                } else {
+                  work.price = settleWorkResponse.data.complexPrice;
+                }
+              }
+            });
+          }
+        }
+        // 结算汇总里的扣除明细以及部门结算金额
+        if (settleSummaryResponse) {
+          this.oldSettleSumList = settleSummaryResponse.rows;
+          for (let s of settleSummaryResponse.rows) {
+            if (s.content == "结算费用合计") {
+              this.settleSumTr = s;
+              break;
             }
-          });
-          this.getCurrentUser();
-        } else if (res.total == 0) {
-          this.flag = false;
-          if (this.taskName == "结算发起") {
-            this.form.reporter = this.$store.state.user.id;
-            this.form.reporterName = this.$store.state.user.name;
-            this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
           }
+          this.settleSumList = settleSummaryResponse.rows.filter((item) => item.tableNumber == "0");
+          this.deptSettleList = settleSummaryResponse.rows.filter(
+            (item) => item.tableNumber == "1"
+          );
+          this.calculateActualSumSettle();
         }
-        setTimeout(() => {
-          this.loading = false;
-          this.deptList = this.$store.state.user.deptList
-        }, 500);
-      });
+        if (this.settleSumTr.amount > this.budgetSettle) {
+          this.exceed = true
+        } else {
+          this.exceed = false
+        }
+        this.calcaulatExceed()
+
+        getUser(this.form.reporter).then((res) => {
+          if (res.data) {
+            this.form.reporterName = res.data.nickName;
+            this.deptId = res.data.deptId;
+          }
+        });
+        this.getCurrentUser();
+      } else if (res.total == 0) {
+        this.flag = false;
+        if (this.taskName == "结算发起") {
+          this.form.reporter = this.$store.state.user.id;
+          this.form.reporterName = this.$store.state.user.name;
+          this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
+        }
+      }
+      this.loading = false;
+      this.deptList = this.$store.state.user.deptList
     },
+
     async getBudgetSettle() {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
@@ -672,10 +736,11 @@ export default {
         let datas = await listBudgetSettle({ budgetId })
         if (datas.code == 200) {
           this.budgetList = datas.rows;
-          this.budgetList.forEach(item => {
-            this.budgetSettle = this.budgetSettle + item.settle
-          })
+          this.budgetSettle = budgetData.rows[0].settleExpense
         }
+      } else {
+        this.budgetList = []
+        this.budgetSettle = 0
       }
     },
     // 获取当前处理人
@@ -688,14 +753,6 @@ export default {
         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.xmUserName = this.$store.state.user.name;
-        //   this.form.xmUserId = this.$store.state.user.id;
-        //   this.form.xmTime = parseTime(new Date(), "{y}-{m}-{d}");
-        // } else if (this.taskName == "结算发起人确认") {
-        //   this.form.deptUserName = this.$store.state.user.name;
-        //   this.form.deptUserId = this.$store.state.user.id;
-        //   this.form.deptTime = 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;
@@ -708,31 +765,21 @@ export default {
         this.form.gmUserName = this.$store.state.user.name;
         this.form.gmUserId = this.$store.state.user.id;
         this.form.gmTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == "董事长批准") {
+        this.form.dszUserName = this.$store.state.user.name;
+        this.form.dszUserId = this.$store.state.user.id;
+        this.form.dszTime = parseTime(new Date(), "{y}-{m}-{d}");
       }
       this.getReviewerName();
     },
     // 获取审核人
     getReviewerName() {
       if (this.form.zhUserId) {
-        getUser(this.form.zhUserId).then((res) => {
-          this.form.zhUserName = res.data.nickName;
-        });
+        this.form.zhUserName = this.getUserName(this.form.zhUserId)
       }
       if (this.form.jsUserId) {
-        getUser(this.form.jsUserId).then((res) => {
-          this.form.jsUserName = res.data.nickName;
-        });
+        this.form.jsUserName = this.getUserName(this.form.jsUserId)
       }
-      // if (this.form.xmUserId) {
-      //   getUser(this.form.xmUserId).then((res) => {
-      //     this.form.xmUserName = res.data.nickName;
-      //   });
-      // }
-      // if (this.form.deptUserId) {
-      //   getUser(this.form.deptUserId).then((res) => {
-      //     this.form.deptUserName = res.data.nickName;
-      //   });
-      // }
       if (this.form.jyUserId) {
         getUser(this.form.jyUserId).then((res) => {
           this.form.jyUserName = res.data.nickName;
@@ -753,20 +800,15 @@ export default {
     preserve() {
       this.$refs["settleForm"].validate((vaild) => {
         if (vaild) {
-          if (this.isCorrect) {
-            if (this.flag) {
-              this.updateSettleFn();
-              this.updateSettleSummaryFn();
-              this.updateSettleWorkFn();
-              this.$message.success("保存成功");
-            } else {
-              this.addSettleFn();
-              this.$message.success("保存成功");
-            }
+          if (this.flag) {
+            this.updateSettleFn();
+            this.updateSettleSummaryFn();
+            this.updateSettleWorkFn();
+            this.$message.success("保存成功");
           } else {
-            this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
+            this.addSettleFn();
+            this.$message.success("保存成功");
           }
-
         } else {
           this.$message.error('请完善表单必填项')
         }
@@ -776,31 +818,33 @@ export default {
       this.$refs["settleForm"].validate((vaild) => {
         if (vaild) {
           this.preserve();
-          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) => {
+          if (this.taskName == "结算发起") {
+            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 == "经营发展部校核") {
+            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.$set(this.taskForm.variables, "exceed", this.exceed);
+            if (this.exceed) {
+              getUserByPost({ postName: "董事长" }).then((res) => {
                 this.getNextFlowNodeFn(res.data[0].userId);
               });
-            } else if (this.taskName == "总经理审批") {
+            } else {
               this.getNextFlowNodeFn();
             }
-          } else {
-            this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
+          } else if (this.taskName == "董事长批准") {
+            this.getNextFlowNodeFn();
           }
+
         } else {
           this.$message.error('请完善表单必填项')
         }
@@ -812,39 +856,34 @@ export default {
       getNextFlowNode(params).then((res) => {
         if (userId) {
           this.$set(this.taskForm.variables, "approval", userId);
-          complete(this.taskForm).then((response) => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit("goBack");
-          });
+          this.handleComplete(this.taskForm);
         } else {
           if (deptId && isList) {
             getUsersManageLeaderByDept({ deptId }).then((res) => {
-              let id = [];
-              id.push(res.data[0].userId);
-              // id.push(10);
-              this.$set(this.taskForm.variables, "approvalList", id);
-              complete(this.taskForm).then((response) => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit("goBack");
-              });
+              let ids = [];
+              res.data.forEach(user => {
+                ids.push(user.userId)
+              })
+              this.$set(this.taskForm.variables, "approvalList", ids);
+              this.handleComplete(this.taskForm);
             });
           } else if (deptId && !isList) {
             getUsersDeptLeaderByDept({ deptId }).then((res) => {
               this.$set(this.taskForm.variables, "approval", res.data.userId);
-              complete(this.taskForm).then((response) => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit("goBack");
-              });
+              this.handleComplete(this.taskForm);
             });
           } else {
-            complete(this.taskForm).then((response) => {
-              this.$modal.msgSuccess(response.msg);
-              this.$emit("goBack");
-            });
+            this.handleComplete(this.taskForm);
           }
         }
       });
     },
+    handleComplete(taskForm) {
+      complete(taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack');
+      })
+    },
     // 查询项目列表
     getProjectList() {
       listProject({
@@ -860,6 +899,7 @@ export default {
         getProject(val).then((res) => {
           this.chooseProject = res.data;
           this.isSelect = true;
+          this.getBudgetSettle();
           getUser(this.chooseProject.projectRegistrant).then((res) => {
             if (res.data) {
               this.$set(
@@ -970,11 +1010,16 @@ export default {
       }
       this.settleSumTr.amount = sum.toFixed(2);
       if (sum > this.budgetSettle) {
-        this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
-        this.settleSumTr.amount = this.budgetSettle.toFixed(2);
-        this.isCorrect = false;
+        this.$confirm('结算合计总金额大于了预算内项目结算总金额，将走《超预算或预算外支付（报销）》流程', '提示', {
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          this.exceed = true;
+          this.calcaulatExceed();
+          return
+        })
       } else {
-        this.isCorrect = true;
+        this.exceed = false;
       }
     },
     calculateActualSumSettle() {
@@ -984,6 +1029,8 @@ export default {
         sum = sum + Number(a.amount);
       }
       this.actualSumSettle = Number(this.settleSumTr.amount) - sum;
+      if (this.deptSettleList.length == 1)
+        this.deptSettleList[0].amount = this.actualSumSettle;
     },
     calculateDeptAmount(index) {
       let num = 0;
@@ -997,6 +1044,10 @@ export default {
         }
       }
     },
+    calcaulatExceed() {
+      if (Number(this.budgetSettle) - Number(this.settleSumTr.amount) < 0)
+        this.exceedAmount = Number(this.settleSumTr.amount) - Number(this.budgetSettle)
+    },
     handleChoosePrice(work, index) {
       this.clickWork = work;
       this.clickWork.index = index;
@@ -1053,41 +1104,7 @@ export default {
         addSettleSummary(item);
       }
     },
-    // 获取数据
-    listSettleWorkFn() {
-      listSettleWork({ settleId: this.taskForm.formId }).then((res) => {
-        this.settleWorkList = res.rows;
-        for (let work of this.settleWorkList) {
-          getPrice(work.priceId).then((res) => {
-            if (res.data) {
-              this.setValue(work, "scale", res.data.scaleGrade);
-              this.setValue(work, "unit", res.data.unit);
-              if (work.groundType == "0") {
-                work.price = res.data.commonPrice;
-              } else {
-                work.price = res.data.complexPrice;
-              }
-            }
-          });
-        }
-      });
-    },
-    listSettleSummaryFn() {
-      listSettleSummary({ settleId: this.taskForm.formId }).then((res) => {
-        this.oldSettleSumList = res.rows;
-        for (let s of res.rows) {
-          if (s.content == "结算费用合计") {
-            this.settleSumTr = s;
-            break;
-          }
-        }
-        this.settleSumList = res.rows.filter((item) => item.tableNumber == "0");
-        this.deptSettleList = res.rows.filter(
-          (item) => item.tableNumber == "1"
-        );
-        this.calculateActualSumSettle();
-      });
-    },
+
     // 更新数据
     updateSettleFn() {
       updateSettle(this.form);
@@ -1181,6 +1198,7 @@ table {
   /* border: 1px solid black; */
   text-align: center;
   border-collapse: collapse;
+  width: 100%;
   /*设置背景颜色*/
   /* background-color: #bfa; */
 }

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

@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="项目id" prop="projectId">
+        <el-select v-model="form.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-item>
+      <el-form-item label="人员成本" prop="staffCost">
+        <el-input v-model="form.staffCost" placeholder="请输入人员成本" />
+      </el-form-item>
+      <el-form-item label="车辆成本" prop="carCost">
+        <el-input v-model="form.carCost" placeholder="请输入车辆成本" />
+      </el-form-item>
+      <el-form-item label="设备成本" prop="deviceCost">
+        <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
+      </el-form-item>
+      <el-form-item label="固定成本" prop="fixCost">
+        <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+      </el-form-item>
+      <el-form-item label="预结算额" prop="settleExpense">
+        <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
+      </el-form-item>
+      <el-form-item label="外协费用" prop="outExpense">
+        <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
+      </el-form-item>
+      <el-form-item label="经营费用" prop="businessExpense">
+        <el-input v-model="form.businessExpense" placeholder="请输入经营费用" />
+      </el-form-item>
+      <el-form-item label="税费成本" prop="taxExpense">
+        <el-input v-model="form.taxExpense" placeholder="请输入税费成本" />
+      </el-form-item>
+      <el-form-item label="车船租赁" prop="rentExpense">
+        <el-input v-model="form.rentExpense" placeholder="请输入车船租赁" />
+      </el-form-item>
+      <el-form-item label="其他费用" prop="otherExpense">
+        <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
+      </el-form-item>
+      <el-form-item label="外协费用备注" prop="outRemark">
+        <el-input v-model="form.outRemark" placeholder="请输入外协费用备注" />
+      </el-form-item>
+      <el-form-item label="经营管理备注" prop="businessRemark">
+        <el-input v-model="form.businessRemark" placeholder="请输入经营管理备注" />
+      </el-form-item>
+      <el-form-item label="税费成本备注" prop="taxRemark">
+        <el-input v-model="form.taxRemark" placeholder="请输入税费成本备注" />
+      </el-form-item>
+      <el-form-item label="车船租赁备注" prop="rentRemark">
+        <el-input v-model="form.rentRemark" placeholder="请输入车船租赁备注" />
+      </el-form-item>
+      <el-form-item label="其他费用备注" prop="otherRemark">
+        <el-input v-model="form.otherRemark" placeholder="请输入其他费用备注" />
+      </el-form-item>
+      <el-form-item label="直接成本" prop="directExpense">
+        <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
+      </el-form-item>
+      <el-form-item label="预算总额" prop="totalBudget">
+        <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
+      </el-form-item>
+      <el-form-item label="编制人" prop="compiler">
+        <el-input v-model="form.compiler" placeholder="请输入编制人" />
+      </el-form-item>
+      <el-form-item label="审核人" prop="auditor">
+        <el-input v-model="form.auditor" placeholder="请输入审核人" />
+      </el-form-item>
+    </el-form>
+    <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
+import { listProject } from '@/api/oa/project/project';
+import ChooseProject from '../../flowable/form/components/chooseProject.vue';
+export default {
+  components: {
+    ChooseProject
+  },
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+      },
+      prOpen: false,
+      chooseProject: {},
+      projectList: []
+    }
+  },
+  methods: {
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.budgetId != null) {
+            updateBudget(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBudget(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    confirmProject() {
+      if (val.length == 1) {
+        this.prOpen = false;
+        this.chooseProject = val[0];
+        this.$set(this.form, 'projectId', val[0].projectId)
+        this.isSelect = true;
+      } else {
+        this.$message.error("项目只能选择一个！");
+        return;
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -21,25 +21,25 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:budget:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['oa:budget:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:budget:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:budget:export']">导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+    </el-row>
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" type="index" />
@@ -79,77 +79,12 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc预算管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="人员成本" prop="staffCost">
-          <el-input v-model="form.staffCost" placeholder="请输入人员成本" />
-        </el-form-item>
-        <el-form-item label="车辆成本" prop="carCost">
-          <el-input v-model="form.carCost" placeholder="请输入车辆成本" />
-        </el-form-item>
-        <el-form-item label="设备成本" prop="deviceCost">
-          <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
-        </el-form-item>
-        <el-form-item label="固定成本" prop="fixCost">
-          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
-        </el-form-item>
-        <el-form-item label="预结算额" prop="settleExpense">
-          <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
-        </el-form-item>
-        <el-form-item label="外协费用" prop="outExpense">
-          <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
-        </el-form-item>
-        <el-form-item label="经营费用" prop="businessExpense">
-          <el-input v-model="form.businessExpense" placeholder="请输入经营费用" />
-        </el-form-item>
-        <el-form-item label="税费成本" prop="taxExpense">
-          <el-input v-model="form.taxExpense" placeholder="请输入税费成本" />
-        </el-form-item>
-        <el-form-item label="车船租赁" prop="rentExpense">
-          <el-input v-model="form.rentExpense" placeholder="请输入车船租赁" />
-        </el-form-item>
-        <el-form-item label="其他费用" prop="otherExpense">
-          <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
-        </el-form-item>
-        <el-form-item label="外协费用备注" prop="outRemark">
-          <el-input v-model="form.outRemark" placeholder="请输入外协费用备注" />
-        </el-form-item>
-        <el-form-item label="经营管理备注" prop="businessRemark">
-          <el-input v-model="form.businessRemark" placeholder="请输入经营管理备注" />
-        </el-form-item>
-        <el-form-item label="税费成本备注" prop="taxRemark">
-          <el-input v-model="form.taxRemark" placeholder="请输入税费成本备注" />
-        </el-form-item>
-        <el-form-item label="车船租赁备注" prop="rentRemark">
-          <el-input v-model="form.rentRemark" placeholder="请输入车船租赁备注" />
-        </el-form-item>
-        <el-form-item label="其他费用备注" prop="otherRemark">
-          <el-input v-model="form.otherRemark" placeholder="请输入其他费用备注" />
-        </el-form-item>
-        <el-form-item label="直接成本" prop="directExpense">
-          <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
-        </el-form-item>
-        <el-form-item label="预算总额" prop="totalBudget">
-          <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
-        </el-form-item>
-        <el-form-item label="编制人" prop="compiler">
-          <el-input v-model="form.compiler" placeholder="请输入编制人" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="auditor">
-          <el-input v-model="form.auditor" placeholder="请输入审核人" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+      <form-data :form="form" @close="open = false"></form-data>
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
-      <budget-info :taskForm="taskForm" :taskName="''"></budget-info>
+      <budget-info :taskForm="taskForm"  :taskName="''"></budget-info>
     </el-dialog>
   </div>
 </template>
@@ -158,9 +93,10 @@
 import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
 import { listProject } from '@/api/oa/project/project';
 import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
+import FormData from './formData.vue';
 export default {
   name: "Budget",
-  components: { budgetInfo, },
+  components: { budgetInfo, FormData, },
   data() {
     return {
       // 遮罩层
@@ -212,7 +148,9 @@ export default {
       // 表单校验
       rules: {
       },
-      taskForm: {},
+      taskForm: {
+        formId:''
+      },
       projectList: []
     };
   },
@@ -291,7 +229,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc预算管理";
+      this.title = "添加预算";
     },
     handleView(row) {
       this.taskForm.formId = row.projectId;
@@ -304,7 +242,7 @@ export default {
       getBudget(budgetId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc预算管理";
+        this.title = "修改预算";
       });
     },
     /** 提交按钮 */