已承保详情显示产品

config/dev.env.js

@@ -12,11 +12,11 @@ module.exports = merge(prodEnv, {
   // 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:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42: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/"',//郝宇
-  // BASE_URL: '"http:///192.168.0.103:8080/"',//
+  // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 
 

src/http/moudules/letter.js

@@ -904,4 +904,13 @@ export const getThemeByUserId = () => {
         url: "/sys/quotation/getThemeByUserId",
         method: "get",
     })
+    }
+
+// 保险公司驾意险接口
+export const getDrivingInsuranceRule = (data) => {
+    return axios({
+        url: "/api/drivingInsurance/getDrivingInsuranceRule",
+        method: "post",
+        data
+    })
     }

src/views/Core/components/detailsDialog.vue

@@ -1,4 +1,6 @@
 <template>
+  <div>
+
   <el-dialog :visible.sync="dialogVisible" width="80%" class="details_style">
     <div slot="title" class=" dialog-title details-title">
       <img src="../../../icon/归属信息.png" alt class="icon-img" />
@@ -23,7 +25,8 @@
           <li :class="{ 'li-selected': selectedItem === 'yxzl' }" @click="selectItem('yxzl')"
             v-if="Object.keys(obj).length != 0">影像资料</li>
           <li
-            :class="{ 'li-selected': selectedItem === 'fymx' }" @click="selectItem('fymx')">费用明细</li>
+            :class="{ 'li-selected': selectedItem === 'fymx' }" @click="selectItem('fymx')"
+            v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee && Feepermissions">费用明细</li>
           <li v-if="isAuditing && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.deptManagerFee.length > 0"
             :class="{ 'li-selected': selectedItem === 'jgglf' }" @click="selectItem('jgglf')">机构管理费</li>
           <li v-if="orderInfo.distributionLevelVoList && orderInfo.distributionLevelVoList.length > 0 "
@@ -421,7 +424,7 @@
           </div>
         </OpenCloseBox>
         <OpenCloseBox id="fymx" v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee && Feepermissions">
-          <span slot="title">费用明细</span>
+          <span slot="title">费用明细<el-button v-if="isTaskPool" type="primary" style="margin-left: 30px;" size="mini" @click="productCostAddVehicleFactorVisible = true">匹配费用信息</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="{
@@ -479,9 +482,226 @@
       <el-button size="small" type="primary" plain @click="dialogVisible = false">关闭</el-button>
     </span>
   </el-dialog>
