承接合同和分包合同新增开票进度和收票进度；

合同导出可选择字段名动态输出

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

@@ -286,7 +286,7 @@ public class CmcContractController extends BaseController
                 paidPercentage = "0%";
             }
             else {
-                paidPercentage = paidAmount.divide(contract.getAmount().multiply(new BigDecimal(100))).setScale(2, RoundingMode.HALF_UP) + "%";
+                paidPercentage = paidAmount.divide(contract.getAmount(), RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP) + "%";
             }
             contract.setPaidAmount(paidAmount);
             contract.setPaidPercentage(paidPercentage);

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

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-02-12 10:55:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-07-23 16:46:53
+ */
+import request from '@/utils/request'
+
+// 查询开票列表
+export function listContractInvoice(query) {
+  return request({
+    url: '/oa/contractInvoice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询开票详细
+export function getContractInvoice(invoiceId) {
+  return request({
+    url: '/oa/contractInvoice/' + invoiceId,
+    method: 'get'
+  })
+}
+
+// 新增开票记录
+export function addContractInvoice(data) {
+  return request({
+    url: '/oa/contractInvoice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改开票记录
+export function updateContractInvoice(data) {
+  return request({
+    url: '/oa/contractInvoice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除开票记录
+export function delContractInvoice(contractId) {
+  return request({
+    url: '/oa/contractInvoice/' + contractId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/contract/components/paymentProgress.vue

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2025-02-12 13:40:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-14 15:32:51
+ * @LastEditTime: 2025-07-23 16:51:15
 -->
 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="130px" :disabled="isDisabled">
+    <el-form ref="form" :model="form" label-width="130px">
       <el-form-item label="合同名称" prop="contractName">
         <el-input style="width: 100%;" disabled v-model="form.contractName" placeholder="请输入合同名称"></el-input>
       </el-form-item>
@@ -35,6 +35,56 @@
       <el-form-item label="合同备注" prop="remark">
         <el-input type="textarea" disabled v-model="form.remark" :autosize="{ minRows: 4 }" />
       </el-form-item>
+      <el-form-item style="text-align: left;" label="开票进度">
+        <table border="1" style="width:100%" v-loading="loading">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>开票金额</td>
+            <td>开票比例（%）</td>
+            <td>开票时间</td>
+            <td style="width: 150px;">备注</td>
+          </tr>
+          <tr v-for="(invoice, index) in invoiceList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              <el-input-number style="width:100%" :controls="false" v-model="invoice.invoiceAmount" clearable
+                @blur="changeInvoiceAmount(invoice)"
+                :disabled="!$store.getters.roles.includes('business')"></el-input-number>
+            </td>
+            <td>
+              {{ invoice.invoicePercentage }}
+            </td>
+            <td>
+              <el-date-picker style="width:100%" v-model="invoice.invoiceTime" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" :disabled="!$store.getters.roles.includes('business')">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="invoice.remark" type="textarea" clearable :autosize="{ minRows: 2 }"
+                :disabled="!$store.getters.roles.includes('business')"></el-input>
+            </td>
+            <td v-show="$store.getters.roles.includes('business')">
+              <div class="delete-btn" @click="deletInvoiceItem(index)">
+                <i class="el-icon-circle-close"></i>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              合计
+            </td>
+            <td>
+              {{ invoiceSumAmount.toFixed(2) }}
+            </td>
+            <td>
+              {{ invoiceSumPercent.toFixed(2) }}
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" size="mini" @click="addInvoiceList()" type="primary" plain></el-button>
+      </el-form-item>
       <el-form-item style="text-align: left;" label="回款进度">
         <table border="1" style="width:100%" v-loading="loading">
           <tr>
@@ -50,22 +100,22 @@
             </td>
             <td>
               <el-input-number style="width:100%" :controls="false" v-model="paid.paidAmount" clearable
-                @blur="changePercentage(paid)"></el-input-number>
+                @blur="changePercentage(paid)"
+                :disabled="!$store.getters.roles.includes('finance', 'nfinance')"></el-input-number>
             </td>
             <td>
-              <!-- <el-input-number style="width:100%" :controls="false" v-model="paid.paidPercentage" clearable
-                @blur=""></el-input-number> -->
               {{ paid.paidPercentage }}
             </td>
             <td>
               <el-date-picker style="width:100%" v-model="paid.paidTime" value-format="yyyy-MM-dd" type="date"
-                placeholder="选择日期">
+                placeholder="选择日期" :disabled="!$store.getters.roles.includes('finance', 'nfinance')">
               </el-date-picker>
             </td>
             <td>
-              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"></el-input>
+              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"
+                :disabled="!$store.getters.roles.includes('finance', 'nfinance')"></el-input>
             </td>
-            <td v-show="!isDisabled">
+            <td v-show="$store.getters.roles.includes('finance', 'nfinance')">
               <div class="delete-btn" @click="deletPaiItem(index)">
                 <i class="el-icon-circle-close"></i>
               </div>
@@ -96,6 +146,7 @@
 <script>
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import { listContractPaid, getContractPaid, addContractPaid, updateContractPaid, delContractPaid } from "@/api/oa/contract/contractPaid";
+import { listContractInvoice, addContractInvoice, delContractInvoice } from "@/api/oa/contract/contractInvoice";
 export default {
   props: {
     form: {
@@ -115,27 +166,28 @@ export default {
       sumPercent: 0,
       loading: true,
       isDisabled: true,
+      invoiceList: [{
+        invoiceAmount: 0,
+        invoicePercentage: 0,
+        invoiceTime: '',
+        remark: ''
+      }],
+      invoiceSumAmount: 0,
+      invoiceSumPercent: 0,
     }
   },
   watch: {
     'form.contractId'(newVal) {
       this.getPaidList();
+      this.getInvoiceList();
     }
   },
   created() {
     this.getPartyAList();
     this.getPaidList();
-    this.isDisabledFn();
+    this.getInvoiceList();
   },
   methods: {
-    isDisabledFn() {
-      let roles = ['finance', 'nfinance']
-      if (this.$store.getters.roles.some(e => roles.includes(e))) {
-        this.isDisabled = false
-      } else {
-        this.isDisabled = true
-      }
-    },
     // 查询业主单位列表
     getPartyAList() {
       listPartyA({
@@ -162,10 +214,39 @@ export default {
         this.loading = false;
       })
     },
+    getInvoiceList() {
+      this.loading = true;
+      listContractInvoice({ contractId: this.form.contractId }).then(res => {
+        if (res.total > 0) {
+          this.invoiceList = res.rows;
+        } else {
+          this.invoiceList = [{
+            invoiceAmount: 0,
+            invoicePercentage: 0,
+            invoiceTime: '',
+            remark: ''
+          }]
+        }
+        this.getInvoiceSum();
+        this.loading = false;
+      })
+    },
     getSum() {
       this.sumAmount = this.paidList.reduce((sum, item) => sum + Number(item.paidAmount), 0);
       this.sumPercent = this.paidList.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
     },
+    getInvoiceSum() {
+      this.invoiceSumAmount = this.invoiceList.reduce((sum, item) => sum + Number(item.invoiceAmount), 0);
+      this.invoiceSumPercent = this.invoiceList.reduce((sum, item) => sum + Number(item.invoicePercentage), 0);
+    },
+    addInvoiceList() {
+      this.invoiceList.push({
+        invoiceAmount: 0,
+        invoicePercentage: 0,
+        invoiceTime: '',
+        remark: ''
+      });
+    },
     addPaiList() {
       this.paidList.push({
         paidPercentage: 0,
@@ -184,11 +265,26 @@ export default {
       }
       this.getSum();
     },
+    deletInvoiceItem(index) {
+      let arr = this.invoiceList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+      this.getInvoiceSum();
+    },
     changePercentage(paid) {
       let percent = ((paid.paidAmount / this.form.amount) * 100).toFixed(2);
       paid.paidPercentage = Number(percent);
       this.getSum();
     },
+    changeInvoiceAmount(invoice) {
+      let percent = ((invoice.invoiceAmount / this.form.amount) * 100).toFixed(2);
+      invoice.invoicePercentage = Number(percent);
+      this.getInvoiceSum();
+    },
     async confirm() {
       const contractId = this.form.contractId
       await delContractPaid(contractId);
@@ -196,7 +292,12 @@ export default {
         p.contractId = contractId
         await addContractPaid(p);
       }
-      this.$message.success('回款进度已更新');
+      await delContractInvoice(contractId);
+      for (let i of this.invoiceList) {
+        i.contractId = contractId
+        await addContractInvoice(i);
+      }
+      this.$message.success('更新成功');
       this.$emit('cancel')
       this.$emit('getList')
     }

oa-ui/src/views/oa/contract/components/subProgress.vue

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2025-02-12 13:40:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-14 15:34:18
+ * @LastEditTime: 2025-07-23 16:54:28
 -->
 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="130px" :disabled="isDisabled">
+    <el-form ref="form" :model="form" label-width="130px">
       <el-form-item label="合同名称" prop="subContractName">
         <el-input style="width: 100%;" v-model="form.subContractName" disabled placeholder="请输入合同名称"></el-input>
       </el-form-item>
@@ -26,7 +26,57 @@
         <el-input-number :controls="false" disabled v-model="form.subAmount" placeholder="请输入分包合同金额" />(元)
       </el-form-item>
       <el-form-item label="合同备注" prop="remark">
-        <el-input type="textarea" disabled v-model="form.remark" :autosize="{minRows:4}" />
+        <el-input type="textarea" disabled v-model="form.remark" :autosize="{ minRows: 4 }" />
+      </el-form-item>
+      <el-form-item style="text-align: left;" label="收票进度">
+        <table border="1" style="width:100%" v-loading="loading">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>收票金额</td>
+            <td>收票比例（%）</td>
+            <td>收票时间</td>
+            <td style="width: 150px;">备注</td>
+          </tr>
+          <tr v-for="(invoice, index) in invoiceList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              <el-input-number style="width:100%" :controls="false" v-model="invoice.invoiceAmount" clearable
+                @blur="changeInvoiceAmount(invoice)"
+                :disabled="!$store.getters.roles.includes('business')"></el-input-number>
+            </td>
+            <td>
+              {{ invoice.invoicePercentage }}
+            </td>
+            <td>
+              <el-date-picker style="width:100%" v-model="invoice.invoiceTime" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" :disabled="!$store.getters.roles.includes('business')">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="invoice.remark" type="textarea" clearable :autosize="{ minRows: 2 }"
+                :disabled="!$store.getters.roles.includes('business')"></el-input>
+            </td>
+            <td v-show="$store.getters.roles.includes('business')">
+              <div class="delete-btn" @click="deletInvoiceItem(index)">
+                <i class="el-icon-circle-close"></i>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              合计
+            </td>
+            <td>
+              {{ invoiceSumAmount.toFixed(2) }}
+            </td>
+            <td>
+              {{ invoiceSumPercent.toFixed(2) }}
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" size="mini" @click="addInvoiceList()" type="primary" plain></el-button>
       </el-form-item>
       <el-form-item style="text-align: left;" label="付款进度">
         <table border="1" style="width:100%" v-loading="loading">
@@ -43,7 +93,8 @@
             </td>
             <td>
               <el-input-number style="width:100%" :controls="false" v-model="paid.paidAmount" clearable
-                @blur="changePercentage(paid)"></el-input-number>
+                @blur="changePercentage(paid)"
+                :disabled="!$store.getters.roles.includes('finance', 'nfinance')"></el-input-number>
             </td>
             <td>
               <!-- <el-input-number style="width:100%" :controls="false" v-model="paid.paidPercentage" clearable
@@ -52,13 +103,14 @@
             </td>
             <td>
               <el-date-picker style="width:100%" v-model="paid.paidTime" value-format="yyyy-MM-dd" type="date"
-                placeholder="选择日期">
+                placeholder="选择日期" :disabled="!$store.getters.roles.includes('finance', 'nfinance')">
               </el-date-picker>
             </td>
             <td>
-              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"></el-input>
+              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"
+                :disabled="!$store.getters.roles.includes('finance', 'nfinance')"></el-input>
             </td>
-            <td v-show="!isDisabled">
+            <td v-show="$store.getters.roles.includes('finance', 'nfinance')">
               <div class="delete-btn" @click="deletPaiItem(index)">
                 <i class="el-icon-circle-close"></i>
               </div>
@@ -89,6 +141,7 @@
 <script>
 import { listPartner } from "@/api/oa/partner/partner";
 import { listContractPaid, addContractPaid, delContractPaid } from "@/api/oa/contract/contractPaid";
+import { listContractInvoice, addContractInvoice, delContractInvoice } from "@/api/oa/contract/contractInvoice";
 export default {
   props: {
     form: {
@@ -107,29 +160,29 @@ export default {
       sumAmount: 0,
       sumPercent: 0,
       loading: true,
-      isDisabled:true,
+      isDisabled: true,
+      invoiceList: [{
+        invoiceAmount: 0,
+        invoicePercentage: 0,
+        invoiceTime: '',
+        remark: ''
+      }],
+      invoiceSumAmount: 0,
+      invoiceSumPercent: 0,
     }
   },
   watch: {
     'form.subContractId'(newVal) {
       this.getPaidList();
+      this.getInvoiceList();
     }
   },
   created() {
     this.getPartnerList();
     this.getPaidList();
-    this.isDisabledFn();
-    
+    this.getInvoiceList();
   },
   methods: {
-    isDisabledFn(){
-      let roles = ['finance', 'nfinance']
-      if(this.$store.getters.roles.some(e => roles.includes(e))){
-        this.isDisabled = false
-      }else{
-        this.isDisabled = true
-      }
-    },
     // 查询承接单位列表
     getPartnerList() {
       listPartner({
@@ -156,10 +209,39 @@ export default {
         this.loading = false;
       })
     },
+    getInvoiceList() {
+      this.loading = true;
+      listContractInvoice({ contractId: this.form.subContractId }).then(res => {
+        if (res.total > 0) {
+          this.invoiceList = res.rows;
+        } else {
+          this.invoiceList = [{
+            invoiceAmount: 0,
+            invoicePercentage: 0,
+            invoiceTime: '',
+            remark: ''
+          }]
+        }
+        this.getInvoiceSum();
+        this.loading = false;
+      })
+    },
     getSum() {
       this.sumAmount = this.paidList.reduce((sum, item) => sum + Number(item.paidAmount), 0);
       this.sumPercent = this.paidList.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
     },
+    getInvoiceSum() {
+      this.invoiceSumAmount = this.invoiceList.reduce((sum, item) => sum + Number(item.invoiceAmount), 0);
+      this.invoiceSumPercent = this.invoiceList.reduce((sum, item) => sum + Number(item.invoicePercentage), 0);
+    },
+    addInvoiceList() {
+      this.invoiceList.push({
+        invoiceAmount: 0,
+        invoicePercentage: 0,
+        invoiceTime: '',
+        remark: ''
+      });
+    },
     addPaiList() {
       this.paidList.push({
         paidPercentage: 0,
@@ -178,11 +260,26 @@ export default {
       }
       this.getSum();
     },
+    deletInvoiceItem(index) {
+      let arr = this.invoiceList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+      this.getInvoiceSum();
+    },
     changePercentage(paid) {
       let percent = ((paid.paidAmount / this.form.subAmount) * 100).toFixed(2);
       paid.paidPercentage = Number(percent);
       this.getSum();
     },
+    changeInvoiceAmount(invoice) {
+      let percent = ((invoice.invoiceAmount / this.form.subAmount) * 100).toFixed(2);
+      invoice.invoicePercentage = Number(percent);
+      this.getInvoiceSum();
+    },
     async confirm() {
       const contractId = this.form.subContractId
       await delContractPaid(contractId);
@@ -190,7 +287,12 @@ export default {
         p.contractId = contractId
         await addContractPaid(p);
       }
-      this.$message.success('付款进度已更新');
+      await delContractInvoice(contractId);
+      for (let i of this.invoiceList) {
+        i.contractId = contractId
+        await addContractInvoice(i);
+      }
+      this.$message.success('更新成功');
       this.$emit('cancel')
       this.$emit('getList')
     }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
- * @LastEditors: wrh
- * @LastEditTime: 2025-07-17 10:57:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-07-23 17:17:19
 -->
 <template>
   <div class="app-container">
@@ -22,11 +22,10 @@
             :value="partyA.partyAId">
           </el-option>
         </el-select>
-      </el-form-item>      
+      </el-form-item>
       <el-form-item label="工作内容" prop="queryString">
-          <el-input v-model="queryParams.queryString" placeholder="请输入关键字" clearable
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
+        <el-input v-model="queryParams.queryString" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -39,7 +38,7 @@
           v-hasPermi="['oa:contract:add']">登记承接合同</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportOpen = true"
           v-hasPermi="['oa:contract:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -53,50 +52,35 @@
       <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
       <el-table-column label="合同编码（公司）" align="center" prop="contractCode" />
       <el-table-column label="合同编号（业主）" align="center" prop="contractNumber" />
-      <!-- <el-table-column label="履约保证金" align="center" prop="deposit" /> -->
-      <!-- <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
-            {{ getFileName(scope.row.contractDocument) }}
-          </el-link>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="拟稿日期" align="center" prop="draftTime">
+      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="110px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="签订日期" align="center" prop="signDate">
+      <el-table-column label="签订日期" align="center" prop="signDate" width="110px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="percentage" align="center" label="回款进度" width="120px" sortable>
+      <el-table-column prop="percentage" align="center" label="开票/回款进度" width="130px" sortable>
         <template slot-scope="scope">
-          <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
-            :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+          <div class="mb10">
+            <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
+              :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+            <div>
+              {{ scope.row.paidAmount }}
+            </div>
+          </div>
+          <div>
+            <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
+              :percentage="scope.row.percentage" text-color="#fff"></el-progress>
             <div>
-              {{scope.row.paidAmount}}
+              {{ scope.row.paidAmount }}
             </div>
+          </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
-      <!-- <el-table-column label="签订扫描件" align="center" prop="signScan" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
-            {{ getFileName(scope.row.signScan) }}
-          </el-link>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="评审方式" align="center" prop="commentType">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.commentType == '2' ? 'success' : 'warning'">
-            {{ getCommentType(scope.row.commentType) }}
-          </el-tag>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="合同备注" align="center" prop="remark" /> -->
-      <el-table-column label="拟稿人" align="center" prop="drafter">
+      <el-table-column label="拟稿人" align="center" prop="drafter" width="110px">
         <template slot-scope="scope">
           {{ getUserName(scope.row.drafter) }}
         </template>
@@ -128,6 +112,22 @@
     <el-dialog :title="title" :visible.sync="progressOpen" width="50%" append-to-body>
       <payment-progress :form="progressContract" @cancel="progressOpen = false" @getList="getList"></payment-progress>
     </el-dialog>
+    <!-- 导出对话框 -->
+    <el-dialog :title="title" :visible.sync="exportOpen" width="50%" append-to-body>
+      <el-form>
+        <el-form-item label="导出字段名" label-width="100px">
+          <el-checkbox-group v-model="selectedFields">
+            <el-checkbox v-for="field in fieldsObj" :key="field.value" :label="field.value">
+              {{ field.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleExport">导出</el-button>
+        <el-button @click="exportOpen = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -198,6 +198,20 @@ export default {
       queryLoading: true,
       progressContract: {},
       progressOpen: false,
+      exportOpen: false,
+      fieldsObj: [
+        { label: '合同名称', value: 'contractName' },
+        { label: '合同金额', value: 'amount' },
+        { label: '甲方单位', value: 'partyAName' },
+        { label: '合同编码（公司）', value: 'contractCode' },
+        { label: '合同编号（业主）', value: 'contractNumber' },
+        { label: '拟稿人', value: 'drafter' },
+        { label: '拟稿日期', value: 'draftTime' },
+        { label: '签订日期', value: 'signDate' },
+        { label: '实际回款金额', value: 'paidAmount' },
+        { label: '实际回款比例', value: 'paidPercentage' },
+      ],
+      selectedFields: []
     };
   },
   created() {
@@ -425,8 +439,11 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('oa/contract/export', {
-        ...this.queryParams
+      let selectFields = this.selectedFields.join(',');
+      console.log(selectFields);
+      this.download('oa/contract/exportSelectFields', {
+        ...this.queryParams,
+        selectFields: selectFields
       }, `contract_${new Date().getTime()}.xlsx`)
     },
     remoteMethod(val) {