待审核订单-审核页面新增机构管理费表格;修改费用明细表格数据结构

config/dev.env.js

@@ -9,8 +9,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
-  // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
+  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -334,7 +334,7 @@
           <el-descriptions-item label="商业险保单号">{{ orderInfo.sypolicyno }}</el-descriptions-item>
         </el-descriptions>
       </div>
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="feeOrderNewVo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../../../src/icon/company.png" alt class="icon-img" />
@@ -342,19 +342,47 @@
           </div>
         </div>
         <div style="font-size:12px;width: 100%" class="FeeEnclosure">
-          <el-table :data="orderInfo.feeOrderNewVoList"   :border="true"   width="100%"  :stripe="true" size="mini"   :header-cell-style="{
+          <el-table :data="feeOrderNewVo"   :border="true"   width="100%"  :stripe="true" size="mini"   :header-cell-style="{
         background: '#F7F7F9',
         fontWeight: '700',
         color: '#606266',
       }">
-            <el-table-column prop="insuranceType" label="险种" ></el-table-column>
-            <el-table-column   prop="premium"  label="保费"></el-table-column>
-            <el-table-column prop="totalProportion" label="总比例" ></el-table-column>
-            <el-table-column prop="superviseCosts" label="手续费比例" ></el-table-column>
-            <el-table-column prop="otherCostsProportion" label="跟单比例" ></el-table-column>
-            <el-table-column prop="totalAmount" label="总费用" ></el-table-column>
-             <el-table-column prop="sySuperviseCostsPremiums" label="手续费" ></el-table-column>
-             <el-table-column prop="otherCostsPremiums" label="跟单费" ></el-table-column>
+      <el-table-column label="入口费用">
+        <el-table-column prop="insuranceType" label="险种" ></el-table-column>
+        <el-table-column prop="otherCostsProportion" label="跟单比例" ></el-table-column>
+        <el-table-column prop="superviseCosts" label="手续费比例" ></el-table-column>
+        <el-table-column prop="totalProportion" label="总比例" ></el-table-column>
+        <el-table-column prop="premium" label="保费" ></el-table-column>
+        <el-table-column prop="otherCostsPremiums" label="跟单费" ></el-table-column>
+        <el-table-column prop="sySuperviseCostsPremiums" label="手续费" ></el-table-column>
+        <el-table-column prop="totalAmount" label="总费用" ></el-table-column>
+      </el-table-column>
+      <el-table-column label="出口费用">
+        <el-table-column prop="exportInsuranceType" label="险种" ></el-table-column>
+        <el-table-column prop="exportOtherCostsProportion" label="跟单比例" ></el-table-column>
+        <el-table-column prop="exportSuperviseCosts" label="手续费比例" ></el-table-column>
+        <el-table-column prop="exportTotalProportion" label="总比例" ></el-table-column>
+        <el-table-column prop="exportOtherCostsPremiums" label="跟单费" ></el-table-column>
+        <el-table-column prop="exportSuperviseCostsPremiums" label="手续费" ></el-table-column>
+        <el-table-column prop="exportTotalAmount" label="总费用" ></el-table-column>
+      </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="Enclosure" v-if="orderInfo.feeOrderNewVo">
+        <div class="home flex j-s a-c back">
+          <div class="flex j-s a-c color">
+            <img src="../../../../../src/icon/company.png" alt class="icon-img" />
+            <span style="margin-left:10px;">机构管理费</span>
+          </div>
+        </div>
+        <div style="font-size:12px;width: 100%" class="FeeEnclosure">
+          <el-table :data="orderInfo.feeOrderNewVo.deptManagerFee"   :border="true"   width="100%"  :stripe="true" size="mini"   :header-cell-style="{
+        background: '#F7F7F9',
+        fontWeight: '700',
+        color: '#606266',
+      }">
+             <el-table-column prop="insuranceType" label="险种" ></el-table-column>
              <el-table-column prop="deptProportionLevelOne" label="一级管理费比例" ></el-table-column>
              <el-table-column prop="deptProportionLevelTwo" label="二级管理费比例 " ></el-table-column>
              <el-table-column prop="deptProportionLevelThree" label="三级管理费比例" ></el-table-column>
@@ -413,6 +441,7 @@ export default {
   },
   data() {
     return {
+      feeOrderNewVo:[], //费用明细
       oldFeeInfo:[],//原始跟单费用比例
       adjustFeeDescInfo:{},//调整费用时使用对象
       adjustFeeFlag:false,
@@ -647,6 +676,21 @@ export default {
             }
             return ele;
           });