+  <el-dialog title="产品因子录入" :visible.sync="productCostFactorDialogVisible" :close-on-click-modal="false" width="70%"
+      top="6vh" :fullscreen="true" @close="productCostFactoropenDialog">
+      <Product-Cost-Form v-if="productCostFactorDialogVisible" :form="orderInfo.agreementProductCostsSave.costsAttrLinks" :operator="operatorlist"
+        over-size="small"  :disabled="true"
+        @cancelForm="productCostFactorCancelForm"></Product-Cost-Form>
+    </el-dialog>
+  <el-dialog title="产品编辑" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
+      @close="productcloseDialog">
+      <el-collapse accordion>
+        <div class="productstitle flex j-s" style="margin-top: 10px">
+          <div>
+            <span v-for="(item, index) in orderInfo.agreementProductCostsSave.productName" :key="index">
+              {{ item }}-
+            </span>
+            <span>费用</span>
+          </div>
+        </div> 
+        <el-button class="mrgin-1" size="small" type="warning"
+          @click="productCostFactorDialogVisible = true">产品费用因子</el-button>
+        <el-form ref="productCostForm" v-if="orderInfo.agreementProductCostsSave" :model="orderInfo.agreementProductCostsSave" label-width="130px" :size="overSize"
+          :rules="costformRules">
+          <el-row>
+            <el-col :span="20" :offset="2">
+              <el-form-item label="费用描述">
+                <el-input type="textarea" v-model="orderInfo.agreementProductCostsSave.costsDescription" placeholder="输入费用描述内容"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10" :offset="2">
+              <el-form-item label="费用起期" prop="costsStartDate">
+                <el-date-picker style="width: 100%" v-model="orderInfo.agreementProductCostsSave.costsStartDate" type="datetime"
+                  placeholder="选择费用开始日期" value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptions"
+                  @change="cleanEndDate">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="费用止期" prop="costsEndDate">
+                <el-date-picker style="width: 100%" v-model="orderInfo.agreementProductCostsSave.costsEndDate" type="datetime"
+                  placeholder="选择费用结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10" :offset="2">
+              <el-form-item label="优先级">
+                <el-input style="width: 100%" v-model="orderInfo.agreementProductCostsSave.priorityLevel"
+                  onkeyup="value=value.replace(/\D/g,'')" placeholder="输入数字"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row> 
+          <el-row >
+            <h4 style="color: tomato">交强险费用</h4>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="费用比例" prop="jqCarCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqCarCostsProportion"
+                  @blur="costRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="其他费用比例">
+                <el-input disabled v-model="orderInfo.agreementProductCostsSave.jqCarOtherCostsProportion" placeholder="请输入其他费用比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="总费用比例" prop="jqCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqCostsProportion"
+                  @blur="totalCostRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
+                  placeholder="请输入总费用比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强管理比例一级	" prop="jqExportRadioLevel1">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqExportRadioLevel1" placeholder="请输入管理费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强管理比例二级	" prop="jqExportRadioLevel2">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqExportRadioLevel2" placeholder="请输入管理费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强管理比例三级	" prop="jqExportRadioLevel3">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqExportRadioLevel3" placeholder="请输入管理费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强管理比例四级	" prop="jqExportRadioLevel4">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqExportRadioLevel4" placeholder="请输入管理费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强管理比例五级	" prop="jqExportRadioLevel5">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqExportRadioLevel5" placeholder="请输入管理费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="交强出口手续比例" prop="jqCostsExportProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.jqCostsExportProportion" placeholder="请输入出口手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row >
+            <h4 style="color: tomato">商业险费用</h4>
+
+            <el-col :span="5" :offset="1">
+              <el-form-item label="费用比例" prop="syCarCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syCarCostsProportion"
+                  @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="其他费用比例">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syCarOtherCostsProportion" placeholder="请输入其他费用比例" disabled></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="总费用比例" prop="syCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syCostsProportion" placeholder="请输入总费用比例"
+                  @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业手续比例一级	" prop="syExportRadioLevel1">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syExportRadioLevel1" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业手续比例二级	" prop="syExportRadioLevel2">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syExportRadioLevel2" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业手续比例三级	" prop="syExportRadioLevel3">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syExportRadioLevel3" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业手续比例四级	" prop="syExportRadioLevel4">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syExportRadioLevel4" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业手续比例五级	" prop="syExportRadioLevel5">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syExportRadioLevel5" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="商业出口手续比例" prop="syCostsExportProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.syCostsExportProportion" placeholder="请输入出口手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <h4 style="color: tomato">非车费用</h4>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="费用比例" prop="noCarCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarCostsProportion"
+                  @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="其他费用比例">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarOtherCostsProportion" placeholder="请输入其他费用比例" disabled></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="5" :offset="1" v-if="permissions">
+              <el-form-item label="总费用比例" prop="noCostsProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCostsProportion" placeholder="请输入总费用比例"
+                  @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车手续比例一级	" prop="noCarExportRadioLevel1">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarExportRadioLevel1" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车手续比例二级	" prop="noCarExportRadioLevel2">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarExportRadioLevel2" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车手续比例三级	" prop="noCarExportRadioLevel3">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarExportRadioLevel3" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车手续比例四级	" prop="noCarExportRadioLevel4">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarExportRadioLevel4" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车手续比例五级	" prop="noCarExportRadioLevel5">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCarExportRadioLevel5" placeholder="请输入手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5" :offset="1">
+              <el-form-item label="非车出口手续比例" prop="noCostsExportProportion">
+                <el-input v-model="orderInfo.agreementProductCostsSave.noCostsExportProportion" placeholder="请输入出口手续费比例"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row> 
+         </el-form> 
+      </el-collapse>
+      <span slot="footer" class="dialog-footer">
+        <el-button :size="overSize" @click="productCostAddVehicleFactorVisible = false">取 消</el-button>
+      </span> 
+     </el-dialog>
+  </div>
+
 </template>
 <script>
 import OpenCloseBox from './openclose.vue'
