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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -739,8 +739,9 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="操作时间">
-              <el-date-picker clearable v-model="productHistoryRecordForm.operatorTime" type="date" size="small"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
+              <el-date-picker clearable v-model="productHistoryOperatorTime" type="daterange" size="small"
+                value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @change="productHistorydaterange">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -778,8 +779,9 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="操作时间">
-              <el-date-picker clearable v-model="underwritingRulesHistoryCostFindForm.operatorTime" type="date"
-                size="small" value-format="yyyy-MM-dd" placeholder="选择日期">
+              <el-date-picker clearable v-model="underwritingRulesHistoryOperatorTime" type="daterange" size="small"
+                value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @change="underwritingRulesHistorydaterange">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -815,8 +817,9 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="操作时间">
-              <el-date-picker clearable v-model="productpageRequestForm.operatorTime" type="date" size="small"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
+              <el-date-picker clearable v-model="agreementHistoryOperatorTime" type="daterange" size="small"
+                value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @change="agreementHistorydaterange">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -2018,9 +2021,12 @@ export default {
       productHistoryRecordResult: [],
       underwritingRulesHistoryRecordDialogVisible: false,
       underwritingRulesHistoryRecordResult: [],
-      productpageRequestForm: {},
-      productHistoryRecordForm: {},
-      underwritingRulesHistoryCostFindForm: {},
+      productpageRequestForm: {},//协议历史记录检索数据
+      productHistoryRecordForm: {},//产品历史记录检索数据
+      underwritingRulesHistoryCostFindForm: {},//规则历史记录检索数据
+      agreementHistoryOperatorTime: "",
+      productHistoryOperatorTime: "",
+      underwritingRulesHistoryOperatorTime: "",
       // 轨迹
       ddgjdialogVisible: false,
       trajectoryTable: []
@@ -2109,6 +2115,36 @@ export default {
     this.findLeftTreeData();
   },
   methods: {
+    //协议历史操作时间
+    agreementHistorydaterange(e) {
+      if (e) {
+        this.productpageRequestForm.operatorStartTime = e[0];
+        this.productpageRequestForm.operatorEndTime = e[1];
+      } else {
+        this.productpageRequestForm.operatorStartTime = "";
+        this.productpageRequestForm.operatorEndTime = "";
+      }
+    },
+    //产品费用操作时间
+    productHistorydaterange(e) {
+      if (e) {
+        this.productHistoryRecordForm.operatorStartTime = e[0];
+        this.productHistoryRecordForm.operatorEndTime = e[1];
+      } else {
+        this.productHistoryRecordForm.operatorStartTime = "";
+        this.productHistoryRecordForm.operatorEndTime = "";
+      }
+    },
+    //承保规则操作时间
+    underwritingRulesHistorydaterange(e) {
+      if (e) {
+        this.underwritingRulesHistoryCostFindForm.operatorStartTime = e[0];
+        this.underwritingRulesHistoryCostFindForm.operatorEndTime = e[1];
+      } else {
+        this.underwritingRulesHistoryCostFindForm.operatorStartTime = "";
+        this.underwritingRulesHistoryCostFindForm.operatorEndTime = "";
+      }
+    },
     agreestatusStyle(val) {
       switch (val) {
         case 0:
@@ -2630,7 +2666,7 @@ export default {
           type: "error",
         });
       }
-      if(!this.validateEndDate(tempStartDate,tempEndDate)){
+      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
         this.productCostForm.costsEndDate = null;
         this.$message({
           message: "费用止期不能小于/等于费用起期！",
@@ -3371,5 +3407,4 @@ export default {
 
 .el-icon-arrow-down {
   font-size: 12px;
-}
-</style>
+}</style>

src/views/Core/components/detailsDialog.vue

@@ -420,7 +420,7 @@
             </el-row>
           </div>
         </OpenCloseBox>
-        <OpenCloseBox id="fymx" v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee">
+        <OpenCloseBox id="fymx" v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee && Feepermissions">
           <span slot="title">费用明细</span>
           <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
             <el-table :data="orderInfo.feeOrderNewVo.exportFee" :span-method="feeOrderNewVomergeRows" :border="true" width="100%"
@@ -456,7 +456,7 @@
             </el-table>
           </div>
         </OpenCloseBox>
-        <OpenCloseBox id="fxmx1" v-if=" orderInfo.feeOrderNewVo && orderInfo.distributionLevelVoList">
+        <OpenCloseBox id="fxmx1" v-if=" orderInfo.feeOrderNewVo && orderInfo.distributionLevelVoList && Feepermissions">
           <span slot="title">分销明细</span>
           <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
             <el-table :data="orderInfo.distributionLevelVoList" :border="true" width="100%" :stripe="true" size="mini"
@@ -498,6 +498,10 @@ export default {
       type: Object,
       default: {}
     },
+    Feepermissions:{
+      type:Boolean,
+      default:true,
+    },
     isAuditing: {
       type: Object,
       default: () => { }

src/views/Core/components/detailsDialogPro.vue

@@ -368,6 +368,7 @@
               </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>
@@ -386,7 +387,6 @@
                   <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>

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

@@ -127,7 +127,7 @@ export default {
 
         },
         {
-          name: 'subOrderId',
+          name: 'orderNo',
           label: '订单号',
           type: 'input',
 

src/views/Task/daikeComponents/KtLetter.vue

@@ -1394,7 +1394,7 @@
       </div>
     </div>
     <!-- 查看详情 -->
-    <detailsDialog ref="detailsDialog" :orderInfo="queryOrders"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :orderInfo="queryOrders" :Feepermissions="false"></detailsDialog>
     <el-dialog title="车型选择" :visible.sync="chexingdialogVisible" width="1300px">
       <el-form :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="厂牌型号">

src/views/Task/mixin.js

@@ -35,10 +35,9 @@ export const mixin = { // 导出混入对象
 
         },
         {
-          name: 'id',
+          name: 'orderNo',
           label: '订单号',
           type: 'input',
-
         },
         {
           name: 'companyId',
@@ -165,8 +164,6 @@ export const mixin = { // 导出混入对象
   created() {
     this.pageRequest.quoteStartDateStr=this.currentDate;
     this.pageRequest.quoteEndDateStr=this.currentDate;
-    this.pageRequest.attachStartDateStr=this.currentDate;
-    this.pageRequest.attachEndDateStr=this.currentDate;
     this.$api.letter.gainTopList().then(res => {
       this.companyList = res.data;
     });