Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/Core/components/detailsDialog.vue

@@ -385,7 +385,7 @@
           </OpenCloseBox>
 
           <OpenCloseBox id="jgglf"
-            v-if="isAuditing && isAuditing.feeOrderNewVo && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.deptManagerFee">
+            v-if="isAuditing  && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.deptManagerFee">
             <span slot="title">机构管理费</span>
             <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
               <el-table :data="orderInfo.feeOrderNewVo.deptManagerFee" :border="true" width="100%" :stripe="true"
@@ -482,37 +482,39 @@
             <span slot="title">费用明细<el-button v-if="isTaskPool" type="primary" style="margin-left: 30px;" size="mini"
                 @click="agreementProductCostsSaveFun()">匹配费用信息</el-button></span>
             <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
-              <el-table :data="orderInfo.feeOrderNewVo.exportFee" :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="otherCostsProportion" label="跟单比例">
-                  <template slot-scope="scope">
-                    <span v-if="!isAuditing || scope.row.type !== '入口费用'">{{ scope.row.otherCostsProportion }} </span>
-                    <el-input v-else v-model="scope.row.otherCostsProportion" size="mini"></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="superviseCosts" label="手续费比例">
-                  <template slot-scope="scope">
-                    <span v-if="!isAuditing || scope.row.type !== '入口费用'">{{ scope.row.superviseCosts }} </span>
-                    <el-input v-else v-model="scope.row.superviseCosts" size="mini"></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="totalProportion" label="总比例">
-                  <template slot-scope="scope">
-                    <span v-if="!isAuditing || scope.row.type !== '入口费用'">{{ scope.row.totalProportion }} </span>
-                    <el-input v-else v-model="scope.row.totalProportion" size="mini"></el-input>
-                  </template>
-                </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="superviseCostsPremiums" label="手续费"></el-table-column>
-                <el-table-column prop="totalAmount" label="总费用"></el-table-column>
-              </el-table>
+              <el-table :data="feeOrderNewVoList.list" :span-method="feeOrderNewVomergeRows" :border="true" width="100%"
+              :stripe="true" size="mini" :header-cell-style="{
+                background: '#F7F7F9',
+                fontWeight: '700',
+                color: '#606266',
+              }">
+              <el-table-column prop="type" label="">
+              </el-table-column>
+              <el-table-column prop="insuranceType" label="险种">
+              </el-table-column>
+              <el-table-column prop="premium" label="保费"></el-table-column>
+              <el-table-column prop="otherCostsProportion" label="跟单比例">
+                <template slot-scope="scope" >
+                  <span v-if="isAuditing || scope.row.type !== '入口费用'">{{ scope.row.otherCostsProportion }} </span>
+                  <el-input v-else v-model="scope.row.otherCostsProportion" size="mini"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="superviseCosts" label="手续费比例">
+                <template slot-scope="scope">
+                  <span v-if="isAuditing || scope.row.type !== '入口费用'">{{ scope.row.superviseCosts }} </span>
+                  <el-input v-else v-model="scope.row.superviseCosts" size="mini"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="totalProportion" label="总比例">
+                <template slot-scope="scope">
+                  <span v-if="isAuditing || scope.row.type !== '入口费用'">{{ scope.row.totalProportion }}</span>
+                  <el-input v-else v-model="scope.row.totalProportion" size="mini"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="otherCostsPremiums" label="跟单费"></el-table-column>
+              <el-table-column prop="superviseCostsPremiums" label="手续费"></el-table-column>
+              <el-table-column prop="totalAmount" label="总费用"></el-table-column>
+            </el-table>
             </div>
           </OpenCloseBox>
           <OpenCloseBox id="fxmx1" v-if="orderInfo.feeOrderNewVo && orderInfo.distributionLevelVoList && Feepermissions">