+import ProductCostForm from '@/components/Form/ProductCostForm.vue';//表单组件
 
 export default {
   name: "detailsDialog",
@@ -490,7 +710,71 @@ export default {
       dialogVisible: false,
       obj: {},
       warrantObj: {},
+      operatorlist: [],
       selectedItem: null,
+      productCostAddVehicleFactorVisible: false, //产品费用录入    显示/隐藏
+      productCostFactorDialogVisible:false,
+      permissions: null,
+      overSize:'small',
+        costformRules: {
+        costsStartDate: [
+          { required: true, message: "请选择费用起期", trigger: "change" },
+        ],
+        costsEndDate: [
+          { required: true, message: "请选择费用止期", trigger: "change" },
+        ],
+
+        jqNewCarCostsProportion: [
+          { required: true, message: "请输入新车费用比例", trigger: "blur" },
+          {
+            pattern: /^([0-4])$/,
+            message: "请输入0-4的整数",
+            trigger: "blur",
+          },
+        ],
+        jqOldCarCostsProportion: [
+          { required: true, message: "请输入旧车费用比例", trigger: "blur" },
+          {
+            pattern: /^([0-4])$/,
+            message: "请输入0-4的整数",
+            trigger: "blur",
+          },
+        ],
+        jqCostsProportion: [
+          { required: true, message: "请输入总费用比例", trigger: "blur" },
+          {
+            pattern: /^100$|^[1-9]?\d(\.\d+)?$|^0(\.\d+)?$/,
+            message: "请输入0-100数",
+            trigger: "blur",
+          },
+        ],
+
+        syNewCarCostsProportion: [
+          { required: true, message: "请输入新车费用比例", trigger: "blur" },
+          {
+            pattern: /^([0-9]{1,2}|100)$/,
+            message: "请输入0-100的整数",
+            trigger: "blur",
+          },
+        ],
+        syOldCarCostsProportion: [
+          { required: true, message: "请输入旧车费用比例", trigger: "blur" },
+          {
+            pattern: /^([0-9]{1,2}|100)$/,
+            message: "请输入0-100的整数",
+            trigger: "blur",
+          },
+        ],
+        syCostsProportion: [
+          { required: true, message: "请输入总费用比例", trigger: "blur" },
+          {
+            pattern: /^100$|^[1-9]?\d(\.\d+)?$|^0(\.\d+)?$/,
+            message: "请输入0-100的数",
+            trigger: "blur",
+          },
+        ],
+      },
+      dynamicFormArray: [],
     };
   },
   props: {
@@ -506,10 +790,84 @@ export default {
       type: Object,
       default: () => { }
     },
+    isTaskPool:{
+      type:Boolean,
+      default:false,
+    },
+  
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        disabledDate: this.disabledDate,
+      };
+    },
   },
