1.申请开票新增关联产品收款信息，及表单优化

2.其他页面优化
3.结算列表新增开票信息展示

src/api/modules/financeInvoice.js

@@ -29,5 +29,8 @@ export default {
    },
    getInvoiceAmountInfo(params){
     return request.post(`financeInvoice/productions`,params)
-   }
+   },
+   invoiceCheck(params) {
+    return request.put(`financeInvoice/check`, params)
+  }
 }

src/components/MoreSearchBar/index.vue

@@ -37,7 +37,7 @@
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户经理" clearable >
+                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户名称" clearable >
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">

src/views/assets/myOrderList.vue

@@ -176,7 +176,7 @@
                                 实收款分配
                             </el-button>
                             <el-button type="text" size="mini"
-                                @click="openFinanceInvoiceDialog(row.orderFundId)">
+                                @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId)">
                                 申请开票
                             </el-button>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
@@ -246,7 +246,8 @@
                 <el-row>
                     <el-col>
                         <el-form-item label="报告号：" prop="remark" label-width="160px" class="postInfo-container-item">
-                            <el-input type="input" placeholder="请输入申请提前出库原因" v-model="outWarehouse.reportNo" disabled></el-input>
+                            <el-input type="input" placeholder="请输入申请提前出库原因" v-model="outWarehouse.reportNo"
+                                disabled></el-input>
                         </el-form-item>
                         <el-form-item label="出库原因：" prop="remark" label-width="160px" class="postInfo-container-item">
                             <el-input type="textarea" placeholder="请输入申请提前出库原因" v-model="outWarehouse.remark"></el-input>
@@ -385,8 +386,7 @@
                 </el-table>
             </div>
         </el-dialog>
-        <el-dialog :visible.sync="newInvoiceDialog" width="75%" center custom-class="doWarehouseClass"
-            @closed="cleanFinanceInvoiceForm()">
+        <el-dialog :visible.sync="newInvoiceDialog" width="75%" center custom-class="doWarehouseClass" @closed="cleanFinanceInvoiceForm()">
             <el-form ref="invoice" :model="invoice">
                 <el-divider content-position="left">开票信息</el-divider>
                 <el-row>
@@ -425,8 +425,8 @@
                         <el-form-item label="计划开票日期：" prop="planMakeDate"
                             :rules="{ required: true, message: '计划开票日期不能为空', trigger: 'blur' }" label-width="140px"
                             class="postInfo-container-item">
-                            <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
-                                style="width:206px">
+                            <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期"
+                                value-format="yyyy-MM-dd" style="width:206px">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -608,6 +608,7 @@ export default {
             invoice: {
                 id: null,
                 orderFundId: null,
+                productionFundId: null,
                 title: null,
                 type: null,
                 taxNo: null,
@@ -635,7 +636,7 @@ export default {
         this.getAllotDepartment();
         // 获取我的资产业务订单
         this.selectMyOrderPage();
-        if(this.$route.query.repertoryOutWarehouseVisible === 'true'){
+        if (this.$route.query.repertoryOutWarehouseVisible === 'true') {
             this.openRepertoryOutWarehouse(JSON.parse(this.$route.query.row));
         }
     },
@@ -1034,7 +1035,7 @@ export default {
                 }
             })
         },