@@ -871,6 +873,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    feeOrderNewVoList: Object,
 
   },
   computed: {
@@ -893,6 +896,24 @@ export default {
   },
   components: { OpenCloseBox, ProductCostForm },
   methods: {
+    feeOrderNewVomergeRows({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex === 0 || this.feeOrderNewVoList.list[rowIndex].type !== this.feeOrderNewVoList.list[rowIndex - 1].type) {
+          let rowSpan = 1;
+          for (let i = rowIndex + 1; i < this.feeOrderNewVoList.list.length; i++) {
+            if (this.feeOrderNewVoList.list[i].type === row.type) {
+              rowSpan++;
+            } else {
+              break;
+            }
+          }
+          return [rowSpan, 1];
+        } else {
+          return [0, 0];
+        }
+      }
+      return [1, 1];
+    },
     phoneDial(type) {
       this.$api.letter.getMobileByOrderNo(this.orderInfo.orderno, type).then((res) => {
         if (res.code == '200') {

src/views/Core/components/detailsDialogPro.vue

@@ -464,6 +464,8 @@
               </el-table-column>
               <el-table-column prop="deptPremiumsLevelFive" label="五级管理费">
               </el-table-column>
+              <el-table-column prop="profitMarginPremiums" label="利润差值">
+                </el-table-column>
             </el-table>
           </div>
         </OpenCloseBox>

src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders " :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>
@@ -69,6 +69,7 @@ export default {
   },
   data() {
     return {
+
       pageRequest: {
         pageNum: 1,
         pageSize: 20,

src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -17,7 +17,7 @@
         <el-button type="primary" size="small" @click="transmitSumit">确 定</el-button>
       </span>
     </el-dialog>
-    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/mixin.js

@@ -159,6 +159,10 @@ export const mixin = { // 导出混入对象
       vehicleTypeoptions:[],
       trafficManagementVehicleTypeoptions:[],
       outOfBusinessVehicleUseoptions: [],
+      isAuditing:{
+        adjustFeeFlag:false,
+      },
+      feeOrderNewVoList:{},
     }
   },
   computed: {
@@ -253,6 +257,20 @@ export const mixin = { // 导出混入对象
             }
             return ele;
           });
+          if (data.feeOrderNewVo && data.feeOrderNewVo.exportFee && data.feeOrderNewVo.entranceFee) {
+            let data1 = JSON.parse(JSON.stringify(res.data.feeOrderNewVo))
+            data1.exportFee.map((val, index) => {
+              val.type = "出口费用"
+              return val;
+            })
+            data1.entranceFee.map((val, index) => {
+              val.type = "入口费用"
+              return val;
+            })
+            this.feeOrderNewVoList = {
+              list: [...data1.entranceFee,...data1.exportFee],
+            }
+          }
           if(data.carinfo.carnature &&  data.carinfo.carnature == '02' || data.carinfo.carnature == '非营业'){
             data.carinfo.vehicleUse=this.capTypedictTag(data.carinfo.vehicleUse,this.outOfBusinessVehicleUseoptions)
           }else{
@@ -260,7 +278,7 @@ export const mixin = { // 导出混入对象
           }
           data.carinfo.carnature = this.capTypedictTag(data.carinfo.carnature,this.natureOfVehicleUseoptions);
           data.carinfo.cartype=data.carinfo.cartype?this.capTypedictTag(data.carinfo.cartype,this.trafficManagementVehicleTypeoptions):''
-         data.carinfo.cimodelclass=data.carinfo.cimodelclass?this.capTypedictTag(data.carinfo.cimodelclass,this.vehicleTypeoptions):''
+          data.carinfo.cimodelclass=data.carinfo.cimodelclass?this.capTypedictTag(data.carinfo.cimodelclass,this.vehicleTypeoptions):''
           data.carinfo.energyType=data.carinfo.energyType?this.capTypedictTag(data.carinfo.energyType,this.energyTypeoptions):''
           this.queryOrders = data;
         }