+  created(){
+       //获取操作符
+       this.$api.dict.findPage(this.operator).then(res => {
+        this.operatorlist = res.data.content;
+      })
+      this.$api.insCompany.shutdown().then((res) => {
+        this.permissions = res.data;
+      });
 
-  components: { OpenCloseBox },
+      this.getFactorTemplate();
+
+  },
+  components: { OpenCloseBox,ProductCostForm },
   methods: {
+    getFactorTemplate() {
+      this.$api.insCompany.productConfigItem().then(res => {
+        if (res.code == '200') {
+          let data = res.data;
+          data.map(ele => {
+            switch (ele.attrType) {
+              case 'inputNumber':
+                ele.operator = '1';
+                break;
+            }
+            if (ele.attrName == '车牌号') {
+              ele.dictLabal = this.areanumberplateList;
+            }
+          })
+          // this.productCostForm.costsAttrLinks = data;
+          this.dynamicFormArray = data;
+        }
+      })
+    },
+    productCostFactorCancelForm(data) {
+      this.productCostFactorDialogVisible = data;
+    },
+    productcloseDialog() {
+     this.productCostAddVehicleFactorVisible=false
+    },
+    productCostFactoropenDialog() {
+      this.productCostFactorDialogVisible =false
+    },
+     //改变费用起期时，同步清空对应费用止期，重新填写
+     cleanEndDate() {
+      this.orderInfo.agreementProductCostsSave.costsEndDate = null;
+    },
+     //改变费用止期时，校验必须先填费用起期
+     checkStartDate() {
+      let tempStartDate = this.orderInfo.agreementProductCostsSave.costsAttrLinks.costsStartDate;
+      let tempEndDate = this.orderInfo.agreementProductCostsSave.costsEndDate;
+      if (!tempStartDate) {
+        this.orderInfo.agreementProductCostsSave.costsEndDate = null;
+        this.$message({
+          message: "请先选择费用起期！",
+          type: "error",
+        });
+      }
+      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
+        this.orderInfo.agreementProductCostsSave.costsEndDate = null;
+        this.$message({
+          message: "费用止期不能小于/等于费用起期！",
+          type: "error",
+        });
+      }
+    },
     selectItem(item) {
       this.selectedItem = item;
       document.getElementById(item).scrollIntoView({ behavior: "smooth" });
@@ -670,10 +1028,31 @@ export default {
     width: 100% !important;
   }
 }
+.products>div {
+  margin: 5px;
+}
+
+.productstitle {
+  width: 100%;
+  border-bottom: 2px solid #409eff;
+  text-align: center;
+}
 
-/deep/ .el-dialog__body {
+.productstitle>div {
+  width: 100px;
+  height: 26px;
+  line-height: 30px;
+  background: #409eff;
+  color: #fff;
+  border-top-right-radius: 15px;
+  padding: 2px;
+  font-size: 12px;
+}
+.details_style /deep/ .el-dialog__body {
   padding-top: 0;
   border-bottom: 1px solid #EEF1F6;
   background-color: rgb(242, 242, 242);
   padding: 0;
-}</style>
+}
+
+</style>

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -4,7 +4,8 @@
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
-          <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+        <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData" @getDayData="getDayData">
+        </yearMonthYay>
       </template>
     </templateTable>
   </div>
