需求优化

src/views/brokerage/collect.vue

@@ -70,6 +70,17 @@
         >重置
         </el-button>
       </template>
+      <template slot="right">
+        <PermissionButton
+          menu-code="_views_collect_export"
+          class-name="filter-item"
+          round
+          type="primary"
+          name="导出"
+          @click="collectExport"
+        >
+        </PermissionButton>
+      </template>
       <parentTable
         v-loading="listLoading"
         :data="pageData.records"
@@ -207,6 +218,12 @@
       this.getList()
     },
     methods: {
+      collectExport(){
+        this.$utils.exportUtil(
+          "/itemBrokerageGeneral/export", this.listQuery,
+          "导出"
+        );
+      },
       goDetail(id){
         this.$router.push(`/brokerage/item/detail?generalId=${id}`)
       },

src/views/brokerage/deduction.vue

@@ -171,7 +171,7 @@
           return '个人提成';
         }
         if (val === 'TEAM_SHARE'){
-          return '团队抽成';
+          return '团队提成';
         }
       },
       itemCate(val){

src/views/brokerage/detail.vue

@@ -41,7 +41,7 @@
           class="filter-item"
         >
           <el-option label="个人提成" value="PERSONAL"/>
-          <el-option label="团队抽成" value="TEAM_SHARE"/>
+          <el-option label="团队提成" value="TEAM_SHARE"/>
         </el-select>
         <el-button
           class="filter-item"
@@ -60,6 +60,17 @@
         >重置
         </el-button>
       </template>
+      <template slot="right">
+        <PermissionButton
+          menu-code="_views_detail_export"
+          class-name="filter-item"
+          round
+          type="primary"
+          name="导出"
+          @click="detailExport"
+        >
+        </PermissionButton>
+      </template>
       <parentTable
         v-loading="listLoading"
         :data="pageData.records"
@@ -181,6 +192,12 @@
       this.getList()
     },
     methods: {
+      detailExport(){
+        this.$utils.exportUtil(
+          "/itemBrokerageDetail/export", this.listQuery,
+          "导出"
+        );
+      },
       resetSearch() {
         this.listQuery = {
           current: 1,
@@ -208,7 +225,7 @@
           return '个人提成';
         }
         if (val === 'TEAM_SHARE'){
-          return '团队抽成';
+          return '团队提成';
         }
       },
       getList() {

src/views/brokerage/sequence.vue

@@ -23,6 +23,45 @@
           <el-option label="项目结算" value="ITEM_SETTLE"/>
           <el-option label="默认预提" value="DEFAULT_AHEAD"/>
         </el-select>
+        <el-select
+          v-model="listQuery.year"
+          placeholder="结算年份"
+          clearable
+          filterable
+          style="margin-left: 20px;width: 100px;float: left;"
+          class="filter-item"
+        >
+          <el-option label="2022" value="2022"/>
+          <el-option label="2023" value="2023"/>
+          <el-option label="2024" value="2024"/>
+          <el-option label="2025" value="2025"/>
+          <el-option label="2026" value="2026"/>
+          <el-option label="2027" value="2027"/>
+          <el-option label="2028" value="2028"/>
+          <el-option label="2029" value="2029"/>
+          <el-option label="2030" value="2030"/>
+        </el-select>
+        <el-select
+          v-model="listQuery.month"
+          placeholder="结算月份"
+          clearable
+          filterable
+          style="margin-left: 20px;width: 100px;float: left;"
+          class="filter-item"
+        >
+          <el-option label="1" value="1"/>
+          <el-option label="2" value="2"/>
+          <el-option label="3" value="3"/>
+          <el-option label="4" value="4"/>
+          <el-option label="5" value="5"/>
+          <el-option label="6" value="6"/>
+          <el-option label="7" value="7"/>
+          <el-option label="8" value="8"/>
+          <el-option label="9" value="9"/>
+          <el-option label="10" value="10"/>
+          <el-option label="11" value="11"/>
+          <el-option label="12" value="12"/>
+        </el-select>
         <el-button
           class="filter-item"
           style="margin-left: 10px;float: left;"
@@ -40,6 +79,17 @@
         >重置
         </el-button>
       </template>
+      <template slot="right">
+        <PermissionButton
+          menu-code="_views_settle_export"
+          class-name="filter-item"
+          round
+          type="primary"
+          name="导出"
+          @click="settleExport"
+        >
+        </PermissionButton>
+      </template>
       <parentTable
         v-loading="listLoading"
         :data="pageData.records"
@@ -54,21 +104,36 @@
                   <span>{{ row.itemName }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="预计结算总金额(元)" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.predictAmount }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="阶段名称" align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.stageName===null?'-':row.stageName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="预计结算金额(元)" align="center">
+              <el-table-column label="回款名称" align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.predictAmount }}</span>
+                  <span>{{ row.paymentName===null?'-':row.paymentName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="实际结算金额(元)" align="center">
+              <el-table-column label="回款金额" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.paymentAmount===null?'-':row.paymentAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="本次结算金额(元)" align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.brokerageAmount }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="未结算金额(元)" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.unsettledAmount }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="结算类型" align="center">
                 <template slot-scope="{row}">
                   <span>{{ itemCate(row.brokerageCate) }}</span>