-        openFinanceInvoiceDialog(orderFundId) {
+        openFinanceInvoiceDialog(orderFundId, productionFundId) {
             if (!orderFundId) {
                 this.$notify({
                     title: '提示',
@@ -1047,6 +1048,7 @@ export default {
             this.makeInvoiceListDialog = true;
             if (orderFundId) {
                 this.invoice.orderFundId = orderFundId;
+                this.invoice.productionFundId = productionFundId;
                 this.getFinanceInvoiceList();
             }
         },
@@ -1155,7 +1157,27 @@ export default {
             })
         },
         cleanFinanceInvoiceForm() {
-            
+            this.$refs.invoice.resetFields();
+            this.invoice = {
+                id: null,
+                orderFundId: this.invoice.orderFundId,
+                productionFundId: this.invoice.productionFundId,
+                title: null,
+                type: null,
+                taxNo: null,
+                planAmount: null,
+                planMakeDate: null,
+                bankName: null,
+                bankAccount: null,
+                bankAddress: null,
+                bankTel: null,
+                makeItem: null,
+                itemQuantity: null,
+                itemUnit: null,
+                taxRate: null,
+                taxAmount: null,
+                remark: null
+            }
         },
         // 获取部门下拉列表
         getAllotDepartment() {

src/views/finance/invoiceCheck.vue

@@ -205,8 +205,8 @@
                 label-width="140px"
                 class="postInfo-container-item"
               >
-                <el-radio  :value="invoice.isPayAll" :label="false||null" border size="medium" readonly>否</el-radio>
-                <el-radio  :value="invoice.isPayAll" :label="true" border size="medium" readonly>是</el-radio>
+                <el-radio v-model="invoice.isPayAll" :label="false" border size="medium" readonly>否</el-radio>
+                <el-radio v-model="invoice.isPayAll" :label="true" border size="medium" readonly>是</el-radio>
               </el-form-item>
             </el-col>
           </el-row> 
@@ -499,9 +499,7 @@ export default {
                 return;
             }
             this.invoice.state = '已开票';
-            this.invoice.checkerId = this.$store.getters.userInfo.id;
-            this.invoice.makerId = this.$store.getters.userInfo.id;
-            this.$api.financeInvoice.edit(this.invoice).then(res=>{
+            this.$api.financeInvoice.invoiceCheck(this.invoice).then(res=>{
               if (res.code === 200 && res.data){
                 this.$notify({
                   title: '成功',

src/views/finance/settleAssets.vue

@@ -119,7 +119,7 @@
                                 <span>{{ row.evaluateAmount }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="invoiceUser" align="center" show-overflow-tooltip>
+                        <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
                                 <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
                             </template>
@@ -251,19 +251,19 @@
                                 <span>{{ row.evaluateAmount }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="开票日期" align="center">
+                        <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceDate }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="开票人" align="center">
+                        <el-table-column prop="invoiceNo" label="发票号" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceUser }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceNo }} <br> </span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="发票号" align="center">
+                        <el-table-column prop="invoiceDate" label="开票日期" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceNo }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
                             </template>
                         </el-table-column>
                     </parentTable>

src/views/finance/settleMajor.vue

@@ -1,448 +1,455 @@
 <template>
   <div class="app-container organization-index">
     <div class="title-container">
-      <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-      <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="margin-top: 10px;">
-        <el-tab-pane label="评估人员" name="evaluate">
-          <y-page-list-layout :get-page-list="majorEvaluatorSettleProd" :page-list="evaluatorProd" :page-para="listQuery1">
-            <template slot="left">
-              <el-date-picker  clearable v-model="findDate" type="daterange" align="center" unlink-panels
-                            range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
-                            value-format="yyyy-MM-dd" style="float: left;">
-              </el-date-picker>
-              <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.clientManager" placeholder="客户经理" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1()" round>搜索
-              </el-button>
-              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
-              </el-button>
-              <el-button class="filter-item" style="float: left;" round type="info" @click="exportEvaluateSettleProd()">导出
-              </el-button>
-            </template>
-            <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
-              <el-table-column label="项目编号"  width="110" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.orderId }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="产品号" width="200" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.reportNo }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="结算日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span style="color:red">{{ row.settleDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="归档日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.saveFileDate}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目名称"  width="200" align="center"  show-overflow-tooltip>
-                <template slot-scope="{row}">
-                  <span>{{ row.name }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户名称"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="业务来源"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientSubName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="委托方"  width="200" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.bailor }}</span>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column label="分配产值"   align="center">
+    <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="margin-top: 10px;">
+      <el-tab-pane label="评估人员" name="evaluate">
+        <y-page-list-layout :get-page-list="majorEvaluatorSettleProd" :page-list="evaluatorProd" :page-para="listQuery1">
+          <template slot="left">
+            <el-date-picker clearable v-model="findDate" type="daterange" align="center" unlink-panels range-separator="至"
+              start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
+              value-format="yyyy-MM-dd" style="float: left;">
+            </el-date-picker>
+            <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery1.principal" placeholder="负责人" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery1.clientManager" placeholder="客户经理" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1()"
+              round>搜索
+            </el-button>
+            <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
+            </el-button>
+            <el-button class="filter-item" style="float: left;" round type="info" @click="exportEvaluateSettleProd()">导出
+            </el-button>
+          </template>
+          <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
+            <el-table-column label="项目编号" width="110" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.orderId }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="产品号" width="200" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.reportNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结算日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span style="color:red">{{ row.settleDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="认领日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.claimDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="归档日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.saveFileDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span>{{ row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="业务来源" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientSubName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="委托方" width="200" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.bailor }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="分配产值"   align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.clientSubName }}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column label="市场部"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.marketDepartmentName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估部"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.evaluateDepartmentName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户经理" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientManager }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="负责人"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.principal }}</span>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column label="参与人"  align="center">
+            <el-table-column label="市场部" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.marketDepartmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="评估部" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.evaluateDepartmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户经理" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientManager }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="负责人" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.principal }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="参与人"  align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.principal }}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column label="结算金额(元)"  align="center">
-                <template slot-scope="{row}">
-                  <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估价值(万元)"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.evaluateAmount/10000 }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="开票日期"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="开票人"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceUser }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="发票号"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceNo }}</span>
-                </template>
-              </el-table-column>
-            </parentTable>
-          </y-page-list-layout>
-        </el-tab-pane>
-        <el-tab-pane label="市场人员" name="market">
-          <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2">
-            <template slot="left">
-              <el-date-picker  clearable v-model="findDate1" type="daterange" align="center" unlink-panels
-                            range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
-                            value-format="yyyy-MM-dd" style="float: left;">
-              </el-date-picker>
-              <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery2.reportNo" placeholder="产品号" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery2.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery2.clientManager" placeholder="客户经理" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList2()" round>搜索
-              </el-button>
-              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
-              </el-button>
-              <el-button class="filter-item" style="float: left;" round type="info" @click="exportMarketSettleProd()">导出
-              </el-button>
-            </template>
-            <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
-              <el-table-column label="项目编号"  width="110" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.orderId }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="产品号" width="200" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.reportNo }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="结算日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span style="color:red">{{ row.settleDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="送达日期"  width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.deliveryDate}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目名称"  width="200" align="center"  show-overflow-tooltip>
-                <template slot-scope="{row}">
-                  <span>{{ row.name }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户名称"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="业务来源"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientSubName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="委托方" width="100"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.bailor }}</span>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column label="分配产值"   align="center">
+            <el-table-column label="结算金额(元)" align="center">
+              <template slot-scope="{row}">
+                <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="评估价值(万元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.evaluateAmount / 10000 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceNo" label="发票号" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceNo }} <br> </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceDate" label="开票日期" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
+              </template>
+            </el-table-column>
+          </parentTable>
+        </y-page-list-layout>
+      </el-tab-pane>
+      <el-tab-pane label="市场人员" name="market">
+        <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2">
+          <template slot="left">
+            <el-date-picker clearable v-model="findDate1" type="daterange" align="center" unlink-panels
+              range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
+              value-format="yyyy-MM-dd" style="float: left;">
+            </el-date-picker>
+            <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.reportNo" placeholder="产品号" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.principal" placeholder="负责人" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.clientManager" placeholder="客户经理" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList2()"
+              round>搜索
+            </el-button>
+            <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
+            </el-button>
+            <el-button class="filter-item" style="float: left;" round type="info" @click="exportMarketSettleProd()">导出
+            </el-button>
+          </template>
+          <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+            <el-table-column label="项目编号" width="110" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.orderId }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="产品号" width="200" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.reportNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结算日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span style="color:red">{{ row.settleDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="认领日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.claimDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="送达日期" width="100" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.deliveryDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span>{{ row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="业务来源" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientSubName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="委托方" width="100" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.bailor }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="分配产值"   align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.clientSubName }}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column label="市场部"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.marketDepartmentName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估部"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.evaluateDepartmentName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户经理" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.clientManager }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="负责人"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.principal }}</span>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column label="参与人"  align="center">
+            <el-table-column label="市场部" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.marketDepartmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="评估部" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.evaluateDepartmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户经理" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientManager }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="负责人" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.principal }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="参与人"  align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.principal }}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column label="结算金额(元)"  align="center">
-                <template slot-scope="{row}">
-                  <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估价值(万元)"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.evaluateAmount/10000 }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="开票日期"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="开票人"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceUser }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="发票号"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.invoiceNo }}</span>
-                </template>
-              </el-table-column>
-            </parentTable>
-          </y-page-list-layout>
-        </el-tab-pane>
-      </el-tabs>
+            <el-table-column label="结算金额(元)" align="center">
+              <template slot-scope="{row}">
+                <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="评估价值(万元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.evaluateAmount / 10000 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceNo" label="发票号" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceNo }} <br> </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="invoiceDate" label="开票日期" align="center" show-overflow-tooltip>
+              <template slot-scope="{row}">
+                <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
+              </template>
+            </el-table-column>
+          </parentTable>
+        </y-page-list-layout>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
-  import Breadcrumb from '@/components/Breadcrumb'
-  import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import YPageListLayout from '@/components/YPageListLayout'
 
