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

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -369,8 +369,6 @@
     </el-dialog>
     <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
       <div class="tab-panestyle">
-
-
         <el-form :inline="true" :model="batchUpdateForm" class="demo-form-inline  tab-panecent" style="padding: 20px;">
           <el-form-item label="费用起期：">
             <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="datetime"
@@ -1411,19 +1409,14 @@ export default {
     checkStartDate1() {
       let tempStartDate = this.batchUpdateForm.costsStartDate;
       let tempEndDate = this.batchUpdateForm.costsEndDate;
-      if (!tempStartDate) {
-        this.batchUpdateForm.costsEndDate = null;
-        this.$message({
-          message: "请先选择费用起期！",
-          type: "error",
-        });
-      }
-      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
-        this.batchUpdateForm.costsEndDate = null;
-        this.$message({
-          message: "费用止期不能小于/等于费用起期！",
-          type: "error",
-        });
+      if (tempStartDate && tempEndDate) {
+        if (!this.validateEndDate(tempStartDate, tempEndDate)) {
+          this.batchUpdateForm.costsEndDate = null;
+          this.$message({
+            message: "费用止期不能小于/等于费用起期！",
+            type: "error",
+          });
+        }
       }
     },
     //产品批量编辑
@@ -1496,8 +1489,8 @@ export default {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
       } else {
-        this.productpageRequest.pageNum = 1;
-        this.productpageRequest.pageSize = 20;
+        // this.productpageRequest.pageNum = 1;
+        // this.productpageRequest.pageSize = 20;
       }
       this.$api.insCompany
         .productCostQuery(this.productpageRequest)

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview.vue

@@ -32,7 +32,7 @@
             </el-row>
             <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" 
              :data="pageResult" :columns="columns"
-                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回"
+                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回" 
                 @handleButton2="handleButton2"></kt-common-table>
         </el-main>
     </div>
@@ -72,6 +72,7 @@ export default {
                 { prop: "bankAccount", label: "银行" },
                 { prop: "bankAddress", label: "开户行" },
                 { prop: "auditStatus", label: "状态",formatter:this.statusFormatter },
+                { prop: "remark", label: "驳回原因" },
             ],
         };
     },