@@ -16,7 +17,7 @@ import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
 
 export default {
   name: "baosi",
-  components: {  templateTable,yearMonthYay },
+  components: { templateTable, yearMonthYay },
   created() {
   },
   computed: {
@@ -29,22 +30,22 @@ export default {
       year: '',
       searchData: {},
       formList: [
-                {
-                    label: "保险公司",
-                    prop: "companyName",
-                    type: "company",
-                },
-                {
-                    label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
-                {
-                    label: "年月日",
-                    name: "data",
-                    type: "slot",
-                    },
-            ],
+        {
+          label: "保险公司",
+          prop: "companyName",
+          type: "company",
+        },
+        {
+          label: "合作公司名称",
+          prop: "partnerCompaniesName",
+          type: "input",
+        },
+        {
+          label: "年月日",
+          name: "data",
+          type: "slot",
+        },
+      ],
       tableConfig: {
         columns: [
           {
@@ -62,30 +63,36 @@ export default {
             label: "总跟单费",
             type: "text"
           },
-        
           {
-            prop: "invoicCommissionFeevalue",
-            label: "已开票跟单费",
+            prop: "allInvoicCommissionFeevalue",
+            label: "已开票金额",
             type: "text"
           },
           {
-            prop: "settleMentAmount",
-            label: "已开票已结算跟单费",
+            prop: "readyCommissionFeevalue",
+            label: "已开票已结算",
             type: "text"
-          },{
-            prop: "unSettledAmount",
-            label: "已开票未结算跟单费",
+          },
+          {
+            prop: "invoicCommissionFeevalue",
+            label: "已开票未结算",
             type: "text"
-          }, {
+          },
+          {
             prop: "noInvoicCommissionFeevalue",
-            label: "未开票跟单费",
+            label: "未开票",
+            type: "text"
+          },
+          {
+            prop: "unSettledAmount",
+            label: "未结算金额",
             type: "text"
           },
         ],
         loading: true,
         isPaginationShow: true,
-        showSummary:true,
-        tableHeight:'none'
+        showSummary: true,
+        tableHeight: 'none'
       },
       tableData: [],
       formData: {},
@@ -102,14 +109,14 @@ export default {
     this.findPage();
   },
   methods: {
-    getYearData(val){
-      this.formData.year=val
+    getYearData(val) {
+      this.formData.year = val
     },
-    getMonthData(val){
-      this.formData.month=val
+    getMonthData(val) {
+      this.formData.month = val
     },
-    getDayData(val){
-      this.formData.day=val
+    getDayData(val) {
+      this.formData.day = val
     },
     // 查询
     handleSearchList(data) {
@@ -119,16 +126,16 @@ export default {
     findPage(data) {
       this.tableConfig.loading = true;
       this.$api.task
-        .allOtherAmount({...this.pageData,...data,...this.formData})
+        .allOtherAmount({ ...this.pageData, ...data, ...this.formData })
         .then(res => {
-          if (res.code==200) {
-            this.tableData = res.data?res.data:[]
+          if (res.code == 200) {
+            this.tableData = res.data ? res.data : []
             // this.pageData.pageNum = res.data.pageNum;
             // this.pageData.pageSize = res.data.pageSize;
             // this.pageData.totalSize = res.data.totalSize;
             this.tableConfig.loading = false;
           }
-          else{
+          else {
             this.$message.error(res.msg)
           }
         });
@@ -141,15 +148,15 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
-   
+
   }
 };
 </script>
     
 <style scoped>
-
-.invoiceAnd >>>.el-table__body-wrapper {
-    overflow-y: auto !important;
-    height: auto !important;
-  }</style>
+.invoiceAnd>>>.el-table__body-wrapper {
+  overflow-y: auto !important;
+  height: auto !important;
+}
+</style>
     

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue

@@ -60,27 +60,32 @@ export default {
                     
                     {
                         prop: "commissionFeevalue",
-                        label: "总手续费",
+                        label: "总金额",
                         type: "text"
                     },
                     {
-                        prop: "invoicCommissionFeevalue",
-                        label: "已开票手续费",
+                        prop: "allInvoicCommissionFeevalue",
+                        label: "已开票金额",
                         type: "text"
                     },
                     {
                         prop: "readyCommissionFeevalue",
-                        label: "已开票已结算手续费",
+                        label: "已开票已结算",
                         type: "text"
                     },
                     {
-                        prop: "unSettledAmount",
-                        label: "已开票未结算手续费",
+                        prop: "invoicCommissionFeevalue",
+                        label: "已开票未结算",
                         type: "text"
                     },
                     {
                         prop: "noInvoicCommissionFeevalue",
-                        label: "未开票手续费",
+                        label: "未开票",
+                        type: "text"
+                    },
+                    {
+                        prop: "unSettledAmount",
+                        label: "未结算金额",
                         type: "text"
                     },
                 ],

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -62,24 +62,29 @@ export default {
             label: "总跟单费",
             type: "text"
           },
-        
           {
-            prop: "invoicCommissionFeevalue",
-            label: "已开票跟单费",
+            prop: "allInvoicCommissionFeevalue",
+            label: "已开票金额",
             type: "text"
           },
           {
-            prop: "settleMentAmount",
-            label: "已开票已结算跟单费",
+            prop: "readyCommissionFeevalue",
+            label: "已开票已结算",
             type: "text"
           },
-         {
-            prop: "unSettledAmount",
-            label: "已开票未结算跟单费",
+          {
+            prop: "invoicCommissionFeevalue",
+            label: "已开票未结算",
             type: "text"
-          }, {
+          },
+          {
             prop: "noInvoicCommissionFeevalue",
-            label: "未开票跟单费",
+            label: "未开票",
+            type: "text"
+          },
+          {
+            prop: "unSettledAmount",
+            label: "未结算金额",
             type: "text"
           },
         ],

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -57,29 +57,34 @@ export default {
                         label: "合作公司名称",
                         type: "text"
                     },
-                   {
+                    {
                         prop: "commissionFeevalue",
-                        label: "总手续费",
+                        label: "总金额",
                         type: "text"
                     },
                     {
-                        prop: "invoicCommissionFeevalue",
-                        label: "已开票手续费",
+                        prop: "allInvoicCommissionFeevalue",
+                        label: "已开票金额",
                         type: "text"
                     },
                     {
                         prop: "readyCommissionFeevalue",
-                        label: "已开票已结算手续费",
+                        label: "已开票已结算",
                         type: "text"
                     },
                     {
-                        prop: "unSettledAmount",
-                        label: "已开票未结算手续费",
+                        prop: "invoicCommissionFeevalue",
+                        label: "已开票未结算",
                         type: "text"
                     },
                     {
                         prop: "noInvoicCommissionFeevalue",
-                        label: "未开票手续费",
+                        label: "未开票",
+                        type: "text"
+                    },
+                    {
+                        prop: "unSettledAmount",
+                        label: "未结算金额",
                         type: "text"
                     },
                 ],

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" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders"></detailsDialog>
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">
         <span>订单轨迹</span>

src/views/Task/daikeComponents/KtOrder.vue

@@ -1252,7 +1252,6 @@ export default {
       else{
         return '-'
       }
-    
     },
     //应用详情
     OrderDetails(dy, item) {

src/views/Task/mixin.js

@@ -153,6 +153,12 @@ export const mixin = { // 导出混入对象
       orderInfo: {},
       forwardingRecordsdialogVisible:false,
       gridData:[],
+      natureOfVehicleUseoptions: [],
+      businessVehicleUseoptions:[],
+      energyTypeoptions:[],
+      vehicleTypeoptions:[],
+      trafficManagementVehicleTypeoptions:[],
+      outOfBusinessVehicleUseoptions: [],
     }
   },
   computed: {
@@ -177,8 +183,29 @@ export const mixin = { // 导出混入对象
     this.CompanyList();
     this.agrmentlist();
     this.getDicType("productsType"); //车船税类型
+    this.getDicTypePro("natureOfVehicleUse"); //车辆使用性质
+    this.getDicTypePro("vehicleType"); //车辆种类
+    this.getDicTypePro("trafficManagementVehicleType"); //车辆类型
+    this.getDicTypePro("energyType"); //能源种类
+    this.getDicTypePro("businessVehicleUse"); //（车辆用途）营业
+    this.getDicTypePro("outOfBusinessVehicleUse"); //（车辆用途）非营业
   },
   methods: {
+    getDicTypePro(type) {
+      this.$api.insCompany.dicType(type).then(res => {
+        if (res.code == 200) {
+          this[type + "options"] = res.data.ddList;
+        }
+      });
+    },
+    capTypedictTag(val,option) {
+      if(option.find(item =>  item.dictValue == val)){
+        return option.find(item =>  item.dictValue == val).dictTag;
+        }
+      else{
+        return '-'
+      }
+    },
     forwardingRecords(row){
       let id=row.row.subOrderId;
       this.forwardingRecordsQuery(id);
@@ -226,8 +253,20 @@ export const mixin = { // 导出混入对象
             }
             return ele;
           });
+          if(data.carinfo.carnature &&  data.carinfo.carnature == '02' || data.carinfo.carnature == '非营业'){
+            data.carinfo.vehicleUse=this.capTypedictTag(data.carinfo.vehicleUse,this.outOfBusinessVehicleUseoptions)
+          }else{
+            data.carinfo.vehicleUse=this.capTypedictTag(data.carinfo.vehicleUse,this.businessVehicleUseoptions)
+          }
+          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.energyType=data.carinfo.energyType?this.capTypedictTag(data.carinfo.energyType,this.energyTypeoptions):''
           this.queryOrders = data;
         }
+        else{
+          this.$message.error(res.msg)
+        }
       });
       this.$refs.detailsDialog.setBackupVisible(true);
     },