Merge remote-tracking branch 'origin/dev' into wuguojie

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

@@ -338,6 +338,7 @@ export default {
         isNotCar: "0",
         isNotDocumentary: "1",
       },
+      partnerCompaniesId:""
     };
   },
   created() {
@@ -366,6 +367,8 @@ export default {
     haldRecordDetail(row) {
       this.dialogVisiblerecordDetail = true;
       this.findPageDetailrecorddatail(row);
+      this.partnerCompaniesId = row.partnerCompaniesId;
+
     },
     getListrecorddetail(data) {
       this.findPageDetailrecorddatail(data);
@@ -374,7 +377,9 @@ export default {
       this.tableConfigDetailrecorddetail.loading = true;
       this.$api.task
         .fncplyFeeQuery({
-          partnerCompaniesId: data.partnerCompaniesId,
+          partnerCompaniesId: data.partnerCompaniesId
+            ? data.partnerCompaniesId
+            : this.partnerCompaniesId,
           agreementType: "2",
           // handlingFeesStatus: '1',
           isNotDocumentary: "1",

src/views/FinancialManagement/InsuranceData/InsuranceDataExport.vue

@@ -7,7 +7,7 @@
             <el-form class="queryForm" ref="queryFormRef" :model="queryForm" label-width="80px">
             <el-row style="margin-bottom: 15px;">
               <el-col :span="8">
-                <el-form-item label="录入时间">
+                <el-form-item label="签单时间">
                   <el-date-picker value-format="yyyy-MM-dd" v-model="queryForm.date" style="margin-left: 20px;" size="mini"
                     type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
                   </el-date-picker>
@@ -31,7 +31,7 @@
         <el-form label-width="80px" class="queryForm">
           <el-row style="margin-bottom: 15px;">
             <el-col :span="8">
-              <el-form-item label="筛选时间">
+              <el-form-item label="签单时间">
                 <el-date-picker
                  style="margin-left: 20px;"
                 v-model="date"
@@ -118,7 +118,7 @@
             this.queryForm.startDate=this.queryForm.date[0]
             this.queryForm.endDate=this.queryForm.date[1]
         }else{
-            this.$message.error('请选择录入时间！')
+            this.$message.error('请选择签单时间！')
             return
         }
         let params = {