大中型提成申报

src/api/modules/businessCommissionRate.js

@@ -0,0 +1,23 @@
+import request from '@/utils/request'
+/*
+* 非土规项目提成比例设置
+*/
+export default {
+  list(params) {
+    return request.get(`businessCommissionRate`, { params: params })
+  },
+  add(params) {
+    return request.post(`businessCommissionRate`, params)
+  },
+  edit(params) {
+    return request.put(`businessCommissionRate`, params)
+  },
+  delete(params) {
+    return request.delete(`businessCommissionRate/${params}`)
+  },
+
+  cateList(params1,params2){
+    return request.get(`businessCommissionRate/cate/${params1}/${params2}`)
+  }
+ 
+}

src/api/modules/businessProduction.js

@@ -3,8 +3,8 @@ import request from '@/utils/request'
 * 业务产品
 */
 export default {
-   bag(params1,params2){
-    return request.get(`businessProduction/bag/major/${params1}/${params2}`)
+   bag(params1){
+    return request.get(`businessProduction/bag/major/${params1}`)
    },
    orderReports(params){
       return request.post(`businessProduction/report/major`,params)

src/api/modules/commissonDeclare.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+/*
+* 提成申报
+*/
+export default {
+  majorMarketDeclarePage(params) {
+    return request.get(`commissionDeclare/major/market`, { params: params })
+  },
+  majorEvaluateDeclarePage(params) {
+    return request.get(`commissionDeclare/major/evaluate`, { params: params })
+  },
+  declare(params){
+    return request.post(`commissionDeclare/major`, params)
+  }
+}

src/api/modules/financeClaim.js

@@ -29,6 +29,9 @@ export default {
    },
    uploadPersonalTemp(file){
     return request.post(`financeClaim/personal/temp/upload`,{ file: file })
+   },
+   getMajorStat(params){
+    return request.get(`financeClaim/major/stat`, { params: params })
    }
 
 }

src/router/urlMap.js

@@ -101,6 +101,10 @@ import _views_personal_readonly_detail from '@/views/personal/readonlyDetail'
 import _views_personal_done from '@/views/personal/doneList'
 import _views_complex_index from '@/views/complex/index'
 import _views_major_old_list from '@/views/major/oldList'
+import _views_commission_major_rate from '@/views/commission/major'
+import _views_finance_fund_stats from '@/views/finance/realFundStat'
+import _views_income_major_declare_market from '@/views/income/major/market'
+import _views_income_major_declare_evaluate from '@/views/income/major/evaluate'
 
 export default {
   _views_set_menu,
@@ -190,5 +194,9 @@ export default {
   _views_personal_readonly_detail,
   _views_personal_done,
   _views_complex_index,
-  _views_major_old_list
+  _views_major_old_list,
+  _views_commission_major_rate,
+  _views_finance_fund_stats,
+  _views_income_major_declare_market,
+  _views_income_major_declare_evaluate
 }

src/views/commission/major.vue

@@ -0,0 +1,380 @@
+<template>
+  <div class="app-container organization-index">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+    </div>
+    <el-form ref="postForm"
+             class="form-container postInfo-container"
+             style="position: relative;margin-top: 30px">
+      <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
+        <el-tab-pane label="业务分类提成比例（市场人员）" name="marketer">
+          <y-page-list-layout :get-page-list="businessCateMarketerRatioList" :page-list="marketerRatioRecord" :page-para="listQuery1">
+            <template slot="left">
+            <el-button size="mini" type="primary" round icon="el-icon-circle-plus-outline" style="float: left;"
+                @click="openCommissionRateFormDig('MARKETER')">新增</el-button>
+                <el-select
+                v-model="listQuery1.businessCateId"
+                placeholder="业务分类"
+                clearable
+                filterable
+                style="margin-left: 20px;width: 500px;float: left;"
+                class="filter-item"
+                @change="businessCateMarketerRatioList"
+              >
+                <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </template>
+            <el-table
+              size="medium"
+              slot="table"
+              row-key="id"
+              :data="marketerRatioRecord.records"
+              fit
+              highlight-current-row
+              :header-row-style="{color: '#333333'}"
+              style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;"
+            >
+              <el-table-column label="业务分类" width="800"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.businessCateName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="提成比例"  align="center">
+                <template slot-scope="{row}">
+                  <span>
+                    {{ row.minRatio }}
+                    <i slot="suffix" style="font-size:normal;margin-right: 10px;line-height: 30px">%</i>
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="业绩提成比例" align="center">
+                <template slot-scope="{row}">
+                  <span>
+                    {{ row.quarterRatio }}
+                    <i slot="suffix" style="font-size:normal;margin-right: 10px;line-height: 30px">%</i>
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="200"  class-name="small-padding fixed-width">
+                <template slot-scope="{row}">
+                  <el-button type="success" round @click="edit(row)">编辑</el-button>
+                  <el-button type="danger" round @click="remove(row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </y-page-list-layout>
+        </el-tab-pane>
+        <el-tab-pane label="业务分类提成比例（评估人员）" name="evaluator">
+          <y-page-list-layout :get-page-list="businessCatekeEvaluatorRatioList" :page-list="evaluatorRatioRecord" :page-para="listQuery2">
+            <template slot="left">
+            <el-button size="mini" type="primary" round icon="el-icon-circle-plus-outline" style="float: left;"
+                @click="openCommissionRateFormDig('EVALUATOR')">新增</el-button>
+                <el-select
+                v-model="listQuery2.businessCateId"
+                placeholder="业务分类"
+                clearable
+                filterable
+                style="margin-left: 20px;width: 500px;float: left;"
+                class="filter-item"
+                @change="businessCatekeEvaluatorRatioList"
+              >
+                <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </template>
+            <el-table
+              size="medium"
+              slot="table"
+              row-key="id"
+              :data="evaluatorRatioRecord.records"
+              fit
+              highlight-current-row
+              :header-row-style="{color: '#333333'}"
+              style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;"
+            >
+              <el-table-column label="业务分类" width="800"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.businessCateName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="提成比例"  align="center">
+                <template slot-scope="{row}">
+                  <span>
+                    {{ row.minRatio }}
+                    <i slot="suffix" style="font-size:normal;margin-right: 10px;line-height: 30px">%</i>
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="200"  class-name="small-padding fixed-width">
+                <template slot-scope="{row}">
+                  <el-button type="success" round @click="edit(row)">编辑</el-button>
+                  <el-button type="danger" round @click="remove(row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </y-page-list-layout>
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+    <el-dialog :visible.sync="commissionRateFormDialog" width="35%"  center  custom-class="doWarehouseClass" @closed="clean">
+      <el-divider content-position="left">
+        <span style="color:red;font-weight: bold;">
+          【{{commissionRateForm.userType==='EVALUATOR'?'评估人员':'市场人员'}}】
+        </span>大中型业务分类比例设置</el-divider>
+      <el-form :model="commissionRateForm" ref="commissionRateForm" :rules="rules">
+            <el-form-item  
+                label="业务分类："
+                prop="businessCateId"
+                label-width="180px"
+                class="postInfo-container-item">
+            <el-select v-model="commissionRateForm.businessCateId" placeholder="请选择业务分类" style="width: 100%;" clearable filterable>
+              <el-option v-for="(cate,id) in cateList" :label="cate.name" :value="cate.id"></el-option>
+            </el-select>
+          </el-form-item>
+        <el-form-item 
+                label="提成比例："
+                prop="minRatio"
+                label-width="180px"
+                class="postInfo-container-item">
+                <span slot="label">提成比例
+                        <el-tooltip
+                          class="item"
+                          effect="dark"
+                          content="（提成比例可以0，表示不提成；50表示提成50%）"
+                          placement="top-start"
+                        >
+                          <i class="el-icon-question"/></el-tooltip>
+                        ：
+                      </span>
+          <el-input-number v-model="commissionRateForm.minRatio" :step="1" :max="100" style="width: 100%;"></el-input-number>
+        </el-form-item>
+        <el-form-item v-show="commissionRateForm.userType==='MARKETER'"
+                label="业绩提成比例："
+                prop="quarterRatio"
+                label-width="180px"
+                class="postInfo-container-item">
+                <span slot="label">业绩提成比例
+                        <el-tooltip
+                          class="item"
+                          effect="dark"
+                          content="（业绩提成比例可以0，表示不提成；50表示提成50%）"
+                          placement="top-start"
+                        >
+                          <i class="el-icon-question"/></el-tooltip>
+                        ：
+                      </span>
+          <el-input-number  v-model="commissionRateForm.quarterRatio" :step="1" :max="100" style="width: 100%;"></el-input-number>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="save('ruleForm')" style="margin-left: 40%;">保存</el-button>
+          <el-button @click="commissionRateFormDialog=false">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import Breadcrumb from '@/components/Breadcrumb'
+  import YPageListLayout from '@/components/YPageListLayout'
+
+  export default {
+    name: 'commissionMajor',
+    components: {
+      Breadcrumb,
+      YPageListLayout
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'info',
+          deleted: 'danger'
+        };
+        return statusMap[status]
+      }
+    },
+    data() {
+      return {
+        activeName: 'marketer',
+        rules: {
+          businessCateId: [{
+            required: true,
+            message: '业务分类不能为空',
+            trigger: 'blur'
+          }],
+          minRatio: [{
+            required: true,
+            message: '提成比例不能为空',
+            trigger: 'blur'
+          }],
+          quarterRatio: [{
+            required: true,
+            message: '业绩提成比例不能为空',
+            trigger: 'blur'
+          }],
+        },
+        commissionRateFormDialog:false,
+        listQuery1: {
+          page: 1,
+          size: 10,
+          descs: 'id',
+          businessType:'BUSINESS_MAJOR',
+          userType:'MARKETER'
+        },
+        listQuery2: {
+          page: 1,
+          size: 10,
+          descs: 'id',
+          businessType:'BUSINESS_MAJOR',
+          userType:'EVALUATOR'
+        },
+        marketerRatioRecord:{
+          records:[]
+        },
+        evaluatorRatioRecord:{
+          records:[]
+        },
+        cateList:[],
+        commissionRateForm:{
+            id:null,
+            businessType:null,
+            userType:null,
+            businessCateId:null,
+            minRatio:null,
+            maxRatio:null,
+            lowLimitAmount:null,
+            topLimitAmount:null,
+            quarterRatio:null
+        }
+
+      }
+    },
+    created() {
+      this.getBusinessCateList();
+      this.businessCateMarketerRatioList();
+    },
+    methods: {
+   
+      handleClick(tab, event) {
+        if (tab.name==='marketer'){
+          this.businessCateMarketerRatioList();
+        }else if (tab.name==='evaluator') {
+          this.businessCatekeEvaluatorRatioList();
+        }else if (tab.label === '岗位抽成率'){
+          //this.getPostRatio();
+        } else {
+          //this.getMarketerRatioList();
+        }
+      },
+
+      getBusinessCateList(){
+          this.$api.dictData.simpleType("业务子类").then(res=>{
+            if (res.code === 200){
+                this.cateList = res.data;
+            }
+          })
+      },
+      businessCateMarketerRatioList(){
+          this.$api.businessCommissionRate.list(this.listQuery1).then(res=>{
+            if (res.code === 200){
+                this.marketerRatioRecord = res.data;
+            }
+          })
+      },
+      businessCatekeEvaluatorRatioList(){
+        this.$api.businessCommissionRate.list(this.listQuery2).then(res=>{
+            if (res.code === 200){
+                this.evaluatorRatioRecord = res.data;
+            }
+          })
+      },
+      openCommissionRateFormDig(userType){
+          this.commissionRateForm.businessType = 'BUSINESS_MAJOR';
+          this.commissionRateForm.userType = userType;
+          this.commissionRateFormDialog = true;
+          this.getBusinessCateList();
+      },
+      edit(row){
+          this.commissionRateForm = row;
+          this.commissionRateFormDialog = true;
+      },
+      remove(id){
+        this.$confirm('请确认是否删除此提成比例?','提示',{
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          center: true
+        }).then(()=>{
+            this.$api.businessCommissionRate.delete(id).then(res=>{
+                if (res.code === 200 && res.data){
+                  this.$notify({
+                    title: '成功',
+                    message: '业务分类提成比例删除成功',
+                    type: 'success',
+                    duration: 2000
+                  });
+                  this.businessCateMarketerRatioList();
+                }
+            })
+        })
+      },
+      save(){
+        this.$refs.commissionRateForm.validate(valid=>{
+          if (valid){
+            if (this.commissionRateForm.id){
+              this.$api.businessCommissionRate.edit(this.commissionRateForm).then(res=>{
+                if (res.code === 200){
+                  this.$notify({
+                  title: '成功',
+                  message: '业务分类提成比例修改成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.commissionRateFormDialog =false;
+                if (this.commissionRateForm.userType === 'MARKETER'){
+                  this.businessCateMarketerRatioList();
+                }else {
+                  this.businessCatekeEvaluatorRatioList();
+                }
+                }
+              })
+            }else {
+              this.$api.businessCommissionRate.add(this.commissionRateForm).then(res=>{
+                if (res.code === 200){
+                  this.$notify({
+                  title: '成功',
+                  message: '业务分类提成比例保存成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.commissionRateFormDialog =false;
+                if (this.commissionRateForm.userType === 'MARKETER'){
+                  this.businessCateMarketerRatioList();
+                }else {
+                  this.businessCatekeEvaluatorRatioList();
+                }
+              }
+            })
+            }
+         
+          }
+        })
+      },
+      clean(){
+        this.commissionRateForm.id = null;
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .organization-index {
+    .el-table [class*=el-table__row--level] .el-table__expand-icon {
+      color: red;
+    }
+  }
+</style>
+<style scoped lang="scss">
+
+/deep/.doWarehouseClass {
+      border-radius: 10px;
+    }
+</style>

src/views/finance/fundList.vue

@@ -413,7 +413,7 @@
       </el-tabs>
       <el-button  style="display:flex; position:absolute;right:50px;top:50px" round type="danger" @click="openClaimDialog()">选择认领</el-button>
     </el-dialog>
-    <el-dialog :visible.sync="allotAmountDialog" width="55%"  center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
+    <el-dialog :visible.sync="allotAmountDialog" width="75%"  center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
       <el-form v-model="claimOrders" ref="claimOrdersForm">
         <el-row>
             <el-col :xs="24" :sm="12" :lg="21" :span="6">
@@ -476,20 +476,26 @@
             </el-row>
             <div v-if="p.reports!=null && p.reports.length>0">
             <el-row v-for="(r,index) in p.reports">
-              <div  style="margin-left:75px">
-                <el-col :xs="24" :sm="12" :lg="8" :span="6">
+              <div >
+                <el-col :xs="24" :sm="12" :lg="6" :span="6">
                   <el-form-item :label="productionLabel+(index+1)+':'" prop="productionType"   label-width="120px" class="postInfo-container-item">
-                    <el-input :value="r.productionType" type="text" class="filter-item" disabled readonly style="width:130px"/>
+                    <el-input :value="r.productionType" type="text" class="filter-item" disabled readonly />
                   </el-form-item >
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                  <el-form-item label="报告号：" prop="businessSubId"   label-width="80px" class="postInfo-container-item">
-                    <el-input :value="r.businessSubId" type="text" class="filter-item" disabled readonly style="width:220px" />
+                  <el-form-item label="报告号：" prop="businessSubId"   label-width="120px" class="postInfo-container-item">
+                    <el-input :value="r.businessSubId" type="text" class="filter-item" disabled readonly  />
                   </el-form-item >
                 </el-col>
-                <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                  <el-form-item label="分配金额：" prop="productionRealAmount"   label-width="120px" class="postInfo-container-item">
-                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="r.realAmount" type="number" 
+                <el-col :xs="24" :sm="12" :lg="5" :span="6">
+                  <el-form-item label="已认领金额：" prop="claimedAmount"   label-width="120px" class="postInfo-container-item">
+                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="r.claimedAmount" type="number" 
+                        style="width:100%" class="filter-item" readonly disabled/>
+                  </el-form-item >
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="5" :span="6">
+                  <el-form-item label="本次认领：" prop="productionRealAmount"   label-width="120px" class="postInfo-container-item">
+                  <el-input-number  :precision="2" :min="0"  v-model.number="r.realAmount" type="number" 
                         style="width:100%" class="filter-item" />
                   </el-form-item >
                 </el-col>

src/views/finance/realFundStat.vue

@@ -0,0 +1,282 @@
+<template>
+  <div class="app-container organization-index">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+    </div>
+      <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
+        <el-tab-pane label="大中型实收款" name="major">
+          <y-page-list-layout :get-page-list="getMajorStat" :page-list="majorStat" :page-para="listQuery1">
+            <template slot="left">
+              <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="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-date-picker  clearable v-model="claimDate" type="daterange" align="center" unlink-panels
+                            range-separator="至" start-placeholder="认领日期（开始）" end-placeholder="认领日期（结束）" :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
+              </el-date-picker>
+              <el-input v-model="listQuery1.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery1.claimAmount" placeholder="认领金额" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option :value="false" label="未归档">未归档</el-option>
+                  <el-option :value="true" label="已归档">已归档</el-option>
+              </el-select>
+              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 200px;float: left; margin-top: 10px;">
+                  <el-option :value="true" label="金融">金融</el-option>
+                  <el-option :value="false" label="非金融">非金融</el-option>
+              </el-select>
+              <el-input v-model="listQuery1.claimUser" placeholder="认领人" clearable style="margin-left: 20px;width: 200px;float: left; margin-top: 10px;">
+              </el-input>
+              <el-button class="filter-item" style="margin-left:20px;margin-top: 10px;float: left;" type="primary" @click="searchList1" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="margin-top: 10px;float: left;" round type="success" @click="resetSearch1()">重置
+              </el-button>
+              <el-button class="filter-item" style="margin-top: 10px;float: left;" round type="info" @click="exportMajorStat()">导出
+              </el-button>
+            </template>
+            <el-table
+              size="medium"
+              slot="table"
+              row-key="id"
+              :data="majorStat.records"
+              fit
+              highlight-current-row
+              :header-row-style="{color: '#333333'}"
+              style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
+              <el-table-column label="分类" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.financial?'金融':'非金融' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="是否归档" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.ifSaveFile?'已归档':'未归档' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="项目编号" width="150"  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="产品类型"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.productionType==='REPORT'?'报告':(row.productionType==='STATEMENT'?'意见书':'复评函')}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="项目名称"  width="200"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="市场部"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.marketDepartment }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="评估部"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.evaluateDepartment }}</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.membersName }}</span>
+                </template>
+              </el-table-column> -->
+              <!-- <el-table-column label="分配产值"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.prodValue }}</span>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="入账时间" width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.payDateTime }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="认领时间" width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.claimDatetime }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="应收款(元)"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.prodShouldAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="认领金额(元)"   align="center">
+                <template slot-scope="{row}">
+                  <span  style="color:red">{{ row.claimAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="认领人"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.claimUser }}</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="委托人"  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.evaluateAmount/10000 }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </y-page-list-layout>
+        </el-tab-pane>
+      </el-tabs>
+  </div>
+</template>
+<script>
+  import Breadcrumb from '@/components/Breadcrumb'
+  import YPageListLayout from '@/components/YPageListLayout'
+
+  export default {
+    name: 'realFundStat',
+    components: {
+      Breadcrumb,
+      YPageListLayout
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'info',
+          deleted: 'danger'
+        };
+        return statusMap[status]
+      }
+    },
+    data() {
+      return {
+        activeName: 'major',
+        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]);
+                    }
+                }]
+            },
+        claimDate: '',
+        listQuery1: {
+          page: 1,
+          size: 10,
+          descs: 'id',
+        },
+        majorStat:{
+          records:[]
+        }
+      }
+    },
+    created() {
+        this.getMajorStat();
+    },
+    methods: {
+   
+      handleClick(tab, event) {
+      
+      },
+
+        
+    resetSearch1() {
+      this.$router.push({ query: {} });
+      this.claimDate = '';
+      this.listQuery1 = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+        startDate:null,
+        endDate:null,
+      }
+      this.getMajorStat()
+    },
+   
+    searchList1() {
+      // 重置分页
+      this.listQuery1.page = 1
+      this.listQuery1.size = 10
+      if (this.claimDate){
+        this.listQuery1.startDate = this.claimDate[0]+' 00:00:00';
+        this.listQuery1.endDate = this.claimDate[1]+ ' 23:59:59';
+      }
+      this.getMajorStat()
+    },
+
+      getMajorStat(){
+        this.$api.financeClaim.getMajorStat(this.listQuery1).then(res=>{
+          if (res.code === 200){
+              this.majorStat = res.data;
+          }
+        })
+      },
+      exportMajorStat(){
+        this.$utils.exportUtil(
+        "/financeClaim/major/stat/export", this.listQuery1,
+        "导出"
+      );
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .organization-index {
+    .el-table [class*=el-table__row--level] .el-table__expand-icon {
+      color: red;
+    }
+  }
+</style>
+<style scoped lang="scss">
+
+/deep/.doWarehouseClass {
+      border-radius: 10px;
+    }
+</style>

src/views/income/major/evaluate.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    </div>
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+      <template slot="left">
+              <el-input v-model="listQuery.orderId" placeholder="订单号" clearable style="width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery.name" placeholder="项目名称" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery.reportNo" placeholder="报告号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-select  clearable  v-model="listQuery.commissionRateId" placeholder="提成类型" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option v-for="(c,id) in cates" :value="c.id" :label="c.name">{{ c.name }}</el-option>
+              </el-select>
+              <el-select  clearable  v-model="listQuery.declareType" placeholder="申报类型" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option :value="true" label="产品">产品</el-option>
+                  <el-option :value="false" label="订单">订单</el-option>
+              </el-select>
+              <el-select  clearable  v-model="listQuery.result" placeholder="审核状态" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option :value="0" label="待申报">待申报</el-option>
+                  <el-option :value="1" label="通过">通过</el-option>
+                  <el-option :value="2" label="驳回">驳回</el-option>
+              </el-select>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+              </el-button>
+      </template>
+      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+        <el-table-column label="订单号"  width="150" align="center"  >
+          <template slot-scope="{row}">
+            <span>{{ row.orderId }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="150" align="center"  >
+          <template slot-scope="{row}">
+            <span>{{ row.name?row.name:row.orderName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="报告号"  width="200" align="center"   >
+          <template slot-scope="{row}">
+            <span>{{ row.reportNo?row.reportNo:'--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估对象类别" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.businessObjectType }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="委托人" 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.bailorContactName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="委托人电话" width="150" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.bailorContactTel }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clienteleName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务来源" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clienteleSubName }}</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.orderCreated}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提成类型" width="150" align="center">
+          <template slot-scope="{row}">
+            <span style="color:red">{{ row.commissionType?row.commissionType:'--'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="申报类型" align="center">
+          <template slot-scope="{row}">
+            <span style="font-weight: bold;">{{ row.reportNo?'产品':'订单'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="{row}">
+            <el-tag v-if="row.declareResult==null" type="info" effect="plain">待申报</el-tag>
+            <el-tag v-else-if="row.declareResult==true" type="success" effect="plain">通过</el-tag>
+            <el-tag v-else="row.declareResult==false" type="danger" effect="plain">驳回</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center">
+          <template slot-scope="{row}">
+            <div>
+              <el-button type="text" size="small" @click="">申报</el-button>
+              <el-button type="text" size="small" @click="">查看</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </parentTable>
+    </y-page-list-layout>
+  </div>
+</template>
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+
+
+export default {
+  name: 'declareMajorEvaluate',
+  components: {
+    Breadcrumb,
+    YPageListLayout,
+  },
+  filters: {
+    
+  },
+  data() {
+    return {
+      pageData: { records: [] },
+      listQuery: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+      },
+      cates:[]
+    }
+  },
+  created() {
+     this.getList();
+     this.getMajorEvaluateCate();
+  },
+  methods: {
+  
+    resetSearch() {
+      this.$router.push({ query: {} });
+      this.orderDate = '';
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getList()
+    },
+   
+    searchList() {
+      this.listQuery.current = 1;
+      this.getList();
+    },
+
+    getList(){
+      this.$api.commissonDeclare.majorEvaluateDeclarePage(this.listQuery).then(res=>{
+        if (res.code === 200){
+            this.pageData = res.data;
+        }
+      })
+    },
+    getMajorEvaluateCate(){
+      this.$api.businessCommissionRate.cateList("BUSINESS_MAJOR","EVALUATOR").then(res=>{
+        if (res.code === 200){
+          this.cates = res.data;
+        }
+      })
+    }
+   
+  },
+  
+}
+</script>
+<style lang="scss" scoped>
+    /deep/.doWarehouseClass {
+     border-radius: 10px;
+    }
+    .real-amount{
+      /deep/ .el-form-item__label {
+        color: red;
+        font-weight:bold
+      }
+    }
+
+</style>

src/views/income/major/market.vue

@@ -0,0 +1,352 @@
+<template>
+  <div class="app-container">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    </div>
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+      <template slot="left">
+              <el-input v-model="listQuery.orderId" placeholder="订单号" clearable style="width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery.name" placeholder="项目名称" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery.reportNo" placeholder="报告号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-select  clearable  v-model="listQuery.commissionRateId" placeholder="提成类型" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option v-for="(c,id) in cates" :value="c.id" :label="c.name">{{ c.name }}</el-option>
+              </el-select>
+              <el-select  clearable  v-model="listQuery.declareType" placeholder="申报类型" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option :value="true" label="产品">产品</el-option>
+                  <el-option :value="false" label="订单">订单</el-option>
+              </el-select>
+              <el-select  clearable  v-model="listQuery.result" placeholder="审核状态" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option :value="0" label="待申报">待申报</el-option>
+                  <el-option :value="1" label="通过">通过</el-option>
+                  <el-option :value="2" label="驳回">驳回</el-option>
+              </el-select>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+              </el-button>
+      </template>
+      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+        <el-table-column label="订单号"  width="150" align="center"  >
+          <template slot-scope="{row}">
+            <span>{{ row.orderId }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="150" align="center"  >
+          <template slot-scope="{row}">
+            <span>{{ row.name?row.name:row.orderName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="报告号"  width="200" align="center"   >
+          <template slot-scope="{row}">
+            <span>{{ row.reportNo?row.reportNo:'--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估对象类别" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.businessObjectType }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="委托人" 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.bailorContactName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="委托人电话" width="150" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.bailorContactTel }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clienteleName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务来源" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clienteleSubName }}</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.orderCreated}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提成类型" width="150" align="center">
+          <template slot-scope="{row}">
+            <span style="color:red">{{ row.commissionType?row.commissionType:'--'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="申报类型" align="center">
+          <template slot-scope="{row}">
+            <span style="font-weight: bold;">{{ row.reportNo?'产品':'订单'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="{row}">
+            <el-tag v-if="row.declareResult==null" type="info" effect="plain">待申报</el-tag>
+            <el-tag v-else-if="row.declareResult==true" type="success" effect="plain">通过</el-tag>
+            <el-tag v-else="row.declareResult==false" type="danger" effect="plain">驳回</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center">
+          <template slot-scope="{row}">
+            <div>
+              <el-button type="text" size="small" @click="openDeclareDialog(row)">申报</el-button>
+              <el-button type="text" size="small" @click="">查看</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </parentTable>
+    </y-page-list-layout>
+    <el-dialog :visible.sync="declareDialog" width="45%"  center  custom-class="doWarehouseClass">
+      <el-divider content-position="left">
+        <span style="color:red;font-weight: bold;">
+          【市场人员】
+        </span>大中型业务提成申报</el-divider>
+      <el-form :model="declareForm" ref="declareForm" :rules="rules">
+            <el-form-item  
+                label="订单号："
+                prop="orderId"
+                label-width="140px"
+                class="postInfo-container-item">
+                <el-input v-model="declareForm.orderId" :step="1" :max="100" style="width: 100%;" readonly disabled></el-input>
+          </el-form-item>
+        <el-form-item 
+                label="项目名称："
+                prop="name"
+                label-width="140px"
+                class="postInfo-container-item">
+          <el-input v-model="declareForm.name" :step="1" :max="100" style="width: 100%;" readonly disabled></el-input>
+        </el-form-item>
+        <el-form-item 
+                label="报告号："
+                prop="reportNo"
+                label-width="140px"
+                class="postInfo-container-item">
+          <el-input v-model="declareForm.reportNo" :step="1" :max="100" style="width: 100%;" readonly disabled></el-input>
+        </el-form-item>
+        <el-form-item
+                label="业务分类："
+                prop="commissionRateId"
+                label-width="140px"
+                class="postInfo-container-item">
+              <el-select  clearable  v-model="declareForm.commissionRateId" placeholder="请选择业务分类" style="width: 100%;" >
+                  <el-option v-for="(c,id) in cates" :value="c.id" :label="c.name">{{ c.name }}</el-option>
+              </el-select>
+        </el-form-item>
+        <el-button type="success" round @click="addUser()">添加客户经理</el-button>
+        <el-table
+          :data="declareForm.userShareRates" border style="width: 100%; margin-top: 10px; margin-bottom: 10px;">
+          <el-table-column prop="userId" label="客户经理" align="center" >
+            <template slot-scope="{row}">
+            <el-select filterable  clearable  v-model="row.userId" placeholder="选择人员">
+              <el-option v-for="(u,id) in users" :value="u.id" :label="u.name">{{ u.name }}</el-option>
+            </el-select>
+          </template>
+          </el-table-column>
+          <el-table-column prop="rate" label="提成比例" align="center">
+            <template slot-scope="{row}">
+              <el-input-number  v-model="row.rate" :step="1" :max="100" style="width: 100%;" ></el-input-number>
+          </template>
+          </el-table-column>
+          <el-table-column  label="操作" align="center"> 
+            <template slot-scope="row">
+              <el-button type="text" @click="removeUser(row.$index)" :disabled="row.$index===0">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-form-item>
+          <el-button type="primary" @click="declareMarket()" style="margin-left: 40%;">提交</el-button>
+          <el-button @click="declareDialog=false">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+
+
+export default {
+  name: 'declareMajorMarket',
+  components: {
+    Breadcrumb,
+    YPageListLayout,
+  },
+  filters: {
+    
+  },
+  data() {
+    return {
+      rules:{
+        commissionRateId: [{
+            required: true,
+            message: '业务分类不能为空',
+            trigger: 'blur'
+          }],
+      },
+      pageData: { records: [] },
+      listQuery: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+      },
+      cates:[],
+      users:[],
+      declareDialog:false,
+      declareForm:{
+          orderId:null,
+          name:null,
+          reportNo:null,
+          businessId:null,
+          productionId:null,
+          businessType:'COMMISSION_DECLARE_MAJOR_MARKET',
+          commissionRateId:null,
+          userShareRates:[
+            {
+              userId: this.$store.getters.userInfo.id,
+              rate:100
+            }
+          ],
+
+      },
+    }
+  },
+  created() {
+     this.getList();
+     this.getMajorMarketCate();
+  },
+  methods: {
+  
+    resetSearch() {
+      this.$router.push({ query: {} });
+      this.orderDate = '';
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getList()
+    },
+   
+    searchList() {
+      this.listQuery.current = 1;
+      this.getList();
+    },
+
+    getList(){
+      this.$api.commissonDeclare.majorMarketDeclarePage(this.listQuery).then(res=>{
+        if (res.code === 200){
+            this.pageData = res.data;
+        }
+      })
+    },
+    getMajorMarketCate(){
+      this.$api.businessCommissionRate.cateList("BUSINESS_MAJOR","MARKETER").then(res=>{
+        if (res.code === 200){
+          this.cates = res.data;
+        }
+      })
+    },
+    openDeclareDialog(row){
+        this.getSimpleAllUser();
+        this.declareDialog = true;
+        this.declareForm.orderId = row.orderId;
+        this.declareForm.name = row.name;
+        this.declareForm.reportNo = row.reportNo;
+        this.declareForm.businessId = row.businessId;
+        this.declareForm.productionId= row.productionId;
+    },
+    declareMarket(){
+      this.$refs.declareForm.validate(valid=>{
+        if (valid){
+          let total = 0;
+          for (let i in this.declareForm.userShareRates){
+              if (!this.declareForm.userShareRates[i].userId){
+                  this.$message.error("客户经理未指定");
+                  return;
+              }
+              if (!this.declareForm.userShareRates[i].rate){
+                  this.$message.error("设置比例不能为空");
+                  return;
+              }
+              total += this.declareForm.userShareRates[i].rate;
+          }
+          if (total!=100){
+            this.$message.error("提成比例之和必须为100");
+            return;
+          }
+          this.$api.commissonDeclare.declare(this.declareForm).then(res=>{
+            if (res.code === 200){
+              this.$notify({
+                title: '成功',
+                message: '提成申报已提交',
+                type: 'success',
+                duration: 2000
+              });
+              this.getList();
+              this.declareDialog = false;
+            }else{
+              this.$notify({
+                title: '失败',
+                message: '提成申报提交失败，请联系管理员',
+                type: 'error',
+                duration: 2000
+              });
+            }
+          })
+        }
+      })
+    },
+
+    getSimpleAllUser(){
+      this.$api.user.simpleAll().then(res=>{
+        if (res.code===200){
+            this.users = res.data;
+        }
+      })
+    },
+    addUser(){
+      if (this.declareForm.userShareRates.length>4){
+          this.$message.error("人数超限")
+          return;
+      }
+      let user = new Object;
+      user.index
+      this.declareForm.userShareRates.push(user);
+    },
+    removeUser(index){
+        this.declareForm.userShareRates.splice(index,1)
+    }
+   
+  },
+  
+}
+</script>
+<style lang="scss" scoped>
+    /deep/.doWarehouseClass {
+     border-radius: 10px;
+    }
+    .real-amount{
+      /deep/ .el-form-item__label {
+        color: red;
+        font-weight:bold
+      }
+    }
+
+</style>

src/views/major/myOrder.vue

@@ -78,14 +78,18 @@
             <span>{{ row.created}}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="280" align="center">
+        <el-table-column fixed="right" label="操作" width="200" align="center">
           <template slot-scope="{row}">
-            <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text"
+            <div>
+              <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text"
               :page-jump="true" size="mini" :page-query="{'couldEdit':false,'id':row.id, 'back':'/major/my/order','recall':true,'couldBack':true}" />
-            <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
-            <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
-            <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId)">申请开票</el-button>
-            <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
+              <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
+              <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
+            </div>
+            <div>
+              <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId)">申请开票</el-button>
+              <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
+            </div>
           </template>
         </el-table-column>
       </parentTable>
@@ -1115,12 +1119,11 @@ export default {
         }
       })
     },
-    productionList(id,reportNo){
+    productionList(id){
       this.productionListDialog = true;
       this.bag.businessId = id;
-      this.bag.reportNo = reportNo;
       if (id){
-          this.$api.businessProduction.bag(id,reportNo).then(res=>{
+          this.$api.businessProduction.bag(id).then(res=>{
             if (res.code === 200){
                 this.bag = res.data;
             }