+
+          if(res.data.feeOrderNewVo.exportFee && res.data.feeOrderNewVo.entranceFee){
+            res.data.feeOrderNewVo.exportFee.forEach((val,index)=>{
+              this.feeOrderNewVo.push({
+                exportInsuranceType:val.insuranceType,
+                exportOtherCostsPremiums:val.otherCostsPremiums,	
+                exportOtherCostsProportion:val.otherCostsProportion,
+                exportSuperviseCosts:val.superviseCosts,
+                exportSuperviseCostsPremiums:val.superviseCostsPremiums,
+                exportTotalAmount:val.totalAmount,
+                exportTotalProportion:val.totalProportion,
+                ...res.data.feeOrderNewVo.entranceFee[index]
+              })
+            })
+          }
           this.orderInfo = res.data
           this.feeDetailInfo=res.data.orderFeeResult;
           this.oldFeeInfo=res.data.adjustFeeDescVo;

src/views/FinancialManagement/ExpenseManagement/AccountReportViewing.vue

@@ -28,6 +28,12 @@
       fontWeight: '900',
       color: '#606266',
     }" height="600px" style="width: 100%; margin-top: 30px" >
+    <el-table-column
+      type="index"
+      label="序号"
+      align="center"
+      width="50">
+    </el-table-column>
       <el-table-column v-for="(dataItem, dataIndex) in columns" :key="dataIndex" :label="dataItem.label"
         :prop="dataItem.prop" :min-width="dataItem.minWidth" align="center">
       </el-table-column>
@@ -167,159 +173,31 @@ export default {
           minWidth: 120,
           sortable: false,
         },
-        {
-          prop: "sumInvoicingAmount",
-          label: "总开票额度",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "tentativeEstimates",
-          label: "暂估",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "yearAmount",
-          label: "本年开票金额",
-          minWidth: 120,
-          sortable: false,
-        },
         {
           prop: "quarterAmount",
           label: "本季度开票金额",
           minWidth: 120,
           sortable: false,
         },
-      ],
-      childColums: [
-        //卡表格数据列
-        {
-          prop: "accountQualityName",
-          label: "账户性质",
-          minWidth: 80,
-          sortable: false,
-        },
-        {
-          prop: "bankCardNum",
-          label: "银行卡号",
-          minWidth: 170,
-          sortable: false,
-        },
-        {
-          prop: "bank",
-          label: "开户行",
-          minWidth: 300,
-          sortable: false,
-        },
-        {
-          prop: "bankName",
-          label: "开户行名称",
-          minWidth: 300,
-          sortable: false,
-        },
-        {
-          prop: "bankNum",
-          label: "开户行号",
-          minWidth: 150,
-          sortable: false,
-        },
-        {
-          prop: "balance",
-          label: "余额",
-          minWidth: 100,
-          sortable: false,
-        },
-        {
-          prop: "startCertExpirationDate",
-          label: "证书有效开始日期",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "endCertExpirationDate",
-          label: "证书有效结束日期",
-          minWidth: 120,
-          sortable: false,
-        },
         {
-          prop: "dayStrokeNum",
-          label: "单日转账笔数限制",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "pubDayLinesExcess",
-          label: "单日转账笔数剩余",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "priDayLines",
-          label: "对私单日限额",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "priDayLinesExcess",
-          label: "对私单日限额剩余",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "priSingleLines",
-          label: "对私单笔限额",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "priYearLines",
-          label: "对私年额度",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "priYearExcess",
-          label: "对私年剩余额度",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "pubDayLines",
-          label: "对公单日限额",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "pubDayLinesExcess",
-          label: "对公单日限额剩余",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "pubSingleLines",
-          label: "对公单笔限额",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          prop: "pubYearLines",
-          label: "对公年额度",
+          prop: "yearAmount",
+          label: "本年开票金额",
           minWidth: 120,
           sortable: false,
         },
         {
-          prop: "pubYearExcess",
-          label: "对公年剩余额度",
+          prop: "sumInvoicingAmount",
+          label: "总开票额度",
           minWidth: 120,
           sortable: false,
         },
         {
-          prop: "spend",
-          label: "支出金额",
+          prop: "tentativeEstimates",
+          label: "暂估",
           minWidth: 120,
           sortable: false,
         },
+       
       ],
     };
   },