1、协议历史记录、产品历史记录、承保规则历史记录详情展示

2、财务机构结算管理历史bug处理、应收导入修改字段

src/http/moudules/insCompany.js

@@ -357,6 +357,13 @@ export const productCostHistory = (data) => {
     data
   })
 }
+//历史记录详情
+export const productCostHistoryDetails = (ruleId) => {
+  return axios({
+    url: '/plt/new/agreementhistory/getCostDetail/'+ruleId,
+    method: "get",
+  })
+}
 //获取因子表单项
 export const productConfigItem = () => {
   return axios({
@@ -464,6 +471,13 @@ export const undwrtRulesHistoryPage = (data) => {
     data
   })
 }
+//历史记录详情
+export const undwrtRulesHistoryPageDetails = (ruleId) => {
+  return axios({
+    url: '/plt/new/agreementhistory/getRulesDetail/'+ruleId,
+    method: "get",
+  })
+}
 /** 协议承保规则 */
 
 /** 协议非车产品费用 */

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -661,22 +661,23 @@
     </el-dialog>
 
     <el-dialog title="产品历史记录" :visible.sync="productHistoryRecordDialogVisible" width="70%" :fullscreen="true">
-      <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="false"
-        :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="productHistoryRecordResult"
-        :columns="productHistoryRecordColumns" @findPage="productHistoryCostFindPage">
+      <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
+        button2Name="详情" @handleButton2="productHistoryDetails" :showBatchDelete="false" :showBatchSettled="false"
+        :showBatchPrint="false" :data="productHistoryRecordResult" :columns="productHistoryRecordColumns"
+        @findPage="productHistoryCostFindPage">
       </kt-common-table>
     </el-dialog>
     <el-dialog title="承保规则历史记录" :visible.sync="underwritingRulesHistoryRecordDialogVisible" width="70%"
       :fullscreen="true">
-      <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="false"
-        :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false"
-        :data="underwritingRulesHistoryRecordResult" :columns="underwritingRulesHistoryRecordColumns"
-        @findPage="underwritingRulesHistoryCostFindPage">
+      <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
+        :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" button2Name="详情"
+        @handleButton2="underwritingRulesHistoryDetails" :data="underwritingRulesHistoryRecordResult"
+        :columns="underwritingRulesHistoryRecordColumns" @findPage="underwritingRulesHistoryCostFindPage">
       </kt-common-table>
     </el-dialog>
     <el-dialog title="协议历史记录" :visible.sync="agreementHistoryRecordDialogVisible" width="70%" :fullscreen="true">
       <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
-        button5Name="详情" @handleButton5="handleButtonHistory" :showBatchDelete="false" :showBatchSettled="false"
+        button2Name="详情" @handleButton2="agreementsHistory" :showBatchDelete="false" :showBatchSettled="false"
         :showBatchPrint="false" :data="agreementHistoryRecordResult" :columns="agreementHistoryRecordColumns"
         @findPage="agreementHistoryCostFindPage">
       </kt-common-table>
@@ -713,7 +714,229 @@
         :data="productcopyItemResult" :columns="productcopyItemColumns" @findPage="productcopyItemFindPage">
       </kt-common-table>
     </el-dialog>
-
+    <el-dialog title="协议历史记录详情" :visible.sync="agreementsHistoryDialogVisible" width="70%" @close="agreementsHistorycloseDialog">
+      <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTab">
+        <el-tab-pane label="协议信息" name="first">
+          <el-form :size="overSize" :model="agreementsHistoryInfo.agreement" ref="addAgreementRef" disabled
+            label-width="130px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="协议代码">
+                  <el-input v-model="agreementsHistoryInfo.agreement.agreementCode" disabled placeholder="请输入协议代码"
+                    style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="协议名称" prop="agreementName">
+                  <el-input v-model="agreementsHistoryInfo.agreement.agreementName" placeholder="请输入协议名称"
+                    style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="协议简称" prop="agreementAbbreviation">
+                  <el-input v-model="agreementsHistoryInfo.agreement.agreementAbbreviation" placeholder="请输入协议简称"
+                    style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="协议类型" prop="agreementType">
+                  <el-select v-model="agreementsHistoryInfo.agreement.agreementType" placeholder="请选择协议类型"
+                    style="width: 100%" @change="agreementTypeChange">
+                    <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                      :value="item.dictValue"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="合作公司" prop="partnerCompaniesId">
+                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%"
+                    v-model="agreementsHistoryInfo.agreement.partnerCompaniesId" :show-all-levels="false"
+                    :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable filterable></el-cascader>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'associationCompaniesId'">
+                  <el-cascader :disabled="supplierType == '1' || operType == 'EDIT'" style="width: 100%"
+                    v-model="agreementsHistoryInfo.agreement.associationCompaniesId" :show-all-levels="false"
+                    :options="prodInsurance" :props="optionProps" @change="prodhandleChange" clearable
+                    filterable></el-cascader>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="对接人" prop="dockingPerson">
+                  <el-input v-model="agreementsHistoryInfo.agreement.dockingPerson" placeholder="请添加对接人"
+                    style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="联系方式" prop="dockingPhone">
+                  <el-input maxlength="11" show-word-limit v-model="agreementsHistoryInfo.agreement.dockingPhone"
+                    placeholder="请输入联系方式" style="width: 100%" type="text"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="含增值税结算" prop="withTax">
+                  <el-select v-model="agreementsHistoryInfo.agreement.withTax" placeholder="请选择是否含增值税结算"
+                    style="width: 100%">
+                    <el-option label="是" value="是"></el-option>
+                    <el-option label="否" value="否"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="保单日期类型" prop="matchType">
+                  <el-select v-model="agreementsHistoryInfo.agreement.matchType" placeholder="请选择保单日期类型"
+                    style="width: 100%">
+                    <el-option v-for="item in matchTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                      :value="item.dictValue"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="协议生效日期" prop="startDate">
+                  <el-date-picker style="width: 100%" v-model="agreementsHistoryInfo.agreement.startDate" type="date"
+                    placeholder="选择协议生效日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="协议失效日期" prop="endDate">
+                  <el-date-picker style="width: 100%" v-model="agreementsHistoryInfo.agreement.endDate" type="date"
+                    placeholder="选择失效日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="佣金发放方式" prop="moneyType">
+                  <el-select v-model="agreementsHistoryInfo.agreement.moneyType" placeholder="请选择佣金发放方式"
+                    style="width: 100%">
+                    <el-option v-for="item in moneyTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                      :value="item.dictValue"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="有效状态" prop="validStatus">
+                  <el-select v-model="agreementsHistoryInfo.agreement.validStatus" placeholder="请选择有效状态"
+                    style="width: 100%">
+                    <el-option label="有效" value="1"></el-option>
+                    <el-option label="无效" value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="结算周期" prop="moneyTime">
+                  <el-select v-model="agreementsHistoryInfo.agreement.moneyTime" placeholder="请选择结算周期"
+                    style="width: 100%">
+                    <el-option :label="'T+' + item" :value="item" v-for="item of 60" :key="item"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="审核方式">
+                  <el-select v-model="agreementsHistoryInfo.agreement.auditType" placeholder="请选择审核方式"
+                    style="width: 100%">
+                    <el-option label="人工审核" value="1"></el-option>
+                    <el-option label="自动审核" value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="序号" prop="serialNumber">
+                  <el-input-number :min="0" v-model="agreementsHistoryInfo.agreement.serialNumber"></el-input-number>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="描述" prop="underwritingDescription">
+                  <el-input type="textarea" :rows="2" placeholder="请输入内容"
+                    v-model="agreementsHistoryInfo.agreement.underwritingDescription"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="保险公司账号配置" name="inscommany">
+          <el-form class="demo-ruleForm wrap-scrollbar scroll-style" :model="agreementsHistoryInfo.attributionform"
+            ref="attributionform" :label-width="labelWidth" size="small">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item class="apistyle" label="api类型：">
+                  <el-select class="widths1" v-model="agreementsHistoryInfo.attributionform.apiType" @change="apiChange">
+                    <el-option label="API" :value="1"></el-option>
+                    <el-option label="python" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <div v-if="attributionform.apiType == 2">
+                <el-col :span="24">
+                  <div>
+                    <h4>账号配置</h4>
+                  </div>
+                </el-col>
+                <el-col :span="11">
+                  <el-form-item label="用户名：" prop="username">
+                    <el-input v-model="attributionform.username" placeholder="请输入用户名"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11">
+                  <el-form-item label="密码：" prop="password">
+                    <el-input v-model="attributionform.password" placeholder="请输入密码"></el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+              <template v-if="attributionform.fields.length > 0">
+                <el-col :span="24">
+                  <div>
+                    <h4>配置参数</h4>
+                  </div>
+                </el-col>
+                <el-col :span="11" v-for="(domain, index) in attributionform.fields" :key="domain.index">
+                  <el-form-item :label="domain.label + ':'" :prop="'fields.' + index + '.value'" :rules="{
+                    required: domain.isEdit,
+                    message: domain.label + '不能为空',
+                    trigger: 'blur',
+                  }">
+                    <el-input class="widths1" v-model="domain.value" :type="domain.type"></el-input>
+                  </el-form-item>
+                </el-col>
+              </template>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="授权" name="authorize">
+          <el-tree class="filter-tree" :data="treedata" accordion :props="defaultProps" show-checkbox node-key="id"
+            :filter-node-method="filterNode" :default-checked-keys="treekeys" ref="trees" @check="treechange"
+            :default-expand-all="expandshow">
+          </el-tree>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+    <el-dialog title="产品费用历史记录详情" :visible.sync="productHistoryDetailsDialogVisible" width="70%" :fullscreen="true">
+      <Product-Cost-Form v-if="productHistoryDetailsDialogVisible" :form="dynamicFormArray" :operator="operatorlist"
+        over-size="small" @cancelForm="productHistoryDetailsDialogVisible = false" :disabled="true"></Product-Cost-Form>
+    </el-dialog>
+    <el-dialog title="产品费用历史记录详情" :visible.sync="underwritingRulesHistoryDetailsDialogVisible" width="70%"
+      :fullscreen="true">
+      <Product-Cost-Form v-if="underwritingRulesHistoryDetailsDialogVisible" :form="dynamicFormArray"
+        :operator="operatorlist" over-size="small" @cancelForm="underwritingRulesHistoryDetailsDialogVisible = false"
+        :disabled="true"></Product-Cost-Form>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1243,6 +1466,9 @@ export default {
       pageSize: 20,
       totalSize: null,
       agreementdialogVisible: false, //控制协议对话框显示
+      agreementsHistoryDialogVisible: false,
+      productHistoryDetailsDialogVisible: false,
+      underwritingRulesHistoryDetailsDialogVisible: false,
       VehicleFactorVisible: false, //费用车辆因子    显示/隐藏
       productCostVehicleFactorVisible: false, //产品费用    显示/隐藏
       productCostAddVehicleFactorVisible: false, //产品费用录入    显示/隐藏
@@ -1273,6 +1499,11 @@ export default {
       underwritingRulesAddDialogTitle: "承保规则录入",
       underwritingRulesAddDialogType: "add",
       //协议json
+      agreementsHistoryInfo: {
+        agreement: {},
+        attributionform: {},
+        dept: [],
+      },
       agreement: {
         agreementAbbreviation: "", //协议简称
         agreementCode: "", //协议代码
@@ -1651,6 +1882,7 @@ export default {
       }
     })
     this.agreement.partnerCompaniesId = "";
+
     this.getDicType("agreementType"); //协议类型
     this.getDicType("matchType"); //保单日期类型
     this.getDicType("moneyType"); //佣金发放方式
@@ -1743,12 +1975,36 @@ export default {
         this.queryForm.agreementEndDate = e[1];
       }
     },