@@ -102,6 +167,16 @@
             <span>{{settleCate(row.cate)}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="结算年份" align="center" width="150">
+          <template slot-scope="{row}">
+            <span>{{row.year}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结算月份" align="center" width="150">
+          <template slot-scope="{row}">
+            <span>{{row.month}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="提成体现" align="center" width="150">
           <template slot-scope="{row}">
             <span>{{ row.embody}}</span>
@@ -178,6 +253,12 @@
       this.getList()
     },
     methods: {
+      settleExport(){
+        this.$utils.exportUtil(
+          "/itemBrokerageSequence/export", this.listQuery,
+          "导出"
+        );
+      },
       brokerageRule(val){
         if (val === 'LAND_OTHER_RULE'){
           return '参与人员规则';
@@ -197,7 +278,7 @@
           return '个人提成';
         }
         if (val === 'TEAM_SHARE'){
-          return '团队抽成';
+          return '团队提成';
         }
       },
       itemCate(val){
@@ -207,6 +288,12 @@
         if (val === 'SETTLE'){
           return '结算';
         }
+        if (val === 'PAYMENT_SETTLE'){
+          return '回款结算';
+        }
+        if (val === 'COMPENSATION'){
+          return '补偿结算';
+        }
       },
       resetSearch() {
         this.$router.push({ query: {} });

src/views/brokerage/sequenceDetail.vue

@@ -27,8 +27,49 @@
           style="margin-left: 20px;width: 150px;float: left;"
           class="filter-item"
         >
-          <el-option label="项目结算" value="SETTLE"/>
-          <el-option label="默认预提" value="AHEAD"/>
+          <el-option label="结算" value="SETTLE"/>
+          <el-option label="预提" value="AHEAD"/>
+          <el-option label="回款结算" value="PAYMENT_SETTLE"/>
+          <el-option label="补偿结算" value="COMPENSATION"/>
+        </el-select>
+        <el-select
+          v-model="listQuery.year"
+          placeholder="结算年份"
+          clearable
+          filterable
+          style="margin-left: 20px;width: 100px;float: left;"
+          class="filter-item"
+        >
+          <el-option label="2022" value="2022"/>
+          <el-option label="2023" value="2023"/>
+          <el-option label="2024" value="2024"/>
+          <el-option label="2025" value="2025"/>
+          <el-option label="2026" value="2026"/>
+          <el-option label="2027" value="2027"/>
+          <el-option label="2028" value="2028"/>
+          <el-option label="2029" value="2029"/>
+          <el-option label="2030" value="2030"/>
+        </el-select>
+        <el-select
+          v-model="listQuery.month"
+          placeholder="结算月份"
+          clearable
+          filterable
+          style="margin-left: 20px;width: 100px;float: left;"
+          class="filter-item"
+        >
+          <el-option label="1" value="1"/>
+          <el-option label="2" value="2"/>
+          <el-option label="3" value="3"/>
+          <el-option label="4" value="4"/>
+          <el-option label="5" value="5"/>
+          <el-option label="6" value="6"/>
+          <el-option label="7" value="7"/>
+          <el-option label="8" value="8"/>
+          <el-option label="9" value="9"/>
+          <el-option label="10" value="10"/>
+          <el-option label="11" value="11"/>
+          <el-option label="12" value="12"/>
         </el-select>
         <el-button
           class="filter-item"
@@ -47,6 +88,17 @@
         >重置
         </el-button>
       </template>
+      <template slot="right">
+        <PermissionButton
+          menu-code="_views_settle_detail_export"
+          class-name="filter-item"
+          round
+          type="primary"
+          name="导出"
+          @click="settleDetailExport"
+        >
+        </PermissionButton>
+      </template>
       <parentTable
         v-loading="listLoading"
         :data="pageData.records"
@@ -63,16 +115,36 @@
             <span>{{ row.stageName===null?'-':row.stageName}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="人员名称" align="center" width="160">
+        <el-table-column label="结算年份" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.userName}}</span>
+            <span>{{row.year}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="预计提成金额(元)" align="center" width="160">
+        <el-table-column label="结算月份" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.predictAmount}}</span>
+            <span>{{row.month}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="回款名称" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.paymentName===null?'-':row.paymentName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="回款金额" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.paymentAmount===null?'-':row.paymentAmount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="人员名称" align="center" width="160">
+          <template slot-scope="{row}">
+            <span>{{ row.userName}}</span>
+          </template>
+        </el-table-column>
+<!--        <el-table-column label="预计提成金额(元)" align="center" width="160">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.predictAmount}}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="结算金额(元)" align="center" width="120">
           <template slot-scope="{row}">
             <span>{{ row.brokerageAmount}}</span>
@@ -155,12 +227,24 @@
       this.getList()
     },
     methods: {
+      settleDetailExport(){
+        this.$utils.exportUtil(
+          "/itemBrokerageSequenceDetail/export", this.listQuery,
+          "导出"
+        );
+      },
       settleCate(val){
         if (val === 'AHEAD'){
-          return '默认预提';
+          return '预提';
         }
         if (val === 'SETTLE'){
-          return '项目结算';
+          return '结算';
+        }
+        if (val === 'PAYMENT_SETTLE'){
+          return '回款结算';
+        }
+        if (val === 'COMPENSATION'){
+          return '补偿结算';
         }
       },
       brokerageRule(val){
@@ -182,7 +266,7 @@
           return '个人提成';
         }
         if (val === 'TEAM_SHARE'){
-          return '团队抽成';
+          return '团队提成';
         }
       },
       resetSearch() {