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

src/http/moudules/expense.js

@@ -267,4 +267,12 @@ export const detailInvAccountIncoice = (id) => {
         url: '/invAccountIncoice/byId/'+id,
         method: "get",
     })
+}
+//开票导出
+export const invAccountExcel = (data) => {
+    return axios({
+        url: '/invAccountIncoice/excel',
+        method: "post",
+        data
+    })
 }

src/http/moudules/task.js

@@ -738,6 +738,14 @@ export const SettlementExport = (data) => {
     data
   })
 }
+//结算表批量修改
+export const SettlementUpdates = (data) => {
+  return axios({
+    url: "/InsReceivable/updateSettlementBatch",
+    method: "post",
+    data
+  })
+}
 //导出应收应付表
 export const excelReceivableAndSettlementExport = (data) => {
   return axios({

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -104,7 +104,7 @@
                   placeholder="单位"
                 >
                   <el-option
-                    v-for="(item, index) in collectionData"
+                    v-for="(item, index) in innerCollectionData"
                     :key="item.accountId + '' + index"
                     :label="item.name"
                     :value="item.bankCardNum"
@@ -377,11 +377,37 @@ export default {
       dialogFormVisible: false, //账户信息弹出框状态
       title: "新增账户信息", //账户信息弹框标题
       expenseDialog: false, //申请单显示状态
-      pageResult: {
+      pageResult: {//表格参数
         pageNo: 1,
         pageSize: 10,
         content: [],
-      }, //表格参数
+      }, 
+      formData: {
+        outerFlag: "0", //账户类别
+        accountName: "", //户名
+        accountQuality: "", //账户性质
+        bankCardNum: "", //银行卡号
+        bank: "", //开户行
+        bankName: "", //开户行名称
+        bankNum: "", //开户行号
+        certExpirationDate: "", //证书有效期
+        clearingProfit: "", //结算卡
+        dayStrokeNum: "", //单日转账笔数限制
+        exteriorProfit: "", //外部过账金额
+        fiscalProfit: "", //财税公司利润
+        insuranceProfit: "", //保险公司回款
+        otherProfit: "", //其他利润
+        parkProfit: "", //园区利润
+        priDayLines: "", //对私单日限额
+        priSingleLines: "", //对私单笔限额
+        priYearExcess: "", //对私年剩余额度
+        priYearLines: "", //对私年额度
+        pubDayLines: "", //对公单日限额
+        pubSingleLines: "", //对公单笔限额
+        pubYearExcess: "", //对公年剩余额度
+        pubYearLines: "", //对公年额度
+        tianqinProfit: "", //天勤利润
+      },
       columns: [
         // 申请列表表格头部
         {
@@ -459,32 +485,6 @@ export default {
           sortable: false,
         },
       ],
-      formData: {
-        outerFlag: "0", //账户类别
-        accountName: "", //户名
-        accountQuality: "", //账户性质
-        bankCardNum: "", //银行卡号
-        bank: "", //开户行
-        bankName: "", //开户行名称
-        bankNum: "", //开户行号
-        certExpirationDate: "", //证书有效期
-        clearingProfit: "", //结算卡
-        dayStrokeNum: "", //单日转账笔数限制
-        exteriorProfit: "", //外部过账金额
-        fiscalProfit: "", //财税公司利润
-        insuranceProfit: "", //保险公司回款
-        otherProfit: "", //其他利润
-        parkProfit: "", //园区利润
-        priDayLines: "", //对私单日限额
-        priSingleLines: "", //对私单笔限额
-        priYearExcess: "", //对私年剩余额度
-        priYearLines: "", //对私年额度
-        pubDayLines: "", //对公单日限额
-        pubSingleLines: "", //对公单笔限额
-        pubYearExcess: "", //对公年剩余额度
-        pubYearLines: "", //对公年额度
-        tianqinProfit: "", //天勤利润
-      },
       pickerOptions: {
         //日期快捷键
         disabledDate(time) {
@@ -515,23 +515,10 @@ export default {
           },
         ],
       },
-      //新增申请表单form表单
-      tableForm: {
-        company: "", //单位
-        applicant: "", //申请人
-        applySector: "", //申请部门
-        applyTime: "", //申请日期
-        collectionMessage: "", //收款单位信息
-        fundFlow: "", //资金流程
-        fundUse: "", //资金用途
-        remark: "", //备注
-        applyAmount: "", //申请金额
-        bigApplyAmount: "", //大写金额
-        payMethod: [], //支付方式
-      },
       payment_methodsData: [], //支付方式字典数据
       use_fundsData: [], //备注字典数据
       collectionData: [], //收款单位信息数据
+      innerCollectionData: [], //内部账户单位信息数据
       account_qualityData: [], //账户性质字典
       fundFlowData: [], //资金用途字典数据
       tableRules: {
@@ -576,6 +563,20 @@ export default {
       collectionMessageItem: {}, //选择收款单位整条数据
       expendDataId: "", //修改时该条数据id
       buttonValue: "导 出", //弹框提交按钮内容
+      //新增申请表单form表单
+      tableForm: {
+        company: "", //单位
+        applicant: "", //申请人
+        applySector: "", //申请部门
+        applyTime: "", //申请日期
+        collectionMessage: "", //收款单位信息
+        fundFlow: "", //资金流程
+        fundUse: "", //资金用途
+        remark: "", //备注
+        applyAmount: "", //申请金额
+        bigApplyAmount: "", //大写金额
+        payMethod: [], //支付方式
+      },
     };
   },
   watch: {
@@ -612,7 +613,7 @@ export default {
   methods: {
     //导出
     expendDataup(idList) {
-      if (this.expendDataId) {
+      if (this.expendDataId) { //编辑查看直接导出
         let url = process.env.BASE_URL + "/upload/" + this.tableForm.uplodePath; // 3.创建一个临时的url指向blob对象
         // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
         let a = document.createElement("a");
@@ -623,7 +624,7 @@ export default {
         window.URL.revokeObjectURL(url);
         this.resetForm();
         this.findPage();
-      } else {
+      } else { //新增并导出
         this.$api.expense.excel(idList).then((response) => {
           if (response.code == 200) {
             response.data.forEach((data) => {
@@ -845,6 +846,7 @@ export default {
       this.$api.expense.getAccountByAccountName().then((res) => {
         if (res.code == 200) {
           let arr = [];
+          let newarr = []
           res.data.forEach((item, index) => {
             if (item.invAccountCardList != null) {
               item.invAccountCardList.forEach((it) => {
@@ -862,8 +864,13 @@ export default {
                   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
               arr.push(...item.invAccountCardList);
+              //获取全部内部用户
+              if(item.outerFlag == 0){
+                newarr.push(...item.invAccountCardList)
+              }
             }
           });
+          this.innerCollectionData = newarr;
           this.collectionData = arr;
         }
       });

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -332,7 +332,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-select v-model="inComeFormData.remark" allow-create filterable placeholder="">
+              <el-select
+                v-model="inComeFormData.remark"
+                allow-create
+                filterable
+                placeholder=""
+              >
                 <el-option
                   v-for="item in use_fundsData"
                   :key="item.value"
@@ -390,7 +395,7 @@ export default {
     this.business("use_funds"); //备注字典
     this.business("payment_methods"); //支付方式字典
     this.business("nature_business"); //营业性质字典
-    this.getTreeList();//获取资金用途字典
+    this.getTreeList(); //获取资金用途字典
   },
   mounted() {},
   data() {
@@ -413,7 +418,7 @@ export default {
         remark: "", //备注
         company: "", //转账方
         payMethod: [], //转账方
-        fundUse:'',//资金用途
+        fundUse: "", //资金用途
       },
       inComeFormRules: {
         //收入规则
@@ -674,7 +679,7 @@ export default {
         juridicalPerson: "", //法人
         owned: "", //所属地
         biller: "", //开票员
-        tentativeEstimates: '', //暂估值
+        tentativeEstimates: "", //暂估值
       },
       //账户卡信息form
       accountCardFormData: {
@@ -1088,7 +1093,7 @@ export default {
           // invoicingAmountExcess:0,//剩余开票额度
           juridicalPerson: "", //法人
           owned: "", //所属地
-          tentativeEstimates: '', //暂估值
+          tentativeEstimates: "", //暂估值
         };
       } else {
         this.accountCardFormData = {
@@ -1135,10 +1140,19 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            res.data[0].certExpirationDate = [
-              res.data[0].startCertExpirationDate,
-              res.data[0].endCertExpirationDate,
-            ];
+            if (
+              res.data[0].startCertExpirationDate &&
+              res.data[0].startCertExpirationDate != null &&
+              res.data[0].endCertExpirationDate &&
+              res.data[0].endCertExpirationDate != null
+            ) {
+              res.data[0].certExpirationDate = [
+                res.data[0].startCertExpirationDate,
+                res.data[0].endCertExpirationDate,
+              ];
+            }else{
+              res.data[0].certExpirationDate = [];
+            }
             this.accountCardFormData = res.data[0];
             this.accountCardFormData.outerFlag = row.outerFlag;
             this.dialogFormVisible = true;

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -69,9 +69,16 @@
         @click="addPayment"
         >开票新增</el-button
       >
-      <!-- <el-button  size="medium" @click="look=!look">查看合计</el-button> -->
+      <el-button
+        class="operation"
+        type="primary"
+        plain
+        size="medium"
+        @click="expentData"
+        >导出</el-button
+      >
       <!-- 合计 -->
-      <div v-show="look" style="margin-top: 20px">
+      <div style="margin-top: 20px">
         <el-descriptions title="" size="mini" border>
           <el-descriptions-item label="开票金额总和">{{
             allNumObj.invoiceMoneySum
@@ -181,7 +188,7 @@
                 <el-form-item label="开票金额" prop="invoiceMoney">
                   <el-input-number
                     v-model="formData.invoiceMoney"
-                    :min="0"
+                    :min="1"
                     :max="99999999999999999"
                     label=""
                   ></el-input-number>
@@ -200,26 +207,16 @@
                 </el-form-item>
               </el-col>
               <el-col class="invoic" :span="12">
-                <el-form-item label="开票科目" prop="invoiceSubjects">
+                <el-form-item label="开票科目" prop="invoiceSubjectsValue">
                   <el-input
                     v-model="formData.invoiceSubjects1"
                     autocomplete="off"
                   ></el-input>
+                  <span>*</span>
                   <el-input
                     v-model="formData.invoiceSubjects2"
                     autocomplete="off"
                   ></el-input>
-                  <!-- <el-select
-                  v-model="formData.invoiceSubjects"
-                  placeholder="请选择开票科目"
-                >
-                  <el-option
-                    v-for="(item, index) in subjectsData"
-                    :key="index + 'kpkm'"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select> -->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -272,29 +269,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="进账日期" prop="payoutTime">
-                  <el-date-picker
-                    v-model="formData.payoutTime"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="税率(%)" prop="rate">
                   <el-input-number
                     v-model="formData.rate"
                     :min="0"
-                    :max="99999999999999999"
+                    :max="60"
                     label=""
                   ></el-input-number>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="备注" prop="remark">
                   <el-select
@@ -321,12 +307,25 @@
                 <el-form-item label="进账金额" prop="payoutMoney">
                   <el-input-number
                     v-model="formData.payoutMoney"
-                    :min="0"
+                    :min="1"
                     :max="99999999999999999"
                     label=""
                   ></el-input-number>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="进账日期" prop="payoutTime">
+                  <el-date-picker
+                    v-model="formData.payoutTime"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="支付方式" prop="payMethod">
                   <el-select
@@ -344,8 +343,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="资金用途" prop="fundUse">
                   <el-cascader
@@ -382,7 +379,7 @@
         <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-import { toChies } from "../../../utils/moneyTransition";
+import { toChies } from "../../../utils/moneyTransition"; //金额小写转大写
 
 export default {
   name: "InvoiceInformation",
@@ -398,8 +395,15 @@ export default {
     this.getAllUser();
   },
   data() {
+    let invoiceSubjectsRules = (rule, value, callback) => {
+      console.log(this.formData.invoiceSubjects1);
+      if (!this.formData.invoiceSubjects1 || !this.formData.invoiceSubjects2) {
+        callback(new Error("开票科目不能为空！"));
+      } else {
+        callback();
+      }
+    };
     return {
-      look:true,
       allNumObj: {}, //合计对象
       subjectsData: [], //开票科目数据
       invoice_typeData: [], //发票类型数据
@@ -532,8 +536,8 @@ export default {
         invoiceSubjects1: [
           { required: true, message: "开票科目不能为空", trigger: "change" },
         ],
-        invoiceSubjects2: [
-          { required: true, message: "开票科目不能为空", trigger: "change" },
+        invoiceSubjectsValue: [
+          { validator: invoiceSubjectsRules, trigger: "blur" },
         ],
         invoiceType: [
           { required: true, message: "请选择发票类型", trigger: "blur" },
@@ -599,6 +603,29 @@ export default {
     },
   },
   methods: {
+    //导出开票记录
+    expentData() {
+      let params = {
+       ...JSON.parse(JSON.stringify(this.pageRequest))
+      };
+      delete params.pageNo;
+      delete params.pageSize;
+      this.$api.expense.invAccountExcel(params).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          let url = process.env.BASE_URL + "/upload/" + res.data; // 3.创建一个临时的url指向blob对象
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "导出订单.xlsx";
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
     //获取资金用途树数据
     getTreeList() {
       this.$api.expense.getAccountExpensesTreeList().then((res) => {
@@ -697,6 +724,7 @@ export default {
                 params.otherUnit + "→" + this.formData.invoiceBy.nameValue, //资金流向
               payMethod: params.payMethod.join(","), //支付方式
               fundUse: params.fundUse[params.fundUse.length - 1], //资金用途
+              payoutTime: params.payoutTime, //进账日期
             };
             this.$api.expense.putInvAccountIncoice(obj).then((res) => {
               if (res.code == 200) {
@@ -713,6 +741,8 @@ export default {
               params.invoiceSubjects1 + "*" + params.invoiceSubjects2; //开票科目
             params.otherUnit = params.otherUnit.nameValue; //对方单位名称
             params.company = params.otherUnit; //单位
+            delete params.payMethod;
+            delete params.payoutTime;
             this.$api.expense.addInvAccountIncoice(params).then((res) => {
               if (res.code == 200) {
                 this.detailDialog = false;
@@ -925,7 +955,7 @@ export default {
   width: 100%;
 }
 .invoic >>> .el-input {
-  width: auto;
+  width: 45%;
 }
 </style>
         

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

@@ -28,7 +28,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="被保人">
               <el-input
@@ -49,6 +48,48 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="险种">
+              <el-input
+                v-model="pageRequest.insuranceType"
+                placeholder="请输入险种"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="交强保单号：">
+              <el-input
+                v-model="pageRequest.jqPolicyId"
+                placeholder="请输入交强保单号"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="商业保单号：">
+              <el-input
+                v-model="pageRequest.syPolicyId"
+                placeholder="请输入商业保单号"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="非车保单号：">
+              <el-input
+                v-model="pageRequest.nonCarPolicyId"
+                placeholder="请输入非车保单号"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="运营团队">
               <el-input
@@ -60,8 +101,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结算状态">
-              <el-select v-model="pageRequest.clearingState" placeholder="请选择状态" class="widths">
+            <el-form-item label="保司机构">
+              <el-input
+                v-model="pageRequest.insuranceDept"
+                placeholder="请输入保司机构"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="渠道结算状态">
+              <el-select
+                v-model="pageRequest.clearingState"
+                placeholder="请选择状态"
+                class="widths"
+              >
                 <el-option label="未结算" value="0"></el-option>
                 <el-option label="已结算" value="1"></el-option>
               </el-select>
@@ -69,7 +124,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="保司结算状态">
-              <el-select v-model="pageRequest.insuranceClearingState" placeholder="请选择状态" class="widths">
+              <el-select
+                v-model="pageRequest.insuranceClearingState"
+                placeholder="请选择状态"
+                class="widths"
+              >
                 <el-option label="未结算" value="0"></el-option>
                 <el-option label="已结算" value="1"></el-option>
               </el-select>
@@ -182,82 +241,95 @@ export default {
         channel: "", //渠道
         channelClassification: "", //渠道分类
         clearingState: "", //结算状态
-        insuranceClearingState:"",//保司结算状态
-        insuranceDeptId:"",//
+        insuranceClearingState: "", //保司结算状态
+        insuranceDeptId: "", //
         insuranceId: "", //保险公司
         insuredName: "",
         licenseNo: "",
         operationsTeam: "",
+        insuranceType: "",
+        insuranceDept: "",
+        jqPolicyId: "",
+        syPolicyId: "",
+        nonCarPolicyId: "",
       },
       // 右侧列表查询数据Start
       pageResult: [],
       columns: [
         //数据列
-        { prop: "operationsTeam", label: "运营团队", minWidth: 160 },
-        { prop: "channelClassification", label: "渠道分类", minWidth: 160 },
-        { prop: "signDate", label: "签约日期", minWidth: 160 },
+        { prop: "operationsTeam", label: "运营团队", minWidth: 100 },
+        { prop: "channelClassification", label: "渠道分类", minWidth: 100 },
+        { prop: "signDate", label: "签单日期", minWidth: 160 },
         { prop: "channel", label: "渠道", minWidth: 100 },
-        { prop: "licenseNo", label: "车牌号", minWidth: 160 },
+        { prop: "licenseNo", label: "车牌号", minWidth: 100 },
         { prop: "insuredName", label: "被保险人", minWidth: 160 },
-        { prop: "insuranceId", label: "保司编码", minWidth: 160 },
-        { prop: "insuranceCompany", label: "保司名称", minWidth: 160 },
+        { prop: "insuranceId", label: "保司编码", minWidth: 140 },
+        { prop: "insuranceCompany", label: "保司名称", minWidth: 180 },
         { prop: "insuranceDeptId", label: "保司机构代码", minWidth: 160 },
-        { prop: "insuranceDept", label: "保司机构", minWidth: 160 },
-        { prop: "insuranceType", label: "险种", minWidth: 160 },
-        { prop: "businessOwner", label: "业务归属", minWidth: 160 },
-        { prop: "jqPolicyId", label: "交强保单号", minWidth: 160 },
+        { prop: "insuranceDept", label: "保司机构", minWidth: 120 },
+        { prop: "insuranceType", label: "险种", minWidth: 120 },
+        { prop: "businessOwner", label: "业务归属", minWidth: 120 },
+        { prop: "jqPolicyId", label: "交强保单号", minWidth: 180 },
         { prop: "jqPremiumTax", label: "交强险保费", minWidth: 160 },
         { prop: "jqPremium", label: "交强险不含税保费", minWidth: 160 },
-        { prop: "syPolicyId", label: "商业保单号", minWidth: 160 },
+        { prop: "syPolicyId", label: "商业保单号", minWidth: 180 },
         { prop: "syPremiumTax", label: "商业险保费", minWidth: 160 },
         { prop: "syPremium", label: "商业险不含税保费", minWidth: 160 },
-        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 160 },
+        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 180 },
         { prop: "nonCarPremiumTax", label: "非车险保费", minWidth: 160 },
         { prop: "nonCarPremium", label: "非车险不含税保费", minWidth: 160 },
         { prop: "agencySettlementTime", label: "代理结算时间", minWidth: 160 },
-        { prop: "taxAmount", label: "车船税", minWidth: 160 },
-        { prop: "jqReceivableRatio", label: "交强险应收比例", minWidth: 160 },
-        { prop: "jqPremiumRatio", label: "交强险手续费比例", minWidth: 160 },
-        { prop: "jqNonCopyingRatio", label: "交强险非跟单比例", minWidth: 160 },
-        { prop: "syReceivableRatio", label: "商业险应收比例", minWidth: 160 },
-        { prop: "syPremiumRatio", label: "商业险手续费比例", minWidth: 160 },
-        { prop: "syNonCopyingRatio", label: "商业险非跟单比例", minWidth: 160 },
+        { prop: "taxAmount", label: "车船税", minWidth: 140 },
+        { prop: "jqReceivableRatio", label: "交强险应收比例", minWidth: 140 },
+        { prop: "jqPremiumRatio", label: "交强险手续费比例", minWidth: 140 },
+        { prop: "jqNonCopyingRatio", label: "交强险非跟单比例", minWidth: 140 },
+        { prop: "syReceivableRatio", label: "商业险应收比例", minWidth: 140 },
+        { prop: "syPremiumRatio", label: "商业险手续费比例", minWidth: 140 },
+        { prop: "syNonCopyingRatio", label: "商业险非跟单比例", minWidth: 140 },
         {
           prop: "nonCarReceivableRatio",
           label: "非车险应收比例",
-          minWidth: 160,
+          minWidth: 140,
+        },
+        {
+          prop: "nonCarPremiumRatio",
+          label: "非车险手续费比例",
+          minWidth: 140,
         },
-        { prop: "nonCarPremiumRatio", label: "非车险手续费比例", minWidth: 160 },
         {
           prop: "nonCarNonCopyingRatio",
           label: "非车险非跟单比例",
-          minWidth: 160,
+          minWidth: 140,
         },
-        { prop: "premium", label: "手续费金额", minWidth: 160 },
-        { prop: "nonCopying", label: "非跟单金额", minWidth: 160 },
-        { prop: "receivable", label: "应收", minWidth: 160 },
-        { prop: "subsidyRatio", label: "补贴比例", minWidth: 160 },
-        { prop: "subsidyAmount", label: "补贴金额", minWidth: 160 },
+        { prop: "premium", label: "手续费金额", minWidth: 140 },
+        { prop: "nonCopying", label: "非跟单金额", minWidth: 140 },
+        { prop: "receivable", label: "应收", minWidth: 140 },
+        { prop: "subsidyRatio", label: "补贴比例", minWidth: 140 },
+        { prop: "subsidyAmount", label: "补贴金额", minWidth: 140 },
         {
           prop: "maxJqReceivableRatio",
           label: "最大交强险应付比例",
-          minWidth: 160,
+          minWidth: 140,
         },
         {
           prop: "maxSyReceivableRatio",
           label: "最大商业险应付比例",
-          minWidth: 160,
+          minWidth: 140,
         },
         {
           prop: "maxNonCarReceivableRatio",
           label: "最大非车险应付比例",
-          minWidth: 160,
+          minWidth: 140,
+        },
+        { prop: "maxReceivable", label: "最大应付金额", minWidth: 140 },
+        { prop: "totalReceivableAmount", label: "总应收金额", minWidth: 140 },
+        { prop: "settlementAmount", label: "结算金额", minWidth: 140 },
+        { prop: "clearingState", label: "结算状态", minWidth: 140 },
+        {
+          prop: "insuranceClearingState",
+          label: "保司结算状态",
+          minWidth: 140,
         },
-        { prop: "maxReceivable", label: "最大应付金额", minWidth: 160 },
-        { prop: "totalReceivableAmount", label: "总应收金额", minWidth: 160 },
-        { prop: "settlementAmount", label: "结算金额", minWidth: 160 },
-        { prop: "clearingState", label: "结算状态", minWidth: 160 },
-        { prop: "insuranceClearingState", label: "保司结算状态", minWidth: 160 },
       ],
       row: {},
       companyList: [],
@@ -269,12 +341,22 @@ export default {
   mounted() {},
   methods: {
     clearingTimeChange(e) {
-      this.pageRequest.agencySettlementTimeStartTime = e[0];
-      this.pageRequest.agencySettlementTimeEndTime = e[1];
+      if (e == null) {
+        this.pageRequest.agencySettlementTimeStartTime = "";
+        this.pageRequest.agencySettlementTimeEndTime = "";
+      } else {
+        this.pageRequest.agencySettlementTimeStartTime = e[0];
+        this.pageRequest.agencySettlementTimeEndTime = e[1];
+      }
     },
     signDateTimeChange(e) {
-      this.pageRequest.signDateStartTime = e[0];
-      this.pageRequest.signDateEndTime = e[1];
+      if (e == null) {
+        this.pageRequest.signDateStartTime = "";
+        this.pageRequest.signDateEndTime = "";
+      } else {
+        this.pageRequest.signDateStartTime = e[0];
+        this.pageRequest.signDateEndTime = e[1];
+      }
     },
     //保险公司查询
     companyInt() {
@@ -336,16 +418,18 @@ export default {
       });
     },
     handlePrint() {
-      this.$api.task.excelReceivableAndSettlementExport(this.pageRequest).then((res) => {
-        let url = process.env.BASE_URL + res.msg;
-        // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
-        let a = document.createElement("a");
-        a.href = url;
-        a.download = "应收应付表.xlsx";
-        a.click();
-        // 5.释放这个临时的对象url
-        window.URL.revokeObjectURL(url);
-      });
+      this.$api.task
+        .excelReceivableAndSettlementExport(this.pageRequest)
+        .then((res) => {
+          let url = process.env.BASE_URL + res.msg;
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "应收应付表.xlsx";
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+        });
     },
     //联级选择器触发事件
     handleChange(val) {

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

@@ -76,6 +76,54 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="渠道：">
+              <el-input
+                v-model="pageRequest.channel"
+                placeholder="请输入渠道"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="渠道等级：">
+              <el-input
+                v-model="pageRequest.channelClassification"
+                placeholder="请输入渠道等级"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="被保险人：">
+              <el-input
+                v-model="pageRequest.insuredName"
+                placeholder="请输入被保险人"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结算时间：">
+              <el-date-picker
+                v-model="agencySettlementTime"
+                type="daterange"
+                @change="agencySettlementTimeChange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                class="widths"
+                value-format="yyyy-MM-dd"
+                style="width: 220px"
+                clearable
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="签单日期">
               <el-date-picker
@@ -120,7 +168,7 @@
         :showOperation="true"
         permsDelete="sys:user:delete"
         :showBatchDelete="false"
-        :showBatchSettled="false"
+        :showBatchSettled="true"
         :showBatchPrint="true"
         permsButton1="sys:user:edit"
         permsButton2="sys:user:edit"
@@ -128,8 +176,8 @@
         :data="pageResult"
         :columns="columns"
         @findPage="findPage"
-        keyName="policyno"
-        settledName="批量生成"
+        keyName="id"
+        settledName="批量修改"
         @handleSettled="handleTableSettled"
         @handlePrint="handlePrint"
         button1Name="修改"
@@ -233,6 +281,51 @@
         >
       </div>
     </el-dialog>
+    <el-dialog title="批量修改" :visible.sync="dialogUpdateVisible" width="60%">
+      <el-form
+        :model="batchSizeForm"
+        :inline="true"
+        label-width="130px"
+        size="small"
+      >
+        <el-form-item label="业务归属：">
+          <el-input
+            v-model="batchSizeForm.businessOwner"
+            autocomplete="off"
+            class="widths"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="交强出口比例：">
+          <el-input
+            v-model="batchSizeForm.compulsoryExportRatio"
+            autocomplete="off"
+            class="widths"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="商业出口比例：">
+          <el-input
+            v-model="batchSizeForm.commercialExportRatio"
+            autocomplete="off"
+            class="widths"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="非车出口比例：">
+          <el-input
+            v-model="batchSizeForm.nonVehicleExportRatio"
+            autocomplete="off"
+            class="widths"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogUpdateVisible = false"
+          >取 消</el-button
+        >
+        <el-button size="small" type="primary" @click="BulkUpdate"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -247,6 +340,7 @@ export default {
   data() {
     return {
       signDateTime: [],
+      agencySettlementTime:[],
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
@@ -258,9 +352,14 @@ export default {
         jqPolicyId: "",
         syPolicyId: "",
         nonCarPolicyId: "",
+        channel:"",
+        channelClassification:"",
+        insuredName:"",
+        agencySettlementTime:"",
       },
       // 右侧列表查询数据Start
       dialogFormVisible: false,
+      dialogUpdateVisible:false,
       pageResult: [],
       updateform: {
         channel: "",
@@ -275,34 +374,43 @@ export default {
         commercialExportRatio: "",
         nonVehicleExportRatio: "",
       },
+      batchSizeForm:{
+        businessOwner:"",
+        compulsoryExportRatio:"",
+        commercialExportRatio:"",
+        nonVehicleExportRatio:"",
+      },
+      batchSizeList:[],
       columns: [
         //数据列
         { prop: "id", label: " 编号", minWidth: 160 },
-        { prop: "operationsTeam", label: "运营小组", minWidth: 160 },
-        { prop: "channelClassification", label: "渠道分级", minWidth: 160 },
-        { prop: "channel", label: "渠道", minWidth: 160 },
+        { prop: "operationsTeam", label: "运营小组", minWidth: 100 },
+        { prop: "channelClassification", label: "渠道分级", minWidth: 100 },
+        { prop: "channel", label: "渠道", minWidth: 120 },
         { prop: "employeeId", label: "工号", minWidth: 160 },
         { prop: "signDate", label: "签单日期", minWidth: 160 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
         { prop: "insuredName", label: "被保险人", minWidth: 100 },
-        { prop: "insuranceCompany", label: "保险公司", minWidth: 160 },
-        { prop: "insuranceType", label: "险种", minWidth: 160 },
-        { prop: "businessOwner", label: "业务归属", minWidth: 160 },
+        { prop: "insuranceCompany", label: "保险公司", minWidth: 120 },
+        { prop: "insuranceType", label: "险种", minWidth: 120 },
+        { prop: "businessOwner", label: "业务归属", minWidth: 120 },
         {
           prop: "jqPolicyId",
           label: "交强保单号",
-          minWidth: 160,
+          minWidth: 180,
         },
-        { prop: "syPolicyId", label: "商业保单号", minWidth: 160 },
-        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 160 },
-        { prop: "jqPremiumTax", label: "交强保费", minWidth: 160 },
-        { prop: "vehicleTax", label: "车船税", minWidth: 160 },
-        { prop: "syPremiumTax", label: "商业保费", minWidth: 160 },
-        { prop: "nonCarPremiumTax", label: "非车保费", minWidth: 160 },
-        { prop: "compulsoryExportRatio", label: "交强出口比例", minWidth: 160 },
-        { prop: "commercialExportRatio", label: "商业出口比例", minWidth: 160 },
-        { prop: "nonVehicleExportRatio", label: "非车出口比例", minWidth: 160 },
-        { prop: "settlementAmount", label: "结算金额", minWidth: 160 },
+        { prop: "syPolicyId", label: "商业保单号", minWidth: 180 },
+        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 180 },
+        { prop: "jqPremiumTax", label: "交强保费", minWidth: 140 },
+        { prop: "vehicleTax", label: "车船税", minWidth: 140 },
+        { prop: "syPremiumTax", label: "商业保费", minWidth: 140 },
+        { prop: "nonCarPremiumTax", label: "非车保费", minWidth: 140 },
+        { prop: "compulsoryExportRatio", label: "交强出口比例", minWidth: 140 },
+        { prop: "commercialExportRatio", label: "商业出口比例", minWidth: 140 },
+        { prop: "nonVehicleExportRatio", label: "非车出口比例", minWidth: 140 },
+        { prop: "subsidyRatio", label: "补贴比例", minWidth: 140 },
+        { prop: "subsidyAmount", label: "补贴金额", minWidth: 140 },
+        { prop: "settlementAmount", label: "结算金额", minWidth: 140 },
         { prop: "agencySettlementTime", label: "代理结算时间", minWidth: 160 },
       ],
       companyList: [],
@@ -314,7 +422,20 @@ export default {
   mounted() {},
   methods: {
     signDateChange(e) {
-      this.pageRequest.signDate = e.toString();
+      if (e == null) {
+        this.pageRequest.signDate = "";
+      }else{
+        this.pageRequest.signDate = e.toString();
+      }
+    },
+    agencySettlementTimeChange(e){
+      if (e == null) {
+        this.pageRequest.agencySettlementTime = "";
+
+      }else{
+        this.pageRequest.agencySettlementTime = e.toString();
+      }
+
     },
     //保险公司查询
     companyInt() {
@@ -349,8 +470,35 @@ export default {
       });
     },
     handleTableSettled(ids) {
-      this.plyNoList = ids;
-      this.dialogVisible11 = true;
+      this.batchSizeList = ids;
+      Object.keys(this.batchSizeForm).forEach((key) => {
+        this.batchSizeForm[key] = "";
+      });
+      this.dialogUpdateVisible=true;
+    },
+    BulkUpdate() {
+      let params = {
+        ids: this.batchSizeList,
+        businessOwner: this.batchSizeForm.businessOwner,
+        compulsoryExportRatio: this.batchSizeForm.compulsoryExportRatio,
+        commercialExportRatio: this.batchSizeForm.commercialExportRatio,
+        nonVehicleExportRatio: this.batchSizeForm.nonVehicleExportRatio,
+      };
+      this.$api.task.SettlementUpdates(params).then((res) => {
+        if (res.code == "200") {
+          this.$message({
+            type: "success",
+            message: "修改成功!",
+          });
+          this.dialogUpdateVisible = false;
+          this.findPage();
+        } else {
+          this.$message({
+            type: "error",
+            message: res.msg,
+          });
+        }
+      });
     },
     sourceUpdate({ row, column }) {
       this.dialogFormVisible = true;

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

@@ -45,6 +45,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="保司机构">
+              <el-input
+                v-model="pageRequest.insuranceDept"
+                placeholder="请输入保司机构"
+                class="widths"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="被保险人">
               <el-input
@@ -86,6 +96,18 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="保司结算状态">
+              <el-select
+                v-model="pageRequest.insuranceClearingState"
+                placeholder="请选择状态"
+                class="widths"
+              >
+                <el-option label="未结算" value="0"></el-option>
+                <el-option label="已结算" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="交强保单号">
               <el-input
@@ -116,18 +138,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="保司结算状态">
-              <el-select
-                v-model="pageRequest.insuranceClearingState"
-                placeholder="请选择状态"
-                class="widths"
-              >
-                <el-option label="未结算" value="0"></el-option>
-                <el-option label="已结算" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div class="flex j-end" style="margin-right: 100px">
@@ -313,6 +323,7 @@ export default {
         syPolicyId: "", //商业保单号
         nonCarPolicyId: "", //非车保单号
         insuranceClearingState: "",
+        insuranceDept: "", //保司机构
       },
       dialogUpdateVisible: false,
       dialogFormVisible: false,
@@ -336,73 +347,73 @@ export default {
       columns: [
         //数据列
         { prop: "id", label: " 编号", minWidth: 160 },
-        { prop: "insuranceId", label: "保司编码", minWidth: 160 },
-        { prop: "insuranceName", label: "保司名称", minWidth: 160 },
-        { prop: "insuranceDept", label: "保司机构", minWidth: 160 },
+        { prop: "insuranceId", label: "保司编码", minWidth: 120 },
+        { prop: "insuranceName", label: "保司名称", minWidth: 180 },
+        { prop: "insuranceDept", label: "保司机构", minWidth: 100 },
         { prop: "insuranceDeptId", label: "保司机构代码", minWidth: 100 },
-        { prop: "risk", label: "险种", minWidth: 160 },
-        { prop: "jqPolicyId", label: "交强保单号", minWidth: 160 },
-        { prop: "jqPremiumTax", label: "交强险保费", minWidth: 160 },
+        { prop: "risk", label: "险种", minWidth: 100 },
+        { prop: "jqPolicyId", label: "交强保单号", minWidth: 180 },
+        { prop: "jqPremiumTax", label: "交强险保费", minWidth: 140 },
         {
           prop: "jqPremium",
           label: "交强险不含税保费",
-          minWidth: 160,
+          minWidth: 140,
         },
-        { prop: "syPolicyId", label: "商业保单号", minWidth: 160 },
-        { prop: "syPremiumTax", label: "商业险保费", minWidth: 160 },
-        { prop: "syPremium", label: "商业险不含税保费", minWidth: 160 },
-        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 160 },
-        { prop: "nonCarPremiumTax", label: "非车保费", minWidth: 160 },
-        { prop: "nonCarPremium", label: "非车险不含税保费", minWidth: 160 },
-        { prop: "insuredName", label: "被保险人", minWidth: 160 },
-        { prop: "licenseno", label: "车牌号", minWidth: 160 },
+        { prop: "syPolicyId", label: "商业保单号", minWidth: 180 },
+        { prop: "syPremiumTax", label: "商业险保费", minWidth: 140 },
+        { prop: "syPremium", label: "商业险不含税保费", minWidth: 140 },
+        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 180 },
+        { prop: "nonCarPremiumTax", label: "非车保费", minWidth: 140 },
+        { prop: "nonCarPremium", label: "非车险不含税保费", minWidth: 140 },
+        { prop: "insuredName", label: "被保险人", minWidth: 100 },
+        { prop: "licenseno", label: "车牌号", minWidth: 120 },
         { prop: "signingTime", label: "出单日期", minWidth: 160 },
         { prop: "clearingTime", label: "结算日期", minWidth: 160 },
-        { prop: "taxamount", label: "车船税", minWidth: 160 },
-        { prop: "jqReceivableRatio", label: "交强应收比例", minWidth: 160 },
-        { prop: "jqPremiumRatio", label: "交强手续费比例", minWidth: 160 },
-        { prop: "jqNonCopyingRatio", label: "交强非跟单比例", minWidth: 160 },
-        { prop: "syReceivableRatio", label: "商业应收比例", minWidth: 160 },
-        { prop: "syPremiumRatio", label: "商业手续费比例", minWidth: 160 },
-        { prop: "syNonCopyingRatio", label: "商业非跟单比例", minWidth: 160 },
-        { prop: "nonCarReceivableRatio", label: "非车应收比例", minWidth: 160 },
-        { prop: "nonCarPremiumRatio", label: "非车手续费比例", minWidth: 160 },
+        { prop: "taxamount", label: "车船税", minWidth: 140 },
+        { prop: "jqReceivableRatio", label: "交强应收比例", minWidth: 140 },
+        { prop: "jqPremiumRatio", label: "交强手续费比例", minWidth: 140 },
+        { prop: "jqNonCopyingRatio", label: "交强非跟单比例", minWidth: 140 },
+        { prop: "syReceivableRatio", label: "商业应收比例", minWidth: 140 },
+        { prop: "syPremiumRatio", label: "商业手续费比例", minWidth: 140 },
+        { prop: "syNonCopyingRatio", label: "商业非跟单比例", minWidth: 140 },
+        { prop: "nonCarReceivableRatio", label: "非车应收比例", minWidth: 140 },
+        { prop: "nonCarPremiumRatio", label: "非车手续费比例", minWidth: 140 },
         {
           prop: "nonCarNonCopyingRatio",
           label: "非车非跟单比例",
-          minWidth: 160,
+          minWidth: 140,
         },
-        { prop: "premium", label: "手续费金额", minWidth: 160 },
-        { prop: "nonCopying", label: "非跟单金额", minWidth: 160 },
-        { prop: "receivable", label: "应收金额", minWidth: 160 },
+        { prop: "premium", label: "手续费金额", minWidth: 140 },
+        { prop: "nonCopying", label: "非跟单金额", minWidth: 140 },
+        { prop: "receivable", label: "应收金额", minWidth: 140 },
         {
           prop: "maxJqReceivableRatio",
           label: "最大交强应付比例",
-          minWidth: 160,
+          minWidth: 140,
         },
         {
           prop: "maxSyReceivableRatio",
           label: "最大商业应付比例",
-          minWidth: 160,
+          minWidth: 140,
         },
         {
           prop: "maxNonCarReceivableRatio",
           label: "最大非车应付比例",
-          minWidth: 160,
+          minWidth: 140,
         },
-        { prop: "maxReceivable", label: "最大应付金额", minWidth: 160 },
-        { prop: "subsidyRatio", label: "补贴比例", minWidth: 160 },
-        { prop: "subsidyAmount", label: "补贴金额", minWidth: 160 },
-        { prop: "totalReceivableAmount", label: "总应收金额", minWidth: 160 },
+        { prop: "maxReceivable", label: "最大应付金额", minWidth: 140 },
+        { prop: "subsidyRatio", label: "补贴比例", minWidth: 140 },
+        { prop: "subsidyAmount", label: "补贴金额", minWidth: 140 },
+        { prop: "totalReceivableAmount", label: "总应收金额", minWidth: 140 },
         {
           prop: "clearingState",
           label: "结算状态",
-          minWidth: 160,
+          minWidth: 140,
         },
         {
           prop: "insuranceClearingState",
           label: "保司结算状态",
-          minWidth: 160,
+          minWidth: 140,
         },
       ],
     };
@@ -413,10 +424,18 @@ export default {
   mounted() {},
   methods: {
     clearingTimeChange(e) {
-      this.pageRequest.clearingTime = e.toString();
+      if (e == null) {
+        this.pageRequest.clearingTime = "";
+      } else {
+        this.pageRequest.clearingTime = e.toString();
+      }
     },
     signingTimeChange(e) {
-      this.pageRequest.signingTime = e.toString();
+      if (e == null) {
+        this.pageRequest.signingTime = "";
+      } else {
+        this.pageRequest.signingTime = e.toString();
+      }
     },
     //保险公司查询
     companyInt() {
@@ -481,15 +500,15 @@ export default {
     },
     //批量修改
     handleTableSettled(ids) {
-      console.log(ids)
+      console.log(ids);
       this.UpdateList = ids;
       this.dialogUpdateVisible = true;
     },
     BulkUpdate() {
-      let params={
-        ids:this.UpdateList,
-        insuranceClearingState:this.insuranceClearingState,
-      }
+      let params = {
+        ids: this.UpdateList,
+        insuranceClearingState: this.insuranceClearingState,
+      };
       this.$api.task.sourceUpdates(params).then((res) => {
         if (res.code == "200") {
           this.$message({

src/views/Report/StatisticalReport/AccountsReceivableStatistics.vue

@@ -21,7 +21,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="账单属期">
+              <el-date-picker v-model="queryForm.settleMonth" type="date"
+                              placeholder="选择日期" value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" style="height: 40px;">
             <el-form-item label="结算单生成时间">
               <el-date-picker v-model="quoteDate" style="width:100%" @change="changeQuoteDate" type="daterange" align="left" value-format="yyyy-MM-dd"
@@ -101,13 +107,14 @@
         quoteDate:"",//结算单日期
         //查询的表单
         queryForm: {
-          companyId:"",
+          companyId:"",//保险公司
           quoteStartDate: "",
           quoteEndDate: "",
-          status:"",
+          status:"",//账单状态
           pageNum: 1,
           pageSize: 10,
-          isReturnBack:"0"//是否返回上层
+          isReturnBack:"0",//是否返回上层
+          settleMonth:""//账单属期
         },
         dataList: [],//查询结果数据
         //返回上层查询对象
@@ -143,11 +150,15 @@
         this.queryForm.pageSize = 10;
         this.queryForm.isReturnBack="0";
         this.queryForm.companyId=obj.companyId;
+        this.queryForm.settleMonth=obj.settleMonth;
+        this.queryForm.isDrilling="1";
         this.findPage();
       },
       //返回上层
       returnUpper(){
         this.queryForm.isReturnBack="1";
+        this.queryForm.isDrilling="0";
+        this.queryForm.settleMonth="";
         this.queryForm.companyId= this.returnForm.companyId;
         this.findPage();
       },
@@ -179,6 +190,7 @@
         this.queryForm.pageNum = 1;
         this.queryForm.pageSize = 10;
         this.queryForm.isReturnBack="0";
+        this.queryForm.isDrilling="0";
         this.findPage();
       },
       //数据
@@ -195,7 +207,6 @@
             this.totalSum = res.data.totalSize;
           } else {
             this.$message.error(res.msg)
-            this.dataList=[];
             this.loading = false;
           }
         })
@@ -239,7 +250,15 @@
         queryListForm.quoteStartDate=this.queryForm.quoteStartDate;
         queryListForm.quoteEndDate=this.queryForm.quoteEndDate;
         queryListForm.companyId=this.queryForm.companyId;
-        queryListForm.status=obj.status;
+        let tempStatus="";
+        if(obj.status=='未核销'){
+          tempStatus="0";
+        }else if(obj.status=='部分核销'){
+          tempStatus="1";
+        }else if(obj.status=='已核销'){
+          tempStatus="2";
+        }
+        queryListForm.status=tempStatus;
         this.$api.report.exportInsPlySettleListData(queryListForm).then(res=>{
           let url = process.env.BASE_URL+'/upload/'+res.data // 3.创建一个临时的url指向blob对象
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载

src/views/Sys/Deptall.vue

@@ -13,7 +13,7 @@
         </div>
         <!-- 表格渲染 -->
         <el-table permsEdit="sys:dept:edit" height="600" permsDelete="sys:dept:delete"
-          :columns="columns" row-key="id" :expand-row-keys="['9']" border :data="ztreeNodes"
+          row-key="id" :expand-row-keys="['9']" border :data="ztreeNodes"
           :tree-props="{ children: 'children', hasChildren: 'hasChilkdren' }" :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
@@ -288,47 +288,11 @@ export default {
       filters: {
         id: "",
       },
-      columns: [
-        {
-          prop: "id",
-          label: "ID",
-          minWidth: 80,
-        },
-        {
-          prop: "name",
-          label: "机构名称",
-          minWidth: 160,
-        },
-        {
-          prop: "comlevel",
-          label: "机构级别",
-          minWidth: 100,
-          formatter: this.comlevelFormatter,
-        },
-        {
-          prop: "comattribute",
-          label: "机构性质",
-          minWidth: 100,
-          formatter: this.comattributeFormatter,
-        },
-        {
-          prop: "comtype",
-          label: "机构类型",
-          minWidth: 100,
-          formatter: this.comtypeFormatter,
-        },
-        {
-          prop: "address",
-          label: "机构地址",
-          minWidth: 200,
-        },
-      ],
       pageRequest: {
         pageNum: 1,
         pageSize: 10,
       },
       pageResult: {},
-
       //----ztreeData start---------
       ztreeLeftWidth: 0, //左边区域的宽度
       ztreeRightWidth: 0, //右边区域的宽度