-    // 协议历史记录里的详情
-    handleButtonHistory({ row, column }) {
-      this.$api.insCompany.agreementhistoryGetDetail(row.id).then((res) => {
+    // 协议历史记录详情
+    agreementsHistory({ row, column }) {
+      this.dept=[];
+      this.treekeys=[];
+      this.$api.insCompany.agreementhistoryGetDetail(row.batch).then((res) => {
         if (res.code == '200') {
-          let obj = Object.assign({}, res.data);
-          obj.costsAttrLinks.map(val => {
+          this.agreementsHistoryDialogVisible = true;
+          this.agreementsHistoryInfo.agreement = res.data.ptlAgreementHistory;
+          this.agreementsHistoryInfo.attributionform = res.data.ptlAgreementAttributionHistory ? res.data.ptlAgreementAttributionHistory : '{}';
+          if (res.data.deptHistories.length > 0) {
+            res.data.deptHistories.map((ele, index) => {
+              this.dept.push(ele.deptId);
+              return ele;
+            });
+          }
+          this.treekeys = this.dept;
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
+    //产品历史记录详情
+    productHistoryDetails({ row, column }) {
+      this.$api.insCompany.productCostHistoryDetails(row.batch).then((res) => {
+        if (res.code == '200') {
+          let obj = Object.assign({}, res.data.agreementProductCostsNewHistory);
+          obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
                 if (!val.operator) {
@@ -1762,7 +2018,40 @@ export default {
             return val;
           })
           this.$nextTick(() => {
-            this.dynamicFormArray = obj.costsAttrLinks;
+            this.dynamicFormArray = obj.costsAttrLinkList;
+            this.productCostForm = obj;
+          });
+          this.productHistoryDetailsDialogVisible = true;
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+      // this.productHistoryDetailsDialogVisible = true;
+
+    },
+    //承保规则历史记录详情
+    underwritingRulesHistoryDetails({ row, column }) {
+      this.$api.insCompany.undwrtRulesHistoryPageDetails(row.batch).then((res) => {
+        if (res.code == '200') {
+          let obj = Object.assign({}, res.data.agreementUndwrtRulesNewHistory);
+          obj.costsAttrLinkList.map(val => {
+            switch (val.attrType) {
+              case 'inputNumber':
+                if (!val.operator) {
+                  val.operator = '1';
+                }
+                break;
+            }
+            if (val.attrCode == 'LicenseNo') {
+              val.dictLabal = this.areanumberplateList;
+            }
+            return val;
+          })
+          this.$nextTick(() => {
+            this.dynamicFormArray = obj.costsAttrLinkList;
             this.underwritingRulesForm = {
               id: obj.id,
               agreementId: obj.agreementId, //协议id
@@ -1771,9 +2060,6 @@ export default {
               rulesAttrList: [],//规则属性
             };
           });
-          this.underwritingRulesAddDialogType = "edit";
-          this.underwritingRulesAddDialogTitle = "承保规则编辑";
-          this.underwritingRulesAddVehicleFactorVisible = true;
         } else {
           this.$message({
             type: 'error',
@@ -1781,6 +2067,8 @@ export default {
           });
         }
       });
+      this.underwritingRulesHistoryDetailsDialogVisible = true;
+
     },
     getFactorTemplate() {
       this.$api.insCompany.productConfigItem().then(res => {
@@ -1991,9 +2279,9 @@ export default {
     //产品费用复制
     expenseCopy() {
       this.productCostCopyDialogVisible = true;
-      this.productcopyItemPageRequest.agreementId="";
-      this.productcopyItemPageRequest.productCode="";
-      this.productcopyItemResult=[];
+      this.productcopyItemPageRequest.agreementId = "";
+      this.productcopyItemPageRequest.productCode = "";
+      this.productcopyItemResult = [];
 
     },
     //产品编辑
@@ -2316,6 +2604,13 @@ export default {
         this.parentkeys = [];
       }
     },
+    agreementsHistorycloseDialog(){
+      if (this.treekeys.length) {
+        this.$refs.trees.setCheckedKeys([]);
+        this.expandshow = false;
+        this.parentkeys = [];
+      }
+    },
     totalCostRatioInput(total, partial, other) {
       //参数1为总费用，参数2为费用
       let pay1 = this.productCostForm[total]; //总

src/views/FinancialManagement/CarInsurance/DeptSettlement/CommissionList.vue

@@ -1,38 +1,29 @@
 <template>
   <div>
-    <el-form
-      class="queryForm"
-      ref="queryFormRef"
-      :model="queryForm"
-      label-width="80px"
-    >
+    <el-form class="queryForm" ref="queryFormRef" :model="pageRequest" label-width="80px" size="small">
       <el-row style="margin-bottom: 15px">
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="机构名称">
-            <el-input
-              size="small"
-              clearable
-              style="width:220px"
-              placeholder="订单号"
-              v-model="queryForm. deptName"
-            ></el-input>
+            <el-input  clearable style="width:220px" placeholder="请输入机构名称"
+              v-model="pageRequest.deptName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="类型">
+            <el-select style="width: 220px;" clearable v-model="pageRequest.documentary" placeholder="选择类型">
+              <el-option label="提现" value="1"></el-option>
+              <el-option label="收入" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="签单时间">
+            <el-date-picker size="small" v-model="pageRequest.signDate" type="daterange" @change="dateChange"
+              range-separator="至" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
         </el-col>
-          <el-col :span="6">
-            <el-form-item label="签单时间">
-              <el-date-picker 
-                size="small"
-                v-model="queryForm.signDate"
-                type="daterange"
-                @change="dateChange"
-                range-separator="至"
-                value-format="yyyy-MM-dd"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+
         <el-col :span="4">
           <el-form-item label-width="20px">
             <el-button @click="getOrderList" type="primary" size="small">查询</el-button>
@@ -41,18 +32,9 @@
       </el-row>
     </el-form>
 
-    <kt-common-table
-      permsDelete="sys:user:delete"
-      :showBatchDelete="false"
-      :showBatchPrint="true"
-      
-      permsButton3="sys:user:edit"
-      :data="pageResult"
-      :columns="columns"
-      @findPage="findPage"
-      :showOperation="false"
-      @handlePrint="handlePrint"
-    >
+    <kt-common-table permsDelete="sys:user:delete" :showBatchDelete="false" :showBatchPrint="false"
+      permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" :showOperation="false"
+      @handlePrint="handlePrint">
     </kt-common-table>
 
     <!-- <el-dialog
@@ -112,20 +94,22 @@ export default {
       queryForm: {},
       pageResult: {},
       pageRequest: {
+        deptName:"",
+        documentary:"",
         //查询的默认条件
-        pageNum: 1,
+        pageNo: 1,
         pageSize: 10,
       },
       columns: [
         //数据列
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
-        { prop: "amount", label: "金额"},
-        { prop: "surplusAmount", label: "账户剩余金额"},
-        { prop: "documentary", label: "类型"},
+        { prop: "amount", label: "金额" },
+        { prop: "surplusAmount", label: "账户剩余金额" },
+        { prop: "documentary", label: "类型" },
         { prop: "suborder", label: "来源订单" },
         { prop: "remark", label: "备注", },
-        { prop: "createTime", label: "创建时间",  },
+        { prop: "createTime", label: "创建时间", },
       ],
     };
   },
@@ -140,7 +124,7 @@ export default {
     // }
     this.deptAccount();
   },
-  mounted() {},
+  mounted() { },
   methods: {
     handlePrint() {
       this.$api.task.excelExport(this.pageRequest).then((res) => {
@@ -168,13 +152,13 @@ export default {
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
-    dateChange(e){
+    dateChange(e) {
       if (e == null) {
         this.pageRequest.createTimeStart = ''
         this.pageRequest.createTimeEnd = ''
       } else {
-        this.pageRequest.createTimeStart=e[0];
-        this.pageRequest.createTimeEnd=e[1];
+        this.pageRequest.createTimeStart = e[0];
+        this.pageRequest.createTimeEnd = e[1];
       }
     },
     //确认是否关闭对话框
@@ -183,7 +167,7 @@ export default {
         .then((_) => {
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     closeVisible() {
       this.withdrawal = "";
@@ -218,15 +202,22 @@ export default {
       // 获取分页数据
       let that = this;
       if (data && data.pageRequest) {
-        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       that.$api.task
         .sysDeptAccountHistoryPage(that.pageRequest)
         .then((res) => {
-          res.data.content=res.data.records
-          res.data.content.forEach(val=>val.documentary=val.documentary=='1'?'提现':'收入')
-          that.pageResult = res.data;
+          let pageList = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          }
+          pageList.content.forEach(val => val.documentary = val.documentary == '1' ? '提现' : '收入')
+          that.pageResult = pageList;
+
         })
         .then(data != null ? data.callback : "");
     },
@@ -243,12 +234,15 @@ export default {
   margin: 15px 8px;
   height: 110px;
 }
-.basicdata > div {
+
+.basicdata>div {
   height: 100%;
 }
+
 .queryForm .el-row {
   margin: 0px;
 }
+
 .queryForm .el-form-item {
   margin-bottom: 0px;
 }

src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -21,7 +21,7 @@
         </el-row>
       </el-form>
 
-      <kt-common-table :showOperation="false" :showBatchDelete="false" :showBatchPrint="true"  :data="pageResult" :columns="columns" @findPage="findPage" @handlePrint="handlePrint"></kt-common-table>
+      <kt-common-table :showOperation="false" :showBatchDelete="false" :showBatchPrint="false"  :data="pageResult" :columns="columns" @findPage="findPage" @handlePrint="handlePrint"></kt-common-table>
     </el-main>
 
 
@@ -47,7 +47,7 @@
         queryForm: {},
         pageResult: {},
         pageRequest: { //查询的默认条件
-          pageNum: 1,
+          pageNo: 1,
           pageSize: 10,
           status:'1'
         },
@@ -92,7 +92,7 @@
 					a.download = "已提现清单.xlsx";
 					a.click();
 					// 5.释放这个临时的对象url
-					window.URL.revokeObjectURL(url);					
+					window.URL.revokeObjectURL(url);
 			})
 		},
       //-- formatter begin--
@@ -139,13 +139,19 @@
         // 获取分页数据
         let that = this;
         if (data && data.pageRequest) {
-          this.pageRequest.pageNum = data.pageRequest.pageNum;
+          this.pageRequest.pageNo = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
         that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
-            res.data.content= res.data.records
-            that.pageResult = res.data;
+            let pageList = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          }
+          that.pageResult = pageList;
           })
           .then(data != null ? data.callback : "");
       },

src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionList.vue

@@ -24,7 +24,7 @@
         </el-row>
       </el-form>
 
-      <kt-common-table :showOperation="false" :showBatchDelete="false" :showBatchPrint="true"  :data="pageResult" :columns="columns" @findPage="findPage" @handlePrint="handlePrint">
+      <kt-common-table :showOperation="false" :showBatchDelete="false" :showBatchPrint="false"  :data="pageResult" :columns="columns" @findPage="findPage" @handlePrint="handlePrint">
       </kt-common-table>
     </el-main>
 
@@ -53,7 +53,7 @@
         queryForm: {},
         pageResult: {},
         pageRequest: { //查询的默认条件
-          pageNum: 1,
+          pageNo: 1,
           pageSize: 10,
           status:'2'
         },
@@ -62,6 +62,7 @@
           {prop: "deptId",label: "机构代码",},
           {prop: "name",label: "机构名称"},
           {prop: "amount",label: "提现金额"},
+          {prop: "remark",label: "驳回原因"},
           {prop: "createTime",label: "申请时间"}
         ],
         //------------协议下拉框数据   begin-----------------
@@ -107,7 +108,7 @@
 					a.download = "提现中清单.xlsx";
 					a.click();
 					// 5.释放这个临时的对象url
-					window.URL.revokeObjectURL(url);					
+					window.URL.revokeObjectURL(url);
 			})
 		},
       //-- formatter begin--
@@ -154,13 +155,19 @@
         // 获取分页数据
         let that = this;
         if (data && data.pageRequest) {
-          this.pageRequest.pageNum = data.pageRequest.pageNum;
+          this.pageRequest.pageNo = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
         that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
-            res.data.content= res.data.records
-            that.pageResult = res.data;
+            let pageList = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          }
+          that.pageResult = pageList;
           })
           .then(data != null ? data.callback : "");
       },

src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionListExamine.vue

@@ -6,20 +6,22 @@
         <el-row style="margin-bottom: 15px;">
           <el-col :span="8">
             <el-form-item label="录入时间">
-              <el-date-picker  size="small" v-model="queryForm.date"  value-format="yyyy-MM-dd" type="daterange"  @change="dateChange"
-                align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+              <el-date-picker size="small" v-model="queryForm.date" value-format="yyyy-MM-dd" type="daterange"
+                @change="dateChange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-          <el-form-item label-width="20px">
-            <el-button @click="findPage" type="primary" size="small">查询</el-button>
-          </el-form-item>
-        </el-col>
+            <el-form-item label-width="20px">
+              <el-button @click="findPage" type="primary" size="small">查询</el-button>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
-      <kt-common-table :operationWidth="240"  :showBatchDelete="false" :showBatchPrint="true" permsButton3="sys:unsettledCommissionListExamine:audit" :data="pageResult" :columns="columns" @findPage="findPage" button3Name="审核" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
+      <kt-common-table :operationWidth="240" :showBatchDelete="false" :showBatchPrint="false"
+        permsButton3="sys:unsettledCommissionListExamine:audit" :data="pageResult" :columns="columns" @findPage="findPage"
+        button3Name="审核" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
       </kt-common-table>
     </el-main>
 
@@ -27,162 +29,170 @@
   </div>
 </template>
 <script>
-  import Cookies from "js-cookie"
-  import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-  import KtButton from "@/views/Core/KtButton";
-  import CommonUtil from "@/utils/comutil.js";
-  import {
-    formatWithSeperator,
-    format
-  } from "@/utils/datetime.js";
-  export default {
-    components: {
-      KtCommonTable,
-      KtButton
+import Cookies from "js-cookie"
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import KtButton from "@/views/Core/KtButton";
+import CommonUtil from "@/utils/comutil.js";
+import {
+  formatWithSeperator,
+  format
+} from "@/utils/datetime.js";
+export default {
+  components: {
+    KtCommonTable,
+    KtButton
+  },
+  data() {
+    return {
+      peopleid: "",
+      peopledeptid: "",
+
+      // 右侧列表查询数据Start
+      queryForm: {},
+      pageResult: {},
+      pageRequest: { //查询的默认条件
+        pageNo: 1,
+        pageSize: 10,
+        status: '0'
+      },
+      columns: [ //数据列
+        { prop: "id", label: "提现单号", },
+        { prop: "deptId", label: "机构代码", },
+        { prop: "name", label: "机构名称" },
+        { prop: "amount", label: "提现金额" },
+        { prop: "createTime", label: "申请时间" }
+      ],
+      //------------协议下拉框数据   begin-----------------
+      agreementtypeoptions: [], //协议类型
+      //------------协议下拉框数据   end-----------------
+    };
+  },
+  created() {
+    // this.peopleid = Cookies.get('user');
+    // if(this.peopleid!='admin'){
+    //   this.peopledeptid = Cookies.get('user').split('D')[0];
+    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+    // }else{
+    //   this.peopledeptid = '9';
+    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+    // }
+    //获取所有下拉框数据
+    this.getDictItems("agreementtype");
+  },
+  mounted() {
+
+  },
+  methods: {
+    handlePrint() {
+      this.$api.task.excelExport(this.pageRequest).then(res => {
+        console.log(res)
+        let blob = new Blob([res], {
+          type: "application/vnd.ms-excel"
+        }); // 2.获取请求返回的response对象中的blob 设置文件类型，这里以excel为例
+        let url = window.URL.createObjectURL(blob); // 3.创建一个临时的url指向blob对象
+        // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+        let a = document.createElement("a");
+        a.href = url;
+        a.download = "提现中审核清单.xlsx";
+        a.click();
+        // 5.释放这个临时的对象url
+        window.URL.revokeObjectURL(url);
+      })
     },
-    data() {
-      return {
-        peopleid:"",
-        peopledeptid:"",
-
-        // 右侧列表查询数据Start
-        queryForm: {},
-        pageResult: {},
-        pageRequest: { //查询的默认条件
-          pageNum: 1,
-          pageSize: 10,
-          status:'0'
-        },
-        columns: [ //数据列
-          {prop: "id",label: "提现单号",},
-          {prop: "deptId",label: "机构代码",},
-          {prop: "name",label: "机构名称"},
-          {prop: "amount",label: "提现金额"},
-          {prop: "createTime",label: "申请时间"}
-        ],
-        //------------协议下拉框数据   begin-----------------
-        agreementtypeoptions: [], //协议类型
-        //------------协议下拉框数据   end-----------------
-      };
+    //-- formatter begin--
+    agreetypeFormatter(row, column) { //协议类型
+      let agreetype = row.agreetype;
+      return CommonUtil.getDataName({
+        dataList: this.agreementtypeoptions,
+        value: 'value',
+        label: 'label',
+        data: agreetype
+      })
     },
-    created() {
-      // this.peopleid = Cookies.get('user');
-      // if(this.peopleid!='admin'){
-      //   this.peopledeptid = Cookies.get('user').split('D')[0];
-      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      // }else{
-      //   this.peopledeptid = '9';
-      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      // }
-      //获取所有下拉框数据
-      this.getDictItems("agreementtype");
+    inscompanyFormatter(row, column) { //协议类型
+      let inscompany = row.inscompany;
+      return CommonUtil.getDataName({
+        dataList: this.global.insCompanyList,
+        value: 'code',
+        label: 'name',
+        data: inscompany
+      })
     },
-    mounted() {
-
+    totalmoenyFormatter(row, column) { //协议类型
+      let inscompany = row.inscompany;
+      return (row.feeamount + row.disamount).toFixed(2);
     },
-    methods: {
-		handlePrint(){
-			this.$api.task.excelExport(this.pageRequest).then(res=>{
-				console.log(res)
-					let blob = new Blob([res], {
-						type: "application/vnd.ms-excel"
-					}); // 2.获取请求返回的response对象中的blob 设置文件类型，这里以excel为例
-					let url = window.URL.createObjectURL(blob); // 3.创建一个临时的url指向blob对象
-					// 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
-					let a = document.createElement("a");
-					a.href = url;
-					a.download = "提现中审核清单.xlsx";
-					a.click();
-					// 5.释放这个临时的对象url
-					window.URL.revokeObjectURL(url);					
-			})
-		},
-      //-- formatter begin--
-      agreetypeFormatter(row, column) { //协议类型
-        let agreetype = row.agreetype;
-        return CommonUtil.getDataName({
-          dataList: this.agreementtypeoptions,
-          value: 'value',
-          label: 'label',
-          data: agreetype
-        })
-      },
-      inscompanyFormatter(row, column) { //协议类型
-        let inscompany = row.inscompany;
-        return CommonUtil.getDataName({
-          dataList: this.global.insCompanyList,
-          value: 'code',
-          label: 'name',
-          data: inscompany
-        })
-      },
-      totalmoenyFormatter(row, column) { //协议类型
-        let inscompany = row.inscompany;
-        return (row.feeamount + row.disamount).toFixed(2);
-      },
-      //-- formatter end--
+    //-- formatter end--
 
 
-      //--数据字典 begin --
-      getDictItems: function(typeName) {
-        let that = this;
-        that.$api.dict.findByLableName(typeName)
-          .then(function(res) {
-            that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
-          })
-          .catch(function(error) {
-            that[typeName + "options"] = [];
-          });
-      },
-      //--数据字典 end --
-
-      // 右侧列表的方法Start
-      findPage(data) {
-        // 获取分页数据
-        let that = this;
-        if (data && data.pageRequest) {
-          this.pageRequest.pageNum = data.pageRequest.pageNum;
-          this.pageRequest.pageSize = data.pageRequest.pageSize;
-        }
-        that.$api.task.WithdrawqueryStatus(that.pageRequest)
-          .then(res => {
-            res.data.content= res.data.records
-            that.pageResult = res.data;
-          })
-          .then(data != null ? data.callback : "");
-      },
-      dateChange(e){
+    //--数据字典 begin --
+    getDictItems: function (typeName) {
+      let that = this;
+      that.$api.dict.findByLableName(typeName)
+        .then(function (res) {
+          that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
+        })
+        .catch(function (error) {
+          that[typeName + "options"] = [];
+        });
+    },
+    //--数据字典 end --
+
+    // 右侧列表的方法Start
+    findPage(data) {
+      // 获取分页数据
+      let that = this;
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNo = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      }
+      that.$api.task.WithdrawqueryStatus(that.pageRequest)
+        .then(res => {
+          let pageList = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          }
+          that.pageResult = pageList;
+        })
+        .then(data != null ? data.callback : "");
+    },
+    dateChange(e) {
       if (e == null) {
         this.pageRequest.createTimeStart = ''
         this.pageRequest.createTimeEnd = ''
       } else {
-        this.pageRequest.createTimeStart=e[0];
-        this.pageRequest.createTimeEnd=e[1];
+        this.pageRequest.createTimeStart = e[0];
+        this.pageRequest.createTimeEnd = e[1];
       }
     },
-      handleButton3({row,index}) {
-        this.$prompt('是否审核通过，输入驳回原因', '提示', {
-          confirmButtonText: '审核驳回',
-          cancelButtonText: '审核通过',
-          inputPattern: /^.+$/,
-          inputErrorMessage: '输输入驳回原因!'
-        }).then(({ value }) => {
-            this.$api.task.withdraAaudit({...row,status:'2',remark:value}).then(res => {
-            if(res.code==200){
-              this.dialogVisible = false
-              this.findPage(null);
-              this.$message({
-                type: 'success',
-                message: '审核驳回通过'
-              });
-            }
-            else{
-              this.$message.error(res.msg)
-            }
-          });
-        }).catch(() => {
-          this.$api.task.withdraAaudit({...row,status:'1'}).then(res => {
-            if(res.code==200){
+    handleButton3({ row, index }) {
+      this.$prompt('是否审核通过，输入驳回原因', '提示', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '审核驳回',
+        cancelButtonText: '审核通过',
+        inputPattern: /^.+$/,
+        inputErrorMessage: '输输入驳回原因!'
+      }).then(({ value }) => {
+        this.$api.task.withdraAaudit({ ...row, status: '2', remark: value }).then(res => {
+          if (res.code == 200) {
+            this.dialogVisible = false
+            this.findPage(null);
+            this.$message({
+              type: 'success',
+              message: '审核驳回通过'
+            });
+          }
+          else {
+            this.$message.error(res.msg)
+          }
+        });
+      }).catch((action) => {
+        if (action === 'cancel') {
+          this.$api.task.withdraAaudit({ ...row, status: '1' }).then(res => {
+            if (res.code == 200) {
               this.dialogVisible = false
               this.findPage(null);
               this.$message({
@@ -190,52 +200,53 @@
                 message: '审核通过'
               });
             }
-            else{
+            else {
               this.$message.error(res.msg)
             }
           })
-        });
-      },
+        }
+      });
+    },
 
-      // 格式化日期，如月、日、时、分、秒保证为2位数
-      formatNumber(n) {
-       n = n.toString()
-       return n[1] ? n : '0' + n;
-      },
-      // 参数number为毫秒时间戳，format为需要转换成的日期格式
-      formatTime(number, format) {
-       let time = new Date(number)
-       let newArr = []
-       let formatArr = ['Y', 'M', 'D', 'h', 'm', 's']
-       newArr.push(time.getFullYear())
-       newArr.push(this.formatNumber(time.getMonth() + 1))
-       newArr.push(this.formatNumber(time.getDate()))
-
-       newArr.push(this.formatNumber(time.getHours()))
-       newArr.push(this.formatNumber(time.getMinutes()))
-       newArr.push(this.formatNumber(time.getSeconds()))
-
-       for (let i in newArr) {
+    // 格式化日期，如月、日、时、分、秒保证为2位数
+    formatNumber(n) {
+      n = n.toString()
+      return n[1] ? n : '0' + n;
+    },
+    // 参数number为毫秒时间戳，format为需要转换成的日期格式
+    formatTime(number, format) {
+      let time = new Date(number)
+      let newArr = []
+      let formatArr = ['Y', 'M', 'D', 'h', 'm', 's']
+      newArr.push(time.getFullYear())
+      newArr.push(this.formatNumber(time.getMonth() + 1))
+      newArr.push(this.formatNumber(time.getDate()))
+
+      newArr.push(this.formatNumber(time.getHours()))
+      newArr.push(this.formatNumber(time.getMinutes()))
+      newArr.push(this.formatNumber(time.getSeconds()))
+
+      for (let i in newArr) {
         format = format.replace(formatArr[i], newArr[i])
-       }
-       return format;
       }
-
+      return format;
     }
-  };
+
+  }
+};
 </script>
 
 
 <style scoped>
-  .el-divider {
-    margin: 10px 0px 15px !important;
-  }
+.el-divider {
+  margin: 10px 0px 15px !important;
+}
 
-  .queryForm .el-row {
-    margin: 0px;
-  }
+.queryForm .el-row {
+  margin: 0px;
+}
 
-  .queryForm .el-form-item {
-    margin-bottom: 0px;
-  }
+.queryForm .el-form-item {
+  margin-bottom: 0px;
+}
 </style>

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/Source.vue

@@ -306,8 +306,8 @@
         </el-form-item>
         <el-form-item label="应收类型">
           <el-select v-model="createOrUpdateForm.invSourceType" placeholder="请选择应收类型" class="widths">
-            <el-option label="平台" value="platform"></el-option>
-            <el-option label="私有" value="privately"></el-option>
+            <el-option label="含税" value="platform"></el-option>
+            <el-option label="不含税" value="privately"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -646,9 +646,9 @@ export default {
       let invSourceType = row.invSourceType;
       switch (invSourceType) {
         case "platform":
-          return '平台'
+          return '含税'
         case "privately":
-          return '私有'
+          return '不含税'
       }
     },
     Search() {