财务管理-费用导出bug

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -3693,10 +3693,10 @@ export default {
 
     },
     costselectionChange(data) {
-      this.copyProtocolInfo.cost.informationId = data;
+      this.copyProtocolInfo.cost.informationId = data.map((item) => item.id);
     },
     underwritingRulesselectionChange(data) {
-      this.copyProtocolInfo.underwritingRules.informationId = data;
+      this.copyProtocolInfo.underwritingRules.informationId = data.map((item) => item.id);
     },
     copyProtocolSubmit() {
       this.$api.insCompany.copyAgreementAllInformation(this.copyProtocolInfo).then((res) => {

src/views/Core/KtCommonTable.vue

@@ -1020,8 +1020,8 @@ export default {
       let idlist = [];
       this.tableSelectedCount=selections.length;
       this.selections = selections;
-      this.selections.map((item) => idlist.push(item.id));
-      this.$emit("selectionChange", idlist);
+      // this.selections.map((item) => idlist.push(item.id));
+      this.$emit("selectionChange", selections);
     },
     // 选择切换
     handleCurrentChange: function (val) {

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -2,252 +2,122 @@
   <div class="table_btnbox">
     <!-- 搜索 -->
     <el-row class="top">
-      <el-form
-        v-model="queryFrom"
-        size="small"
-        label-width="120px"
-        class="query-form"
-      >
+      <el-form v-model="queryFrom" size="small" label-width="120px" class="query-form">
         <el-form-item label="转账状态" prop="transferFlag">
-          <el-select
-            v-model="queryFrom.transferFlag"
-            placeholder="请选择转账状态"
-            clearable
-          >
+          <el-select v-model="queryFrom.transferFlag" placeholder="请选择转账状态" clearable>
             <el-option label="已转账" value="0"></el-option>
             <el-option label="未转账" value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="申请人" prop="applicant">
-          <el-input
-            v-model="queryFrom.applicant"
-            placeholder="请输入申请人"
-            class="widths"
-            clearable
-          ></el-input>
+          <el-input v-model="queryFrom.applicant" placeholder="请输入申请人" class="widths" clearable></el-input>
         </el-form-item>
         <el-form-item label="申请部门" prop="applySector">
-          <el-input
-            v-model="queryFrom.applySector"
-            placeholder="请输入申请部门"
-            class="widths"
-            clearable
-          ></el-input>
+          <el-input v-model="queryFrom.applySector" placeholder="请输入申请部门" class="widths" clearable></el-input>
         </el-form-item>
         <el-form-item label="申请日期" prop="applyTime">
-          <el-date-picker
-            v-model="queryFrom.applyTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="queryFrom.applyTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="单位" prop="company">
-          <el-input
-            v-model="queryFrom.company"
-            placeholder="请输入单位"
-            class="widths"
-            clearable
-          ></el-input>
+          <el-input v-model="queryFrom.company" placeholder="请输入单位" class="widths" clearable></el-input>
         </el-form-item>
         <el-form-item label="收款单位信息" prop="collectionMessage">
-          <el-input
-            v-model="queryFrom.collectionMessage"
-            placeholder="请输入收款单位信息"
-            class="widths"
-            clearable
-          ></el-input>
+          <el-input v-model="queryFrom.collectionMessage" placeholder="请输入收款单位信息" class="widths" clearable></el-input>
         </el-form-item>
         <el-form-item label="申请金额（元）" prop="applyTime">
-          <el-input
-            v-model="queryFrom.applyAmount"
-            placeholder="请输入金额"
-            clearable
-          ></el-input>
+          <el-input v-model="queryFrom.applyAmount" placeholder="请输入金额" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <kt-button label="查询" type="primary"  perms="expenseManagement:expenseRequest:query"
-      @click="queryStaffInfo" />
+          <kt-button label="查询" type="primary" perms="expenseManagement:expenseRequest:query" @click="queryStaffInfo" />
         </el-form-item>
       </el-form>
     </el-row>
     <!-- 申请按钮 -->
-    <kt-button class="operation" label="资金使用申请单"  type="primary" :plain="true"  perms="expenseManagement:expenseRequest:add"
-      @click="showExpense" />
-      <kt-button  label="批量导出"  type="danger" :disabled="!this.expentList.length"   perms="expenseManagement:expenseRequest:excel"
-      @click="expendDataup" />
+    <kt-button class="operation" label="资金使用申请单" type="primary" :plain="true"
+      perms="expenseManagement:expenseRequest:add" @click="showExpense" />
+    <kt-button label="批量导出" type="danger" :disabled="!this.expentList.length"
+      perms="expenseManagement:expenseRequest:excel" @click="expendDataup" />
     <!-- 表格 -->
-    <kt-common-table
-      :operationWidth="operationWidth"
-      class="ktTable"
-      permsEdit="expenseManagement:expenseRequest:update"
-      ref="dataTable"
-      :data="pageResult"
-      :columns="columns"
-      editButtonName="编辑"
-      button1Name="删除"
-      permsButton1="expenseManagement:expenseRequest:delete"
-      permsButton2="expenseManagement:expenseRequest:details"
-      button2Name="查看"
-      button2Background="#409eff"
-      :showBatchDelete="false"
-      :showBatchPrint="true"
-      :showOperation="true"
-      @findPage="findPage"
-      :isshowpagination="true"
-      @handleEdit="expendEdit($event, 1)"
-      @handleButton1="expendDelete"
-      @handleButton2="expendEdit($event, 2)"
-      @selectionChange="selectionChange"
-      button3Name="支出"
-      @handleButton3="expendExpenditure($event)"
-    ></kt-common-table>
+    <kt-common-table :operationWidth="operationWidth" class="ktTable"
+      permsEdit="expenseManagement:expenseRequest:update" ref="dataTable" :data="pageResult" :columns="columns"
+      editButtonName="编辑" button1Name="删除" permsButton1="expenseManagement:expenseRequest:delete"
+      permsButton2="expenseManagement:expenseRequest:details" button2Name="查看" button2Background="#409eff"
+      :showBatchDelete="false" :showBatchPrint="true" :showOperation="true" @findPage="findPage"
+      :isshowpagination="true" @handleEdit="expendEdit($event, 1)" @handleButton1="expendDelete"
+      @handleButton2="expendEdit($event, 2)" @selectionChange="selectionChange" button3Name="支出"
+      @handleButton3="expendExpenditure($event)"></kt-common-table>
     <!-- 申请资金弹框 -->
-    <el-dialog
-      class="dialog"
-      :title="expendTitle"
-      :close-on-click-modal="false"
-      :before-close="resetForm"
-      :visible.sync="expenseDialog"
-      width="60%"
-    >
+    <el-dialog class="dialog" :title="expendTitle" :close-on-click-modal="false" :before-close="resetForm"
+      :visible.sync="expenseDialog" width="60%">
       <div class="dialog-body">
-        <el-form
-          :model="tableForm"
-          :rules="tableFormRules"
-          ref="tableForm"
-          label-width="130px"
-          size="small"
-          class="tableForm"
-          :disabled="formDisable"
-        >
+        <el-form :model="tableForm" :rules="tableFormRules" ref="tableForm" label-width="130px" size="small"
+          class="tableForm" :disabled="formDisable">
           <el-row>
             <el-col :span="12">
               <el-form-item label="支出单位:" prop="company">
-                <el-select
-                  v-model="tableForm.company"
-                  filterable
-                  placeholder="支出单位"
-                >
-                  <el-option
-                    v-for="(item, index) in innerCollectionData"
-                    :key="item.accountId + '' + index"
-                    :label="item.name"
-                    :value="item.bankCardNum"
-                  >
+                <el-select v-model="tableForm.company" filterable placeholder="支出单位">
+                  <el-option v-for="(item, index) in innerCollectionData" :key="item.accountId + '' + index"
+                    :label="item.name" :value="item.bankCardNum">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="申请人" prop="applicant">
-                <el-input
-                  type="text"
-                  resize="none"
-                  v-model="tableForm.applicant"
-                ></el-input>
+                <el-input type="text" resize="none" v-model="tableForm.applicant"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="申请部门" prop="applySector">
-                <el-input
-                  type="text"
-                  resize="none"
-                  v-model="tableForm.applySector"
-                ></el-input>
+                <el-input type="text" resize="none" v-model="tableForm.applySector"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="申请日期" prop="applyTime">
-                <el-date-picker
-                  v-model="tableForm.applyTime"
-                  align="right"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  :picker-options="pickerOptions"
-                >
+                <el-date-picker v-model="tableForm.applyTime" align="right" type="date" value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptions">
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row class="collec">
             <el-col :span="12">
-              <el-form-item
-                label="收款单位信息"
-                style="width: 100%"
-                prop="collectionMessage"
-              >
-                <el-select
-                  v-model="tableForm.collectionMessage"
-                  filterable
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="(item, index) in collectionData"
-                    :key="item.accountId + 'aa' + index"
-                    :label="item.name"
-                    :value="item.bankCardNum"
-                  >
+              <el-form-item label="收款单位信息" style="width: 100%" prop="collectionMessage">
+                <el-select v-model="tableForm.collectionMessage" filterable placeholder="">
+                  <el-option v-for="(item, index) in collectionData" :key="item.accountId + 'aa' + index"
+                    :label="item.name" :value="item.bankCardNum">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="资金用途" prop="fundUse">
-                <el-cascader
-                  v-model="tableForm.fundUse"
-                  :show-all-levels="true"
-                  :clearable="true"
-                  :checkStrictly="true"
-                  :emitPath="false"
-                  placeholder=""
-                  :options="fundFlowData"
-                  filterable
-                  :props="{
+                <el-cascader v-model="tableForm.fundUse" :show-all-levels="true" :clearable="true" :checkStrictly="true"
+                  :emitPath="false" placeholder="" :options="fundFlowData" filterable :props="{
                     children: 'child',
                     label: 'category',
                     value: 'category',
                     checkStrictly: false,
-                  }"
-                ></el-cascader>
+                  }"></el-cascader>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="资金流程" prop="payMethod" class="paymethod">
-                <el-select
-                  v-model="tableForm.company"
-                  filterable
-                  placeholder=""
-                  disabled
-                >
-                  <el-option
-                    v-for="(item, index) in innerCollectionData"
-                    :key="item.accountId + '' + index"
-                    :label="item.name"
-                    :value="item.bankCardNum"
-                  >
+                <el-select v-model="tableForm.company" filterable placeholder="" disabled>
+                  <el-option v-for="(item, index) in innerCollectionData" :key="item.accountId + '' + index"
+                    :label="item.name" :value="item.bankCardNum">
                   </el-option>
                 </el-select>
                 <i class="el-icon-right"></i>
-                <el-select
-                  v-model="tableForm.collectionMessage"
-                  filterable
-                  placeholder=""
-                  disabled
-                >
-                  <el-option
-                    v-for="(item, index) in collectionData"
-                    :key="item.accountId + 'aa' + index"
-                    :label="item.name"
-                    :value="item.bankCardNum"
-                  >
+                <el-select v-model="tableForm.collectionMessage" filterable placeholder="" disabled>
+                  <el-option v-for="(item, index) in collectionData" :key="item.accountId + 'aa' + index"
+                    :label="item.name" :value="item.bankCardNum">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -256,24 +126,13 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="申请金额（元）" prop="applyAmount">
-                <el-input-number
-                  v-model="tableForm.applyAmount"
-                  :min="0"
-                  :precision="2"
-                  @blur="chageAppl"
-                  :max="99999999999999999"
-                  label=""
-                ></el-input-number>
+                <el-input-number v-model="tableForm.applyAmount" :min="0" :precision="2" @blur="chageAppl"
+                  :max="99999999999999999" label=""></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="大写金额" prop="bigApplyAmount">
-                <el-input
-                  type="text"
-                  resize="none"
-                  v-model="tableForm.bigApplyAmount"
-                  disabled
-                ></el-input>
+                <el-input type="text" resize="none" v-model="tableForm.bigApplyAmount" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -281,65 +140,38 @@
             <el-col :span="12">
               <el-form-item label="支付方式" prop="payMethod">
                 <el-checkbox-group v-model="tableForm.payMethod">
-                  <el-checkbox
-                    v-for="payItem in payment_methodsData"
-                    :key="payItem.value"
-                    :label="payItem.label"
-                    :value="payItem.value"
-                    :disabled="payItem.value == 2"
-                  ></el-checkbox>
+                  <el-checkbox v-for="payItem in payment_methodsData" :key="payItem.value" :label="payItem.label"
+                    :value="payItem.value" :disabled="payItem.value == 2"></el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注" prop="remark">
-                <el-input
-                  type="text"
-                  resize="none"
-                  v-model="tableForm.remark"
-                ></el-input>
+                <el-input type="text" resize="none" v-model="tableForm.remark"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-bottom: 20px">
-            <el-col :span="12" style="text-align: center"
-              ><h3 style="margin-left: 120px">支出方资金归属</h3>
+            <el-col :span="12" style="text-align: center">
+              <h3 style="margin-left: 120px">支出方资金归属</h3>
             </el-col>
-            <el-col :span="12" style="text-align: center"
-              ><h3 style="margin-left: 120px">收入方资金归属</h3>
+            <el-col :span="12" style="text-align: center">
+              <h3 style="margin-left: 120px">收入方资金归属</h3>
             </el-col>
           </el-row>
           <el-row class="profit_box">
             <el-col :span="12">
-              <el-form-item
-                v-for="item in affiliationData2"
-                :key="item.profitId + 'zc'"
-                :label="item.profitName"
-                prop="entProfit"
-              >
-                <el-input-number
-                  v-model="item.profit"
-                  :min="0"
-                  placeholder="请输入利润"
-                  :max="999999999999999"
-                  label=""
-                ></el-input-number>
+              <el-form-item v-for="item in affiliationData2" :key="item.profitId + 'zc'" :label="item.profitName"
+                prop="entProfit">
+                <el-input-number v-model="item.profit" :min="0" placeholder="请输入利润" :max="999999999999999"
+                  label=""></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                v-for="item in affiliationData"
-                :key="item.profitId + 'sr'"
-                :label="item.profitName"
-                prop="entProfit"
-              >
-                <el-input-number
-                  v-model="item.profit"
-                  :min="0"
-                  placeholder="请输入利润"
-                  :max="999999999999999"
-                  label=""
-                ></el-input-number>
+              <el-form-item v-for="item in affiliationData" :key="item.profitId + 'sr'" :label="item.profitName"
+                prop="entProfit">
+                <el-input-number v-model="item.profit" :min="0" placeholder="请输入利润" :max="999999999999999"
+                  label=""></el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
@@ -347,13 +179,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resetForm" size="small">取 消</el-button>
-        <el-button
-          v-if="!formDisable"
-          type="primary"
-          @click="submitForm"
-          size="small"
-          >{{ buttonValue }}</el-button
-        >
+        <el-button v-if="!formDisable" type="primary" @click="submitForm" size="small">{{ buttonValue }}</el-button>
       </div>
     </el-dialog>
     <!-- <el-dialog
@@ -378,29 +204,19 @@
       @outChange="outChange"
       class="expense-component"
     ></expense-component> -->
-    <el-dialog
-      title="支出"
-      :close-on-click-modal="false"
-      :before-close="closeExpenditure"
-      :visible.sync="expenditureVisible"
-      width="30%"
-    >
+    <el-dialog title="支出" :close-on-click-modal="false" :before-close="closeExpenditure"
+      :visible.sync="expenditureVisible" width="30%">
       <div>
         <el-radio-group v-model="expendRadio">
           <el-radio :label="0">全部</el-radio>
           <el-radio :label="1">部分支出</el-radio>
         </el-radio-group>
-        <el-input v-show="expendRadio" v-model="payOutAmount" placeholder="请输入支出金额" style="width: 200px;margin-left: 20px;" size="small"></el-input>
+        <el-input v-show="expendRadio" v-model="payOutAmount" placeholder="请输入支出金额"
+          style="width: 200px;margin-left: 20px;" size="small"></el-input>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeExpenditure" size="small">取 消</el-button>
-        <el-button
-          v-if="!formDisable"
-          type="primary"
-          @click="submitFormExpend"
-          size="small"
-          >确定支出</el-button
-        >
+        <el-button v-if="!formDisable" type="primary" @click="submitFormExpend" size="small">确定支出</el-button>
       </div>
     </el-dialog>
   </div>
@@ -414,7 +230,7 @@ import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { toChies, convertPositive } from "../../../utils/moneyTransition";
 export default {
   name: "ExpenseApplyFor",
-  components: { KtCommonTable, ExpenseComponent,KtButton },
+  components: { KtCommonTable, ExpenseComponent, KtButton },
   data() {
     //开票金额自定义校验
     let applyAmountRules = (rule, value, callback) => {
@@ -682,7 +498,7 @@ export default {
     this.getAllUser(); //获取所有银行账户信息
     this.getAffiliationData(); //获取归属数据
   },
-  mounted() {},
+  mounted() { },
   methods: {
     // 确定支出
     submitFormExpend() {
@@ -724,7 +540,7 @@ export default {
     },
     //表格多选事件
     selectionChange(e) {
-      this.expentList = e.selections.map((item) => item.excelAccountOperateId);
+      this.expentList = e.map((item) => item.excelAccountOperateId);
     },
     //获取归属数据
     getAffiliationData() {
@@ -840,7 +656,7 @@ export default {
               }
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     //获取资金用途树数据
     getTreeList() {
@@ -887,7 +703,7 @@ export default {
       this.$api.expense
         .getAccountExcel(obj)
         .then((res) => {
-          if(res.code==200){
+          if (res.code == 200) {
             res.data.records.forEach((element) => {
               element.transferFlagName =
                 element.transferFlag == 0 ? "已转账" : "未转账";
@@ -900,7 +716,7 @@ export default {
               totalSize: res.data.total,
             };
           }
-          else{
+          else {
             this.$message.error(res.msg)
           }
 
@@ -1186,83 +1002,98 @@ export default {
   margin-top: 14px;
   flex-wrap: wrap;
 }
+
 .td-title,
-.demo-tableForm >>> .el-form-item__label {
+.demo-tableForm>>>.el-form-item__label {
   color: #323335;
   font-weight: bold;
   text-align: center;
 }
+
 .td-content,
-.demo-tableForm >>> .el-input.is-disabled .el-input__inner {
+.demo-tableForm>>>.el-input.is-disabled .el-input__inner {
   color: #474545;
 }
-.expense-table >>> .el-textarea__inner,
-.expense-table >>> .el-input__inner {
+
+.expense-table>>>.el-textarea__inner,
+.expense-table>>>.el-input__inner {
   border: none;
   padding: 0;
   text-align: center;
 }
-.expense-table >>> .el-form-item {
+
+.expense-table>>>.el-form-item {
   margin: 0;
   padding: 0;
 }
-.tableForm >>> .el-checkbox-group,
-.tableForm >>> .el-date-editor,
-.tableForm >>> .el-select,
-.tableForm >>> .el-input-number,
-.tableForm >>> .el-cascader,
-.tableForm >>> .el-select {
+
+.tableForm>>>.el-checkbox-group,
+.tableForm>>>.el-date-editor,
+.tableForm>>>.el-select,
+.tableForm>>>.el-input-number,
+.tableForm>>>.el-cascader,
+.tableForm>>>.el-select {
   width: 100%;
 }
-.demo-tableForm >>> .el-input__inner {
+
+.demo-tableForm>>>.el-input__inner {
   border: none;
 }
-.demo-tableForm >>> .el-input__prefix,
-.demo-tableForm >>> .el-select__caret {
+
+.demo-tableForm>>>.el-input__prefix,
+.demo-tableForm>>>.el-select__caret {
   display: none;
 }
-.idea-box >>> .el-input.is-disabled .el-input__inner,
-.expense-table >>> .el-input.is-disabled .el-input__inner {
+
+.idea-box>>>.el-input.is-disabled .el-input__inner,
+.expense-table>>>.el-input.is-disabled .el-input__inner {
   background-color: #fff;
 }
-.demo-tableForm >>> .el-input-number__decrease,
-.demo-tableForm >>> .el-input-number__increase {
+
+.demo-tableForm>>>.el-input-number__decrease,
+.demo-tableForm>>>.el-input-number__increase {
   display: none;
 }
-.demo-tableForm >>> .el-checkbox__input.is-disabled + span.el-checkbox__label {
+
+.demo-tableForm>>>.el-checkbox__input.is-disabled+span.el-checkbox__label {
   color: #409eff;
 }
-.demo-tableForm
-  >>> .el-checkbox__input.is-disabled.is-checked
-  .el-checkbox__inner {
+
+.demo-tableForm>>>.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
   background-color: #409eff;
   border-color: #409eff;
   color: #fff;
 }
-.demo-tableForm
-  >>> .el-checkbox__input.is-disabled.is-checked
-  .el-checkbox__inner::after {
+
+.demo-tableForm>>>.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
   border-color: #fff;
 }
-.demo-tableForm >>> .el-input__suffix {
+
+.demo-tableForm>>>.el-input__suffix {
   display: none;
 }
+
 .el-icon-right {
   font-size: 20px;
 }
+
 .operation {
   margin-bottom: 15px;
 }
-.paymethod >>> .el-form-item__content {
+
+.paymethod>>>.el-form-item__content {
   display: flex;
   align-items: center;
 }
+
 .el-icon-right {
   margin: 0 10px;
 }
+
 .table_btnbox {
   position: relative;
 }
+
 .dialog-body {
   overflow-y: auto;
   height: 500px;

src/views/FinancialManagement/ExpenseManagement/ViewExpenseReport.vue

@@ -274,7 +274,7 @@ export default {
     },
     //表格多选事件
     selectionChange(e) {
-      this.expentList = e.selections.map((item) => item.accountOperateId);
+      this.expentList = e.map((item) => item.accountOperateId);
     },
     //获取归属数据
     getAffiliationData() {