-  export default {
-    name: 'settleMajor',
-    components: {
-      Breadcrumb,
-      YPageListLayout
-    },
+export default {
+  name: 'settleMajor',
+  components: {
+    Breadcrumb,
+    YPageListLayout
+  },
 
-    data() {
-      return {
-        activeName: 'evaluate',
-        listQuery1: {
-          page: 1,
-          size: 10,
-          descs: 'id',
-          startDate:'2024-05-01 00:00:00',
-          endDate:'2024-06-01 00:00:00'
-        },
-         listQuery2: {
-          page: 1,
-          size: 10,
-          descs: 'id',
-          startDate:'2024-05-01 00:00:00',
-          endDate:'2024-06-01 00:00:00'
-        },
-        pickerOptions: {
-                shortcuts: [{
-                    text: '最近一周',
-                    onClick(picker) {
-                        const end = new Date();
-                        const start = new Date();
-                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                        picker.$emit('pick', [start, end]);
-                    }
-                }, {
-                    text: '最近一个月',
-                    onClick(picker) {
-                        const end = new Date();
-                        const start = new Date();
-                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                        picker.$emit('pick', [start, end]);
-                    }
-                }, {
-                    text: '最近三个月',
-                    onClick(picker) {
-                        const end = new Date();
-                        const start = new Date();
-                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                        picker.$emit('pick', [start, end]);
-                    }
-                }]
-        },
-        findDate: [],
-        findDate1: [],
-        evaluatorProd:{
-          records:[]
-        },
-        marketProd:{
-          records:[]
-        }
-      }
-    },
-    created() {
-      this.findDate.push(this.getDefaultStartDate());
-      this.findDate.push(this.getDefaultEndDate());
-      this.findDate1.push(this.getDefaultStartDate());
-      this.findDate1.push(this.getDefaultEndDate());
-      this.majorEvaluatorSettleProd();
-    },
-    methods: {
-
-      getDefaultStartDate(){
-        const currentDate = new Date();
-        const currentYear = currentDate.getFullYear();
-        var currentMonth = String(currentDate.getMonth()).padStart(2,"0");
-        return currentYear+'-'+currentMonth+'-'+'23'
+  data() {
+    return {
+      activeName: 'evaluate',
+      listQuery1: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+        startDate: '2024-05-01 00:00:00',
+        endDate: '2024-06-01 00:00:00'
       },
-
-      getDefaultEndDate(){
-        const currentDate = new Date();
-        const currentYear = currentDate.getFullYear();
-        var currentMonth = String(currentDate.getMonth() + 1).padStart(2,"0");
-        return currentYear+'-'+currentMonth+'-'+'22'
+      listQuery2: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+        startDate: '2024-05-01 00:00:00',
+        endDate: '2024-06-01 00:00:00'
       },
-   
-      handleClick(tab, event) {
-          if (tab.name==='market'){
-              this.majorMarketSettleProd();
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
           }
-          if (tab.name==='evaluate'){
-            this.majorEvaluatorSettleProd()
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
           }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      findDate: [],
+      findDate1: [],
+      evaluatorProd: {
+        records: []
       },
+      marketProd: {
+        records: []
+      }
+    }
+  },
+  created() {
+    this.findDate.push(this.getDefaultStartDate());
+    this.findDate.push(this.getDefaultEndDate());
+    this.findDate1.push(this.getDefaultStartDate());
+    this.findDate1.push(this.getDefaultEndDate());
+    this.majorEvaluatorSettleProd();
+  },
+  methods: {
+
+    getDefaultStartDate() {
+      const currentDate = new Date();
+      const currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth()).padStart(2, "0");
+      return currentYear + '-' + currentMonth + '-' + '23'
+    },
+
+    getDefaultEndDate() {
+      const currentDate = new Date();
+      const currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
+      return currentYear + '-' + currentMonth + '-' + '22'
+    },
+
+    handleClick(tab, event) {
+      if (tab.name === 'market') {
+        this.majorMarketSettleProd();
+      }
+      if (tab.name === 'evaluate') {
+        this.majorEvaluatorSettleProd()
+      }
+    },
+
 
-        
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.findDate = [this.getDefaultStartDate(),this.getDefaultEndDate()];;
+      this.findDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];;
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
-        startDate:null,
-        endDate:null,
+        startDate: null,
+        endDate: null,
       }
       this.majorEvaluatorSettleProd()
     },
-   
+
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
       this.listQuery1.size = 10
-      if (this.findDate){
-        this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
-        this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+      if (this.findDate) {
+        this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
+        this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
       }
       this.majorEvaluatorSettleProd()
     },
 
     resetSearch2() {
       this.$router.push({ query: {} });
-      this.findDate1 = [this.getDefaultStartDate(),this.getDefaultEndDate()];
+      this.findDate1 = [this.getDefaultStartDate(), this.getDefaultEndDate()];
       this.listQuery2 = {
         current: 1,
         size: 10,
         descs: 'id',
-        startDate:null,
-        endDate:null,
+        startDate: null,
+        endDate: null,
       }
       this.majorMarketSettleProd()
     },
-   
+
     searchList2() {
       // 重置分页
       this.listQuery2.page = 1
       this.listQuery2.size = 10
-      if (this.findDate1){
-        this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
-        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+      if (this.findDate1) {
+        this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
       }
       this.majorMarketSettleProd()
     },
 
-    majorEvaluatorSettleProd(){
-        if (this.findDate){
-          this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
-          this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+    majorEvaluatorSettleProd() {
+      if (this.findDate) {
+        this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
+        this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+      }
+      this.$api.financeRealFund.majorEvaluatorSettleProd(this.listQuery1).then(res => {
+        if (res.code === 200) {
+          this.evaluatorProd = res.data;
         }
-        this.$api.financeRealFund.majorEvaluatorSettleProd(this.listQuery1).then(res=>{
-          if (res.code === 200){
-              this.evaluatorProd = res.data;
-          }
-        })
-      },
-    majorMarketSettleProd(){
-      if (this.findDate1){
-        this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
-        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+      })
+    },
+    majorMarketSettleProd() {
+      if (this.findDate1) {
+        this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
       }
-      this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res=>{
-        if (res.code === 200){
-            this.marketProd = res.data;
+      this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res => {
+        if (res.code === 200) {
+          this.marketProd = res.data;
         }
       })
     },
-    exportMarketSettleProd(){
+    exportMarketSettleProd() {
       this.$utils.exportUtil(
-      "/financeRealFund/major/market/settle/export", this.listQuery2,
-      "导出"
+        "/financeRealFund/major/market/settle/export", this.listQuery2,
+        "导出"
       );
     },
-    exportEvaluateSettleProd(){
+    exportEvaluateSettleProd() {
       this.$utils.exportUtil(
-      "/financeRealFund/major/evaluator/settle/export", this.listQuery1,
-      "导出"
+        "/financeRealFund/major/evaluator/settle/export", this.listQuery1,
+        "导出"
       );
     }
-    }
   }
+}
 </script>
-<style scoped lang="scss">
-
-
-</style>
+<style scoped lang="scss"></style>

src/views/major/myOrder.vue

@@ -595,6 +595,7 @@ export default {
       invoice: {
         id: null,
         orderFundId: null,
+        productionFundId: null,
         title: null,
         type: null,
         taxNo: null,
@@ -881,6 +882,7 @@ export default {
       this.invoice = {
         id: null,
         orderFundId: this.invoice.orderFundId,
+        productionFundId: this.invoice.productionFundId,
         title: null,
         type: null,
         taxNo: null,